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>
This commit is contained in:
parent
621b3a4041
commit
70d87dd41d
|
@ -108,50 +108,12 @@ driwindows_unbind_context(struct glx_context *context, struct glx_context *new)
|
||||||
windows_unbind_context(pcp->windowsContext);
|
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 = {
|
static const struct glx_context_vtable driwindows_context_vtable = {
|
||||||
.destroy = driwindows_destroy_context,
|
.destroy = driwindows_destroy_context,
|
||||||
.bind = driwindows_bind_context,
|
.bind = driwindows_bind_context,
|
||||||
.unbind = driwindows_unbind_context,
|
.unbind = driwindows_unbind_context,
|
||||||
.wait_gl = NULL,
|
.wait_gl = NULL,
|
||||||
.wait_x = NULL,
|
.wait_x = NULL,
|
||||||
.bind_tex_image = driwindows_bind_tex_image,
|
|
||||||
.release_tex_image = driwindows_release_tex_image,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct glx_context *
|
static struct glx_context *
|
||||||
|
|
|
@ -389,15 +389,3 @@ windows_extensions(char **gl_extensions, char **wgl_extensions)
|
||||||
*gl_extensions = result.gl_extensions;
|
*gl_extensions = result.gl_extensions;
|
||||||
*wgl_extensions = result.wgl_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
|
|
||||||
}
|
|
||||||
|
|
|
@ -44,9 +44,4 @@ void windows_copy_subbuffer(windowsDrawable *windowsDrawable, int x, int y, int
|
||||||
int windows_check_renderer(void);
|
int windows_check_renderer(void);
|
||||||
void windows_extensions(char **gl_extensions, char **wgl_extensions);
|
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 */
|
#endif /* windowsgl_h */
|
||||||
|
|
Loading…
Reference in New Issue