KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crashes when some GLX API entrypoints are called with no current context. 

I was hitting this with gliv.

The GLX spec explicitly mentions that glXWaitX, glXWaitGL and glXUseXFont calls
are ignored when there's no current context. Not sure what if anything the
GLX_EXT_texture_from_pixmap spec says about this, but I think ignoring the
calls makes more sense than crashing there as well. :)
This commit is contained in:
Michel Dänzer 2010-09-07 19:49:06 +02:00 committed by Michel Dänzer
parent 5afdfa222f
commit 6a6e6d7b0a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/glx/glxcmds.c
View File

@ -481,7 +481,7 @@ glXWaitGL(void)
{
struct glx_context *gc = __glXGetCurrentContext();
if (gc && gc->vtable->wait_gl)
if (gc && gc->vtable && gc->vtable->wait_gl)
gc->vtable->wait_gl(gc);
}
@ -494,7 +494,7 @@ glXWaitX(void)
{
struct glx_context *gc = __glXGetCurrentContext();
if (gc && gc->vtable->wait_x)
if (gc && gc->vtable && gc->vtable->wait_x)
gc->vtable->wait_x(gc);
}
@ -503,7 +503,7 @@ glXUseXFont(Font font, int first, int count, int listBase)
{
struct glx_context *gc = __glXGetCurrentContext();
if (gc && gc->vtable->use_x_font)
if (gc && gc->vtable && gc->vtable->use_x_font)
gc->vtable->use_x_font(gc, font, first, count, listBase);
}
@ -2344,7 +2344,7 @@ __glXBindTexImageEXT(Display * dpy,
{
struct glx_context *gc = __glXGetCurrentContext();
if (gc == NULL || gc->vtable->bind_tex_image == NULL)
if (gc == NULL || gc->vtable == NULL || gc->vtable->bind_tex_image == NULL)
return;
gc->vtable->bind_tex_image(dpy, drawable, buffer, attrib_list);
@ -2355,7 +2355,7 @@ __glXReleaseTexImageEXT(Display * dpy, GLXDrawable drawable, int buffer)
{
struct glx_context *gc = __glXGetCurrentContext();
if (gc == NULL || gc->vtable->release_tex_image == NULL)
if (gc == NULL || gc->vtable == NULL || gc->vtable->release_tex_image == NULL)
return;
gc->vtable->release_tex_image(dpy, drawable, buffer);