aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/drivers/dri
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-29 11:28:12 +0100
committermarha <marha@users.sourceforge.net>2013-11-29 11:28:12 +0100
commit52cd3051ba15ddda117f8d8cae1979cd3c86f5b6 (patch)
treefbfed14bbfb67daadbff4b0a77b2f6587ffc71d5 /mesalib/src/mesa/drivers/dri
parent7a80ea1b5dd2eb54717fdcc427912a9764e7719f (diff)
parentc043f97a8572e1f509251288d8bcd70d0fb96770 (diff)
downloadvcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.gz
vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.tar.bz2
vcxsrv-52cd3051ba15ddda117f8d8cae1979cd3c86f5b6.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa xserver git update 29 Nov 2013
Diffstat (limited to 'mesalib/src/mesa/drivers/dri')
-rw-r--r--mesalib/src/mesa/drivers/dri/common/dri_util.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c
index 6ca75f41d..379935015 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_util.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c
@@ -411,8 +411,10 @@ driCreateContextAttribs(__DRIscreen *screen, int api,
mesa_api = API_OPENGL_CORE;
}
- if ((flags & ~(__DRI_CTX_FLAG_DEBUG | __DRI_CTX_FLAG_FORWARD_COMPATIBLE))
- != 0) {
+ const uint32_t allowed_flags = (__DRI_CTX_FLAG_DEBUG
+ | __DRI_CTX_FLAG_FORWARD_COMPATIBLE
+ | __DRI_CTX_FLAG_ROBUST_BUFFER_ACCESS);
+ if (flags & ~allowed_flags) {
*error = __DRI_CTX_ERROR_UNKNOWN_FLAG;
return NULL;
}