OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl: drop unused _EGLDriver from {Create,Destroy}ImageKHR()

Browse Source 
Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6241>
This commit is contained in:
Eric Engestrom
2018-04-22 16:48:15 +02:00
committed by Marge Bot
parent a7d15d2ae3
commit 740ec08f21
9 changed files with 24 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -2193,12 +2193,11 @@ dri2_release_tex_image(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
} }
static _EGLImage* static _EGLImage*
dri2_create_image(const _EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, dri2_create_image(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
EGLenum target, EGLClientBuffer buffer, EGLClientBuffer buffer, const EGLint *attr_list)
const EGLint *attr_list)
{ {
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
return dri2_dpy->vtbl->create_image(drv, disp, ctx, target, buffer, return dri2_dpy->vtbl->create_image(disp, ctx, target, buffer,
attr_list); attr_list);
} }
@@ -3114,12 +3113,9 @@ dri2_export_dma_buf_image_mesa(const _EGLDriver *drv, _EGLDisplay *disp, _EGLIma
#endif #endif
_EGLImage * _EGLImage *
dri2_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, dri2_create_image_khr(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
_EGLContext *ctx, EGLenum target,
EGLClientBuffer buffer, const EGLint *attr_list) EGLClientBuffer buffer, const EGLint *attr_list)
{ {
(void) drv;
switch (target) { switch (target) {
case EGL_GL_TEXTURE_2D_KHR: case EGL_GL_TEXTURE_2D_KHR:
case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR: case EGL_GL_TEXTURE_CUBE_MAP_POSITIVE_X_KHR:
@@ -3149,13 +3145,11 @@ dri2_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp,
} }
static EGLBoolean static EGLBoolean
dri2_destroy_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *image) dri2_destroy_image_khr(_EGLDisplay *disp, _EGLImage *image)
{ {
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_image *dri2_img = dri2_egl_image(image); struct dri2_egl_image *dri2_img = dri2_egl_image(image);
(void) drv;
dri2_dpy->image->destroyImage(dri2_img->dri_image); dri2_dpy->image->destroyImage(dri2_img->dri_image);
free(dri2_img); free(dri2_img);

8
src/egl/drivers/dri2/egl_dri2.h
View File

@@ -113,9 +113,8 @@ struct dri2_egl_display_vtbl {
EGLint interval); EGLint interval);
/* mandatory */ /* mandatory */
_EGLImage* (*create_image)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage* (*create_image)(_EGLDisplay *disp, _EGLContext *ctx,
_EGLContext *ctx, EGLenum target, EGLenum target, EGLClientBuffer buffer,
EGLClientBuffer buffer,
const EGLint *attr_list); const EGLint *attr_list);
/* mandatory */ /* mandatory */
@@ -441,8 +440,7 @@ EGLBoolean
dri2_add_pbuffer_configs_for_visuals(_EGLDisplay *disp); dri2_add_pbuffer_configs_for_visuals(_EGLDisplay *disp);
_EGLImage * _EGLImage *
dri2_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, dri2_create_image_khr(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
_EGLContext *ctx, EGLenum target,
EGLClientBuffer buffer, const EGLint *attr_list); EGLClientBuffer buffer, const EGLint *attr_list);
_EGLImage * _EGLImage *

7
src/egl/drivers/dri2/platform_android.c
View File

@@ -1066,16 +1066,15 @@ dri2_create_image_android_native_buffer(_EGLDisplay *disp,
} }
static _EGLImage * static _EGLImage *
droid_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, droid_create_image_khr(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
_EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list)
EGLClientBuffer buffer, const EGLint *attr_list)
{ {
switch (target) { switch (target) {
case EGL_NATIVE_BUFFER_ANDROID: case EGL_NATIVE_BUFFER_ANDROID:
return dri2_create_image_android_native_buffer(disp, ctx, return dri2_create_image_android_native_buffer(disp, ctx,
(struct ANativeWindowBuffer *) buffer); (struct ANativeWindowBuffer *) buffer);
default: default:
return dri2_create_image_khr(drv, disp, ctx, target, buffer, attr_list); return dri2_create_image_khr(disp, ctx, target, buffer, attr_list);
} }
} }

7
src/egl/drivers/dri2/platform_drm.c
View File

@@ -486,17 +486,14 @@ dri2_drm_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
} }
static _EGLImage * static _EGLImage *
dri2_drm_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, dri2_drm_create_image_khr(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
_EGLContext *ctx, EGLenum target,
EGLClientBuffer buffer, const EGLint *attr_list) EGLClientBuffer buffer, const EGLint *attr_list)
{ {
(void) drv;
switch (target) { switch (target) {
case EGL_NATIVE_PIXMAP_KHR: case EGL_NATIVE_PIXMAP_KHR:
return dri2_drm_create_image_khr_pixmap(disp, ctx, buffer, attr_list); return dri2_drm_create_image_khr_pixmap(disp, ctx, buffer, attr_list);
default: default:
return dri2_create_image_khr(drv, disp, ctx, target, buffer, attr_list); return dri2_create_image_khr(disp, ctx, target, buffer, attr_list);
} }
} }

