aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-12 08:25:37 +0200
committermarha <marha@users.sourceforge.net>2013-07-12 08:25:37 +0200
commit66b46719d55e60d53b42858770d6ac40d079ab13 (patch)
treeaad06d011ed8b820685f72ada34e56ee0f2580c6 /mesalib/src/mesa
parentf8f0209a691e0d0838d1ef9d602ebacafee2a233 (diff)
parentffce4319c2fb6f4f663cc5a9660e1d5837fcde87 (diff)
downloadvcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.tar.gz
vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.tar.bz2
vcxsrv-66b46719d55e60d53b42858770d6ac40d079ab13.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libxtrans fontconfig mesa xserver git update 12 Jul 2013
Diffstat (limited to 'mesalib/src/mesa')
-rw-r--r--mesalib/src/mesa/main/context.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 5ad04cc99..d687fb7c0 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -636,8 +636,10 @@ _mesa_init_constants(struct gl_context *ctx)
ctx->Const.MaxTransformFeedbackInterleavedComponents = 4 * MAX_FEEDBACK_ATTRIBS;
ctx->Const.MaxVertexStreams = 1;
- /* GL 3.2: hard-coded for now: */
- ctx->Const.ProfileMask = GL_CONTEXT_COMPATIBILITY_PROFILE_BIT;
+ /* GL 3.2 */
+ ctx->Const.ProfileMask = ctx->API == API_OPENGL_CORE
+ ? GL_CONTEXT_CORE_PROFILE_BIT
+ : GL_CONTEXT_COMPATIBILITY_PROFILE_BIT;
/** GL_EXT_gpu_shader4 */
ctx->Const.MinProgramTexelOffset = -8;