diff options
| author | Mauro Rossi <issor.oruam@gmail.com> | 2020-09-07 22:02:08 +0200 |
|---|---|---|
| committer | Mauro Rossi <issor.oruam@gmail.com> | 2020-09-07 23:33:15 +0200 |
| commit | bb42deee362c8dcdeca2212567aba945cd3f4116 (patch) | |
| tree | df30e8b0ce52d4e712a7a9ff224aa54a4d2bfc18 /src/egl/drivers | |
| parent | 9d02d65f4643bd4885c40ca2fca4e1e8f7cc202e (diff) | |
egl/android: HAVE_DRM_GRALLOC path fixes (v2)
Fixes the following building errors:
external/mesa/src/egl/drivers/dri2/platform_android.c:1001:9: error: use of undeclared identifier 'dri2_img'
dri2_img);
^
external/mesa/src/egl/drivers/dri2/platform_android.c:1059:17: error: incompatible pointer types assigning to '__DRIimage *' (aka 'struct __DRIimageRec *') from '_EGLImage *' (aka 'struct _egl_image *') [-Werror,-Wincompatible-pointer-types]
dri_image = droid_create_image_from_name(disp, buf);
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 errors generated.
(v2) Changelog:
- Pass NULL instead of dri_image as argument of createImageFromName()
- Delete the unused dri_image variable
Fixes: 5c8b67ed ("egl/android: Simplify droid_create_image_from_name() path")
Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6626>
Diffstat (limited to 'src/egl/drivers')
| -rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 3f11147bf09..8c52a4ac44e 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -972,12 +972,11 @@ static int get_format(int format) return -1; } -static _EGLImage * +static __DRIimage * droid_create_image_from_name(_EGLDisplay *disp, struct ANativeWindowBuffer *buf) { struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); - __DRIimage *dri_image; int name; int format; @@ -998,7 +997,7 @@ droid_create_image_from_name(_EGLDisplay *disp, format, name, buf->stride, - dri2_img); + NULL); } #endif /* HAVE_DRM_GRALLOC */ |