diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-29 16:09:45 +0200 |
| commit | 8e69b2fa996acf8fa1d218b67a203eb67e280899 (patch) | |
| tree | 1caebab7024f5b62dc57e49a69a20ef10cb8210f /mesalib/src/mesa/main/context.c | |
| parent | cd103d3f4d59ac4f09cfcf126e572ddb0b9d4628 (diff) | |
| parent | f6d1847eef027266daa0f75ee92ceb09698b2761 (diff) | |
| download | vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.gz vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.tar.bz2 vcxsrv-8e69b2fa996acf8fa1d218b67a203eb67e280899.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/glx/gen_gl_wrappers.py
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'mesalib/src/mesa/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index 643476b94..7de714b81 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -652,7 +652,7 @@ _mesa_init_constants(struct gl_context *ctx) ctx->Const.QuadsFollowProvokingVertexConvention = GL_TRUE; /* GL_EXT_transform_feedback */ - ctx->Const.MaxTransformFeedbackSeparateAttribs = MAX_FEEDBACK_ATTRIBS; + ctx->Const.MaxTransformFeedbackBuffers = MAX_FEEDBACK_BUFFERS; ctx->Const.MaxTransformFeedbackSeparateComponents = 4 * MAX_FEEDBACK_ATTRIBS; ctx->Const.MaxTransformFeedbackInterleavedComponents = 4 * MAX_FEEDBACK_ATTRIBS; |