Module: Mesa Branch: master Commit: df09ada411dfca4d83db6b430e57a48cab81ba37 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=df09ada411dfca4d83db6b430e57a48cab81ba37
Author: David Stevens <[email protected]> Date: Wed Dec 23 23:38:32 2020 +0900 egl/dri2: fix image loaderPrivate type mixup 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 <[email protected]> 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 d6a1c416923..62fc7fb7783 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2461,7 +2461,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) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
