From: Marek Olšák <marek.olsak@amd.com>
Date: Mon, 11 May 2015 22:44:20 +0000 (+0200)
Subject: egl: fix setting context flags
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f9f894447e4e7442d5dfa489bb43f2823e2fc71d;p=mesa.git

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>
---

diff --git a/src/egl/main/eglcontext.c b/src/egl/main/eglcontext.c
index 514b91aeef2..e50b8fb55f6 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: