From d358c6b7006839e66311debfe36509144b0a7f92 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 10 Sep 2013 09:58:47 -0500 Subject: [PATCH] mesa: Set default values for Max{Input,Output}Components in init_program_limits MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Ian Romanick Reviewed-by: Brian Paul Reviewed-by: Marek Olšák Reviewed-by: Paul Berry --- src/mesa/main/context.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index d726d117ba6..58f42cc5b23 100644 --- a/src/mesa/main/context.c +++ b/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()"); -- 2.30.2