summaryrefslogtreecommitdiffstats
path: root/src/egl/main
diff options
context:
space:
mode:
authorMarek Olšák <marek.olsak@amd.com>2015-05-12 00:44:20 +0200
committerMarek Olšák <marek.olsak@amd.com>2015-06-05 19:44:33 +0200
commitf9f894447e4e7442d5dfa489bb43f2823e2fc71d (patch)
tree02993cb958195a58b929c186675e5c8700828808 /src/egl/main
parent0e4b564ef288159f16f7a6886b6cfc0110411af8 (diff)
downloadexternal_mesa3d-f9f894447e4e7442d5dfa489bb43f2823e2fc71d.zip
external_mesa3d-f9f894447e4e7442d5dfa489bb43f2823e2fc71d.tar.gz
external_mesa3d-f9f894447e4e7442d5dfa489bb43f2823e2fc71d.tar.bz2
egl: fix setting context flags
Cc: 10.6 10.5 10.4 <mesa-stable@lists.freedesktop.org> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Chad Versace <chad.versace@intel.com>
Diffstat (limited to 'src/egl/main')
-rw-r--r--src/egl/main/eglcontext.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 514b91a..e50b8fb 100644
--- a/src/egl/main/eglcontext.c
+++ b/src/egl/main/eglcontext.c
@@ -131,7 +131,7 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *dpy,
break;
}
- ctx->Flags = val;
+ ctx->Flags |= val;
break;
case EGL_CONTEXT_OPENGL_PROFILE_MASK_KHR:
@@ -194,7 +194,8 @@ _eglParseContextAttribList(_EGLContext *ctx, _EGLDisplay *dpy,
break;
}
- ctx->Flags = EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR;
+ if (val == EGL_TRUE)
+ ctx->Flags |= EGL_CONTEXT_OPENGL_ROBUST_ACCESS_BIT_KHR;
break;
default: