glx: Remove windows' stub {bind,release}_text_image context hooks

All this could have done is make GLX_EXT_texture_from_pixmap appear to
be supported when it won't work.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9690>

diff --git a/src/glx/driwindows_glx.c b/src/glx/driwindows_glx.c
index a167a19..6a76a4d 100644 (file)
--- a/src/glx/driwindows_glx.c
+++ b/src/glx/driwindows_glx.c
@@ -108,50 +108,12 @@ driwindows_unbind_context(struct glx_context *context, struct glx_context *new)
    windows_unbind_context(pcp->windowsContext);
 }
 
-static void
-driwindows_bind_tex_image(Display * dpy,
-                    GLXDrawable drawable,
-                    int buffer, const int *attrib_list)
-{
-   struct glx_context *gc = __glXGetCurrentContext();
-   struct driwindows_context *pcp = (struct driwindows_context *) gc;
-   __GLXDRIdrawable *base = GetGLXDRIDrawable(dpy, drawable);
-   struct driwindows_drawable *pdraw = (struct driwindows_drawable *) base;
-
-   __glXInitialize(dpy);
-
-   if (pdraw != NULL) {
-      windows_setTexBuffer(pcp->windowsContext,
-                          pdraw->base.textureTarget,
-                          pdraw->base.textureFormat,
-                          pdraw->windowsDrawable);
-   }
-}
-
-static void
-driwindows_release_tex_image(Display * dpy, GLXDrawable drawable, int buffer)
-{
-   struct glx_context *gc = __glXGetCurrentContext();
-   struct driwindows_context *pcp = (struct driwindows_context *) gc;
-   __GLXDRIdrawable *base = GetGLXDRIDrawable(dpy, drawable);
-   struct glx_display *dpyPriv = __glXInitialize(dpy);
-   struct driwindows_drawable *pdraw = (struct driwindows_drawable *) base;
-
-   if (dpyPriv != NULL && pdraw != NULL) {
-      windows_releaseTexBuffer(pcp->windowsContext,
-                              pdraw->base.textureTarget,
-                              pdraw->windowsDrawable);
-      }
-}
-
 static const struct glx_context_vtable driwindows_context_vtable = {
    .destroy             = driwindows_destroy_context,
    .bind                = driwindows_bind_context,
    .unbind              = driwindows_unbind_context,
    .wait_gl             = NULL,
    .wait_x              = NULL,
-   .bind_tex_image      = driwindows_bind_tex_image,
-   .release_tex_image   = driwindows_release_tex_image,
 };
 
 static struct glx_context *

diff --git a/src/glx/windows/windowsgl.c b/src/glx/windows/windowsgl.c
index 73366b2..475c2f5 100644 (file)
--- a/src/glx/windows/windowsgl.c
+++ b/src/glx/windows/windowsgl.c
@@ -389,15 +389,3 @@ windows_extensions(char **gl_extensions, char **wgl_extensions)
    *gl_extensions = result.gl_extensions;
    *wgl_extensions = result.wgl_extensions;
 }
-
-void windows_setTexBuffer(windowsContext *context, int textureTarget,
-                         int textureFormat, windowsDrawable *drawable)
-{
-   // not yet implemented
-}
-
-void windows_releaseTexBuffer(windowsContext *context, int textureTarget,
-                             windowsDrawable *drawable)
-{
-   // not yet implemented
-}

diff --git a/src/glx/windows/windowsgl.h b/src/glx/windows/windowsgl.h
index bb30f1a..f765e8f 100644 (file)
--- a/src/glx/windows/windowsgl.h
+++ b/src/glx/windows/windowsgl.h
@@ -44,9 +44,4 @@ void windows_copy_subbuffer(windowsDrawable *windowsDrawable, int x, int y, int
 int windows_check_renderer(void);
 void windows_extensions(char **gl_extensions, char **wgl_extensions);
 
-void windows_setTexBuffer(windowsContext *context, int textureTarget,
-                         int textureFormat, windowsDrawable *drawable);
-void windows_releaseTexBuffer(windowsContext *context, int textureTarget,
-                             windowsDrawable *drawable);
-
 #endif /* windowsgl_h */