diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2016-06-07 13:33:34 +0300 |
|---|---|---|
| committer | Tapani Pälli <tapani.palli@intel.com> | 2016-08-15 09:24:10 +0300 |
| commit | 5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6 (patch) | |
| tree | 33c11b4c897587e5a3780dabbc5e82088dfed41b /src/glx/apple | |
| parent | 2e3f067458e4a70da91b27fab61ef3d292ded4cf (diff) | |
| download | external_mesa3d-5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6.zip external_mesa3d-5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6.tar.gz external_mesa3d-5d9b50e596c9d81c37ce0844ae0f8c9da3f6bea6.tar.bz2 | |
glx: apple specific occurences of dummyContext check
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Cc: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Diffstat (limited to 'src/glx/apple')
| -rw-r--r-- | src/glx/apple/apple_xgl_api_stereo.c | 4 | ||||
| -rw-r--r-- | src/glx/apple/apple_xgl_api_viewport.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/glx/apple/apple_xgl_api_stereo.c b/src/glx/apple/apple_xgl_api_stereo.c index 4b21aaf..0d2f6fa 100644 --- a/src/glx/apple/apple_xgl_api_stereo.c +++ b/src/glx/apple/apple_xgl_api_stereo.c @@ -54,7 +54,7 @@ __applegl_glDrawBuffer(GLenum mode) { struct glx_context * gc = __glXGetCurrentContext(); - if (gc && apple_glx_context_uses_stereo(gc->driContext)) { + if (gc != &dummyContext && apple_glx_context_uses_stereo(gc->driContext)) { GLenum buf[2]; GLsizei n = 0; @@ -89,7 +89,7 @@ __applegl_glDrawBuffers(GLsizei n, const GLenum * bufs) { struct glx_context * gc = __glXGetCurrentContext(); - if (gc && apple_glx_context_uses_stereo(gc->driContext)) { + if (gc != &dummyContext && apple_glx_context_uses_stereo(gc->driContext)) { GLenum newbuf[n + 2]; GLsizei i, outi = 0; bool have_back = false; diff --git a/src/glx/apple/apple_xgl_api_viewport.c b/src/glx/apple/apple_xgl_api_viewport.c index 281c90c..c40061d 100644 --- a/src/glx/apple/apple_xgl_api_viewport.c +++ b/src/glx/apple/apple_xgl_api_viewport.c @@ -41,7 +41,7 @@ __applegl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height) struct glx_context *gc = __glXGetCurrentContext(); Display *dpy = glXGetCurrentDisplay(); - if (gc && gc->driContext) + if (gc != &dummyContext && gc->driContext) apple_glx_context_update(dpy, gc->driContext); __ogl_framework_api->Viewport(x, y, width, height); |