fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: drop unused _EGLDriver from {Bind,Release}TexImage()

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 982ac69e3f
commit 2f4a6ad3b3
5 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/egl/drivers/dri2/egl_dri2.c
View file

@ -2126,8 +2126,7 @@ dri2_wait_native(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine)
}
static EGLBoolean
dri2_bind_tex_image(const _EGLDriver *drv,
_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
dri2_bind_tex_image(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_context *dri2_ctx;
@ -2138,7 +2137,7 @@ dri2_bind_tex_image(const _EGLDriver *drv,
ctx = _eglGetCurrentContext();
dri2_ctx = dri2_egl_context(ctx);
if (!_eglBindTexImage(drv, disp, surf, buffer))
if (!_eglBindTexImage(disp, surf, buffer))
return EGL_FALSE;
switch (surf->TextureFormat) {
@ -2170,8 +2169,7 @@ dri2_bind_tex_image(const _EGLDriver *drv,
}
static EGLBoolean
dri2_release_tex_image(const _EGLDriver *drv,
_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
dri2_release_tex_image(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
{
struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp);
struct dri2_egl_context *dri2_ctx;
@ -2182,7 +2180,7 @@ dri2_release_tex_image(const _EGLDriver *drv,
ctx = _eglGetCurrentContext();
dri2_ctx = dri2_egl_context(ctx);
if (!_eglReleaseTexImage(drv, disp, surf, buffer))
if (!_eglReleaseTexImage(disp, surf, buffer))
return EGL_FALSE;
switch (surf->TextureTarget) {

4
src/egl/main/eglapi.c
View file

@ -1237,7 +1237,7 @@ eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
ret = drv->BindTexImage(drv, disp, surf, buffer);
ret = drv->BindTexImage(disp, surf, buffer);
RETURN_EGL_EVAL(disp, ret);
}
@ -1253,7 +1253,7 @@ eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
_EGL_FUNC_START(disp, EGL_OBJECT_SURFACE_KHR, surf, EGL_FALSE);
_EGL_CHECK_SURFACE(disp, surf, EGL_FALSE, drv);
ret = drv->ReleaseTexImage(drv, disp, surf, buffer);
ret = drv->ReleaseTexImage(disp, surf, buffer);
RETURN_EGL_EVAL(disp, ret);
}

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

@ -111,10 +111,10 @@ struct _egl_driver
EGLBoolean (*DestroySurface)(_EGLDisplay *disp, _EGLSurface *surface);
EGLBoolean (*QuerySurface)(_EGLDisplay *disp, _EGLSurface *surface,
EGLint attribute, EGLint *value);
EGLBoolean (*BindTexImage)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint buffer);
EGLBoolean (*ReleaseTexImage)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surface, EGLint buffer);
EGLBoolean (*BindTexImage)(_EGLDisplay *disp, _EGLSurface *surface,
EGLint buffer);
EGLBoolean (*ReleaseTexImage)(_EGLDisplay *disp, _EGLSurface *surface,
EGLint buffer);
EGLBoolean (*SwapInterval)(const _EGLDriver *drv, _EGLDisplay *disp,
_EGLSurface *surf, EGLint interval);
EGLBoolean (*SwapBuffers)(const _EGLDriver *drv, _EGLDisplay *disp,

6
src/egl/main/eglsurface.c
View file

@ -719,8 +719,7 @@ _eglSurfaceAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface
EGLBoolean
_eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface,
EGLint buffer)
_eglBindTexImage(_EGLDisplay *disp, _EGLSurface *surface, EGLint buffer)
{
EGLint texture_type = EGL_PBUFFER_BIT;
@ -749,8 +748,7 @@ _eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface,
}
EGLBoolean
_eglReleaseTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf,
EGLint buffer)
_eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer)
{
/* Just do basic error checking and return success/fail.
* Drivers must implement the real stuff.

4
src/egl/main/eglsurface.h
View file

@ -190,10 +190,10 @@ _eglSurfaceAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, E
extern EGLBoolean
_eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
_eglBindTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
extern EGLBoolean
_eglReleaseTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
_eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
extern EGLBoolean