aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl/standalone_scaffolding.cpp
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-09-20 11:58:12 +0200
committermarha <marha@users.sourceforge.net>2013-09-20 11:58:12 +0200
commita5179a42a3376f0d8c1d01456235b044854d8bdc (patch)
tree04018368b95d6eb802adbf083fdd774a0336be51 /mesalib/src/glsl/standalone_scaffolding.cpp
parent4888b09cfc72713f460dd7457fb2b7eca0abb91c (diff)
parent55c05b8a12944349b00053253d3a49b223a9f4de (diff)
downloadvcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.gz
vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.tar.bz2
vcxsrv-a5179a42a3376f0d8c1d01456235b044854d8bdc.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig mesa pixman git update 20 Sep 2013
Diffstat (limited to 'mesalib/src/glsl/standalone_scaffolding.cpp')
-rw-r--r--mesalib/src/glsl/standalone_scaffolding.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/glsl/standalone_scaffolding.cpp b/mesalib/src/glsl/standalone_scaffolding.cpp
index 11cd6cdc0..6dec205f7 100644
--- a/mesalib/src/glsl/standalone_scaffolding.cpp
+++ b/mesalib/src/glsl/standalone_scaffolding.cpp
@@ -116,11 +116,13 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
ctx->Const.VertexProgram.MaxAttribs = 16;
ctx->Const.VertexProgram.MaxUniformComponents = 512;
+ ctx->Const.VertexProgram.MaxOutputComponents = 32;
ctx->Const.MaxVarying = 8; /* == gl_MaxVaryingFloats / 4 */
ctx->Const.VertexProgram.MaxTextureImageUnits = 0;
ctx->Const.MaxCombinedTextureImageUnits = 2;
ctx->Const.FragmentProgram.MaxTextureImageUnits = 2;
ctx->Const.FragmentProgram.MaxUniformComponents = 64;
+ ctx->Const.FragmentProgram.MaxInputComponents = 32;
ctx->Const.MaxDrawBuffers = 1;