OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Simplify some dummy vtable interactions

Browse Source 
The dummy vtable has these slots as NULL already, no need to check for
the dummy context explicitly.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Adam Jackson
2017-11-14 15:13:01 -05:00
parent 8893418e99
commit bcb15bee52
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glx/glxcmds.c
View File

@@ -528,7 +528,7 @@ glXWaitGL(void)
{ {
struct glx_context *gc = __glXGetCurrentContext(); struct glx_context *gc = __glXGetCurrentContext();
if (gc != &dummyContext && gc->vtable->wait_gl) if (gc->vtable->wait_gl)
gc->vtable->wait_gl(gc); gc->vtable->wait_gl(gc);
} }
@@ -541,7 +541,7 @@ glXWaitX(void)
{ {
struct glx_context *gc = __glXGetCurrentContext(); struct glx_context *gc = __glXGetCurrentContext();
if (gc != &dummyContext && gc->vtable->wait_x) if (gc->vtable->wait_x)
gc->vtable->wait_x(gc); gc->vtable->wait_x(gc);
} }
@@ -550,7 +550,7 @@ glXUseXFont(Font font, int first, int count, int listBase)
{ {
struct glx_context *gc = __glXGetCurrentContext(); struct glx_context *gc = __glXGetCurrentContext();
if (gc != &dummyContext && gc->vtable->use_x_font) if (gc->vtable->use_x_font)
gc->vtable->use_x_font(gc, font, first, count, listBase); gc->vtable->use_x_font(gc, font, first, count, listBase);
} }
@@ -2431,7 +2431,7 @@ __glXBindTexImageEXT(Display * dpy,
{ {
struct glx_context *gc = __glXGetCurrentContext(); struct glx_context *gc = __glXGetCurrentContext();
if (gc == &dummyContext || gc->vtable->bind_tex_image == NULL) if (gc->vtable->bind_tex_image == NULL)
return; return;
gc->vtable->bind_tex_image(dpy, drawable, buffer, attrib_list); gc->vtable->bind_tex_image(dpy, drawable, buffer, attrib_list);
@@ -2442,7 +2442,7 @@ __glXReleaseTexImageEXT(Display * dpy, GLXDrawable drawable, int buffer)
{ {
struct glx_context *gc = __glXGetCurrentContext(); struct glx_context *gc = __glXGetCurrentContext();
if (gc == &dummyContext || gc->vtable->release_tex_image == NULL) if (gc->vtable->release_tex_image == NULL)
return; return;
gc->vtable->release_tex_image(dpy, drawable, buffer); gc->vtable->release_tex_image(dpy, drawable, buffer);