| From 8dcc949d7066ab1b5b45c22e62a2bea8febfc11e Mon Sep 17 00:00:00 2001 |
| From: David Stevens <stevensd@chromium.org> |
| Date: Wed, 23 Dec 2020 23:38:32 +0900 |
| Subject: [PATCH] egl/dri2: fix image loaderPrivate type mixup |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| The first callback which uses an image's loaderPrivate data was recently |
| added. Prior to this, dri2_create_image_khr_texture had been setting the |
| unused loaderPrivate field on the image it creates. This caused a |
| pointer type mixup in platform_android when it started using the new |
| callback. Fix this by no longer unnecessarily setting loaderPrivate in |
| dri2_create_image_khr_texture. |
| |
| Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4010 |
| Fixes: a2fb87eea6d ("egl/android: implement image cleanup callback") |
| Reviewed-by: Tapani Pälli <tapani.palli@intel.com> |
| Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8211> |
| --- |
| src/egl/drivers/dri2/egl_dri2.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c |
| index d57f1486677..18f7f6932d9 100644 |
| --- a/src/egl/drivers/dri2/egl_dri2.c |
| +++ b/src/egl/drivers/dri2/egl_dri2.c |
| @@ -2389,7 +2389,7 @@ dri2_create_image_khr_texture(_EGLDisplay *disp, _EGLContext *ctx, |
| depth, |
| attrs.GLTextureLevel, |
| &error, |
| - dri2_img); |
| + NULL); |
| dri2_create_image_khr_texture_error(error); |
| |
| if (!dri2_img->dri_image) { |
| -- |
| 2.29.2.729.g45daf8777d-goog |
| |
