diff options
| author | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-09-20 11:58:12 +0200 |
| commit | a5179a42a3376f0d8c1d01456235b044854d8bdc (patch) | |
| tree | 04018368b95d6eb802adbf083fdd774a0336be51 /mesalib/src/mesa/main/context.c | |
| parent | 4888b09cfc72713f460dd7457fb2b7eca0abb91c (diff) | |
| parent | 55c05b8a12944349b00053253d3a49b223a9f4de (diff) | |
| download | vcxsrv-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/main/context.c')
| -rw-r--r-- | mesalib/src/mesa/main/context.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c index d726d117b..58f42cc5b 100644 --- a/mesalib/src/mesa/main/context.c +++ b/mesalib/src/mesa/main/context.c @@ -478,18 +478,24 @@ init_program_limits(struct gl_context *ctx, GLenum type, prog->MaxAttribs = MAX_VERTEX_GENERIC_ATTRIBS; prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS; prog->MaxUniformComponents = 4 * MAX_UNIFORMS; + prog->MaxInputComponents = 0; /* value not used */ + prog->MaxOutputComponents = 16 * 4; /* old limit not to break tnl and swrast */ break; case GL_FRAGMENT_PROGRAM_ARB: prog->MaxParameters = MAX_NV_FRAGMENT_PROGRAM_PARAMS; prog->MaxAttribs = MAX_NV_FRAGMENT_PROGRAM_INPUTS; prog->MaxAddressRegs = MAX_FRAGMENT_PROGRAM_ADDRESS_REGS; prog->MaxUniformComponents = 4 * MAX_UNIFORMS; + prog->MaxInputComponents = 16 * 4; /* old limit not to break tnl and swrast */ + prog->MaxOutputComponents = 0; /* value not used */ break; case MESA_GEOMETRY_PROGRAM: prog->MaxParameters = MAX_VERTEX_PROGRAM_PARAMS; prog->MaxAttribs = MAX_VERTEX_GENERIC_ATTRIBS; prog->MaxAddressRegs = MAX_VERTEX_PROGRAM_ADDRESS_REGS; prog->MaxUniformComponents = MAX_GEOMETRY_UNIFORM_COMPONENTS; + prog->MaxInputComponents = 16 * 4; /* old limit not to break tnl and swrast */ + prog->MaxOutputComponents = 16 * 4; /* old limit not to break tnl and swrast */ break; default: assert(0 && "Bad program type in init_program_limits()"); |