9
src/egl/drivers/dri2/platform_x11.c
View File

@@ -1120,17 +1120,14 @@ dri2_create_image_khr_pixmap(_EGLDisplay *disp, _EGLContext *ctx,
} }
static _EGLImage * static _EGLImage *
dri2_x11_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, dri2_x11_create_image_khr(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
_EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list)
EGLClientBuffer buffer, const EGLint *attr_list)
{ {
(void) drv;
switch (target) { switch (target) {
case EGL_NATIVE_PIXMAP_KHR: case EGL_NATIVE_PIXMAP_KHR:
return dri2_create_image_khr_pixmap(disp, ctx, buffer, attr_list); return dri2_create_image_khr_pixmap(disp, ctx, buffer, attr_list);
default: default:
return dri2_create_image_khr(drv, disp, ctx, target, buffer, attr_list); return dri2_create_image_khr(disp, ctx, target, buffer, attr_list);
} }
} }

5
src/egl/drivers/dri2/platform_x11_dri3.c
View File

@@ -366,8 +366,7 @@ dri3_create_image_khr_pixmap_from_buffers(_EGLDisplay *disp, _EGLContext *ctx,
#endif #endif
static _EGLImage * static _EGLImage *
dri3_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp, dri3_create_image_khr(_EGLDisplay *disp, _EGLContext *ctx, EGLenum target,
_EGLContext *ctx, EGLenum target,
EGLClientBuffer buffer, const EGLint *attr_list) EGLClientBuffer buffer, const EGLint *attr_list)
{ {
#ifdef HAVE_DRI3_MODIFIERS #ifdef HAVE_DRI3_MODIFIERS
@@ -383,7 +382,7 @@ dri3_create_image_khr(const _EGLDriver *drv, _EGLDisplay *disp,
#endif #endif
return dri3_create_image_khr_pixmap(disp, ctx, buffer, attr_list); return dri3_create_image_khr_pixmap(disp, ctx, buffer, attr_list);
default: default:
return dri2_create_image_khr(drv, disp, ctx, target, buffer, attr_list); return dri2_create_image_khr(disp, ctx, target, buffer, attr_list);
} }
} }

5
src/egl/main/eglapi.c
View File

@@ -1734,8 +1734,7 @@ _eglCreateImageCommon(_EGLDisplay *disp, EGLContext ctx, EGLenum target,
if (ctx != EGL_NO_CONTEXT && target == EGL_LINUX_DMA_BUF_EXT) if (ctx != EGL_NO_CONTEXT && target == EGL_LINUX_DMA_BUF_EXT)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR); RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
img = drv->CreateImageKHR(drv, disp, context, target, img = drv->CreateImageKHR(disp, context, target, buffer, attr_list);
buffer, attr_list);
ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR; ret = (img) ? _eglLinkImage(img) : EGL_NO_IMAGE_KHR;
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
@@ -1784,7 +1783,7 @@ _eglDestroyImageCommon(_EGLDisplay *disp, _EGLImage *img)
RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE); RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_FALSE);
_eglUnlinkImage(img); _eglUnlinkImage(img);
ret = drv->DestroyImageKHR(drv, disp, img); ret = drv->DestroyImageKHR(disp, img);
RETURN_EGL_EVAL(disp, ret); RETURN_EGL_EVAL(disp, ret);
} }

2
src/egl/main/egldisplay.c
View File

@@ -324,7 +324,7 @@ _eglReleaseDisplayResources(_EGLDisplay *display)
list = list->Next; list = list->Next;
_eglUnlinkImage(image); _eglUnlinkImage(image);
drv->DestroyImageKHR(drv, display, image); drv->DestroyImageKHR(display, image);
} }
assert(!display->ResourceLists[_EGL_RESOURCE_IMAGE]); assert(!display->ResourceLists[_EGL_RESOURCE_IMAGE]);

8
src/egl/main/egldriver.h
View File

@@ -130,12 +130,10 @@ struct _egl_driver
/* this function may be called from multiple threads at the same time */ /* this function may be called from multiple threads at the same time */
_EGLProc (*GetProcAddress)(const char *procname); _EGLProc (*GetProcAddress)(const char *procname);
_EGLImage *(*CreateImageKHR)(const _EGLDriver *drv, _EGLDisplay *disp, _EGLImage *(*CreateImageKHR)(_EGLDisplay *disp, _EGLContext *ctx,
_EGLContext *ctx, EGLenum target, EGLenum target, EGLClientBuffer buffer,
EGLClientBuffer buffer,
const EGLint *attr_list); const EGLint *attr_list);
EGLBoolean (*DestroyImageKHR)(const _EGLDriver *drv, _EGLDisplay *disp, EGLBoolean (*DestroyImageKHR)(_EGLDisplay *disp, _EGLImage *image);
_EGLImage *image);
_EGLSync *(*CreateSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, EGLenum type, _EGLSync *(*CreateSyncKHR)(const _EGLDriver *drv, _EGLDisplay *disp, EGLenum type,
const EGLAttrib *attrib_list); const EGLAttrib *attrib_list);