Mesa (10.5): egl: fix setting context flags

[Emil Velikov]

Module: Mesa
Branch: 10.5
Commit: 4a2d7fbde47c5043dacb75079813a06dc221eaa3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4a2d7fbde47c5043dacb75079813a06dc221eaa3

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Tue May 12 00:44:20 2015 +0200

egl: fix setting context flags

Cc: 10.6 10.5 10.4 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Chad Versace <chad.versace at intel.com>
(cherry picked from commit f9f894447e4e7442d5dfa489bb43f2823e2fc71d)

---

 src/egl/main/eglcontext.c |    5 +++--
 1 file 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: