Import Mesa 13.0.2

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/mesa/src/glx/apple/apple_xgl_api_stereo.c b/lib/mesa/src/glx/apple/apple_xgl_api_stereo.c
index 4b21aaf79..0d2f6fa65 100644
--- a/lib/mesa/src/glx/apple/apple_xgl_api_stereo.c
+++ b/lib/mesa/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/lib/mesa/src/glx/apple/apple_xgl_api_viewport.c b/lib/mesa/src/glx/apple/apple_xgl_api_viewport.c
index 281c90c6b..c40061df4 100644
--- a/lib/mesa/src/glx/apple/apple_xgl_api_viewport.c
+++ b/lib/mesa/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);