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

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>

diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 81df0d909eefcf23f07a759d091ef2a9d868dfc0..f1babe1e73bfc26d85dd1f7b80f45bdab7cd8bec 100644 (file)
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -2126,8 +2126,7 @@ dri2_wait_native(const _EGLDriver *drv, _EGLDisplay *disp, EGLint engine)
 }
 
 static EGLBoolean
 }
 
 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;
 {
    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);
 
    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) {
       return EGL_FALSE;
 
    switch (surf->TextureFormat) {


@@ -2170,8 +2169,7 @@ dri2_bind_tex_image(const _EGLDriver *drv,
 }
 
 static EGLBoolean
 }
 
 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;
 {
    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);
 
    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) {
       return EGL_FALSE;
 
    switch (surf->TextureTarget) {

diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 492201ee85784799e10e4bfd6b18ad9bf788372d..9762a4dad1215745a6764f05e07d17daef3d1429 100644 (file)
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -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);
 
    _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);
 }
 
    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);
 
    _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);
 }
 
    RETURN_EGL_EVAL(disp, ret);
 }

diff --git a/src/egl/main/egldriver.h b/src/egl/main/egldriver.h
index 1c02578147c4555decad210ac731b923c79bcbf0..974b021d6dfacd2e2a905138aa64e85bc5603b54 100644 (file)
--- a/src/egl/main/egldriver.h
+++ b/src/egl/main/egldriver.h
@@ -111,10 +111,10 @@ struct _egl_driver
    EGLBoolean (*DestroySurface)(_EGLDisplay *disp, _EGLSurface *surface);
    EGLBoolean (*QuerySurface)(_EGLDisplay *disp, _EGLSurface *surface,
                               EGLint attribute, EGLint *value);
    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,
    EGLBoolean (*SwapInterval)(const _EGLDriver *drv, _EGLDisplay *disp,
                               _EGLSurface *surf, EGLint interval);
    EGLBoolean (*SwapBuffers)(const _EGLDriver *drv, _EGLDisplay *disp,

diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index 38f273ba548f2429682067e239014574722691e6..0ab6c7c7a5fb8c8012c45e0f7904f71a781d1c96 100644 (file)
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -719,8 +719,7 @@ _eglSurfaceAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface
 
 
 EGLBoolean
 
 
 EGLBoolean

-_eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface,
-                 EGLint buffer)
+_eglBindTexImage(_EGLDisplay *disp, _EGLSurface *surface, EGLint buffer)

 {
    EGLint texture_type = EGL_PBUFFER_BIT;
 
 {
    EGLint texture_type = EGL_PBUFFER_BIT;
 


@@ -749,8 +748,7 @@ _eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surface,
 }
 
 EGLBoolean
 }
 
 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.
 {
    /* Just do basic error checking and return success/fail.
     * Drivers must implement the real stuff.

diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h
index aef2c39fb72cec9e13ae8a80e21288ee35fa3648..5a10e2bc061439454a1ac584e5ae3be3bbb74039 100644 (file)
--- a/src/egl/main/eglsurface.h
+++ b/src/egl/main/eglsurface.h
@@ -190,10 +190,10 @@ _eglSurfaceAttrib(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, E
 
 
 extern EGLBoolean
 
 
 extern EGLBoolean

-_eglBindTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
+_eglBindTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);

 
 extern EGLBoolean
 
 extern EGLBoolean

-_eglReleaseTexImage(const _EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);
+_eglReleaseTexImage(_EGLDisplay *disp, _EGLSurface *surf, EGLint buffer);

 
 
 extern EGLBoolean
 
 
 extern EGLBoolean