diff options
author | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-06-22 08:35:52 +0200 |
commit | 2cb91952f6e94907b3614535edbfc3f979085694 (patch) | |
tree | 6d11e620b1c10564f344d469a5d730e1df7fbb90 /mesalib/src/mesa/main/context.c | |
parent | 7ec34a94883810e9f4a8e417f00300c2c31808b0 (diff) | |
parent | e1a407256a5c1571d8f4871fd981a51cfbd46e37 (diff) | |
download | vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.gz vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.tar.bz2 vcxsrv-2cb91952f6e94907b3614535edbfc3f979085694.zip |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/gen/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
-rw-r--r-- | mesalib/src/mesa/main/context.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 3bcedecd9..643476b94 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -542,6 +542,9 @@ init_program_limits(GLenum type, struct gl_program_constants *prog) prog->MediumInt.RangeMax = 24; prog->MediumInt.Precision = 0; prog->LowInt = prog->HighInt = prog->MediumInt; + + prog->MaxUniformBlocks = 12; + prog->MaxCombinedUniformComponents = prog->MaxUniformComponents; } @@ -653,6 +656,12 @@ _mesa_init_constants(struct gl_context *ctx) ctx->Const.MaxTransformFeedbackSeparateComponents = 4 * MAX_FEEDBACK_ATTRIBS; ctx->Const.MaxTransformFeedbackInterleavedComponents = 4 * MAX_FEEDBACK_ATTRIBS; + /** GL_ARB_uniform_buffer_object */ + ctx->Const.MaxCombinedUniformBlocks = 36; + ctx->Const.MaxUniformBufferBindings = 36; + ctx->Const.MaxUniformBlockSize = 16384; + ctx->Const.UniformBufferOffsetAlignment = 1; + /* GL 3.2: hard-coded for now: */ ctx->Const.ProfileMask = GL_CONTEXT_COMPATIBILITY_PROFILE_BIT; |