Mesa (master): glx: Remove windows' stub {bind,release}_text_image context hooks
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Mar 19 15:30:41 UTC 2021
Module: Mesa
Branch: master
Commit: 70d87dd41d69718f311d6024a043dbaedffb4d7b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=70d87dd41d69718f311d6024a043dbaedffb4d7b
Author: Adam Jackson <ajax at redhat.com>
Date: Thu Mar 18 11:42:38 2021 -0400
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 at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9690>
---
src/glx/driwindows_glx.c | 38 --------------------------------------
src/glx/windows/windowsgl.c | 12 ------------
src/glx/windows/windowsgl.h | 5 -----
3 files changed, 55 deletions(-)
diff --git a/src/glx/driwindows_glx.c b/src/glx/driwindows_glx.c
index a167a19ac9b..6a76a4d3557 100644
--- 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 73366b20ab8..475c2f54cb1 100644
--- 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 bb30f1a391f..f765e8f516d 100644
--- 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 */
More information about the mesa-commit
mailing list