aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/state_tracker
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/mesa/state_tracker
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/mesa/state_tracker')
-rw-r--r--mesalib/src/mesa/state_tracker/st_extensions.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index 0b7001bae..97dd73210 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -256,7 +256,10 @@ void st_init_limits(struct st_context *st)
c->MaxVarying = screen->get_shader_param(screen, PIPE_SHADER_FRAGMENT,
PIPE_SHADER_CAP_MAX_INPUTS);
c->MaxVarying = MIN2(c->MaxVarying, MAX_VARYING);
- c->MaxVaryingComponents = c->MaxVarying * 4;
+ c->FragmentProgram.MaxInputComponents = c->MaxVarying * 4;
+ c->VertexProgram.MaxOutputComponents = c->MaxVarying * 4;
+ c->GeometryProgram.MaxInputComponents = c->MaxVarying * 4;
+ c->GeometryProgram.MaxOutputComponents = c->MaxVarying * 4;
c->MinProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MIN_TEXEL_OFFSET);
c->MaxProgramTexelOffset = screen->get_param(screen, PIPE_CAP_MAX_TEXEL_OFFSET);