Mesa (asm-shader-rework-1): ARB prog parser: Get program limits from the context
Ian Romanick
idr at kemper.freedesktop.org
Thu Jul 30 03:54:27 UTC 2009
Module: Mesa
Branch: asm-shader-rework-1
Commit: 48183ca8b6adfbb9555428cb8414b821fdd15717
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=48183ca8b6adfbb9555428cb8414b821fdd15717
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Wed Jul 29 20:51:38 2009 -0700
ARB prog parser: Get program limits from the context
Some debug code from the older stand-alone version of the assembler
was hanging around and needed to go.
---
src/mesa/shader/program_parse.tab.c | 27 +++------------------------
src/mesa/shader/program_parse.y | 27 +++------------------------
2 files changed, 6 insertions(+), 48 deletions(-)
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index ae35bd3..6c3c239 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -5051,7 +5051,6 @@ GLboolean
_mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
GLsizei len, struct asm_parser_state *state)
{
- struct gl_program_constants limits;
struct asm_instruction *inst;
unsigned i;
GLubyte *strz;
@@ -5077,29 +5076,9 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
state->st = _mesa_symbol_table_ctor();
- /* All of these limits should come from ctx.
- */
- limits.MaxInstructions = 128;
- limits.MaxAluInstructions = 128;
- limits.MaxTexInstructions = 128;
- limits.MaxTexIndirections = 128;
- limits.MaxAttribs = 16;
- limits.MaxTemps = 128;
- limits.MaxAddressRegs = 1;
- limits.MaxParameters = 128;
- limits.MaxLocalParams = 256;
- limits.MaxEnvParams = 128;
- limits.MaxNativeInstructions = 128;
- limits.MaxNativeAluInstructions = 128;
- limits.MaxNativeTexInstructions = 128;
- limits.MaxNativeTexIndirections = 128;
- limits.MaxNativeAttribs = 16;
- limits.MaxNativeTemps = 128;
- limits.MaxNativeAddressRegs = 1;
- limits.MaxNativeParameters = 128;
- limits.MaxUniformComponents = 0;
-
- state->limits = & limits;
+ state->limits = (target == GL_VERTEX_PROGRAM_ARB)
+ ? & ctx->Const.VertexProgram
+ : & ctx->Const.FragmentProgram;
state->MaxTextureImageUnits = 16;
state->MaxTextureCoordUnits = 8;
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 91a4036..65f7133 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -2182,7 +2182,6 @@ GLboolean
_mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
GLsizei len, struct asm_parser_state *state)
{
- struct gl_program_constants limits;
struct asm_instruction *inst;
unsigned i;
GLubyte *strz;
@@ -2208,29 +2207,9 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
state->st = _mesa_symbol_table_ctor();
- /* All of these limits should come from ctx.
- */
- limits.MaxInstructions = 128;
- limits.MaxAluInstructions = 128;
- limits.MaxTexInstructions = 128;
- limits.MaxTexIndirections = 128;
- limits.MaxAttribs = 16;
- limits.MaxTemps = 128;
- limits.MaxAddressRegs = 1;
- limits.MaxParameters = 128;
- limits.MaxLocalParams = 256;
- limits.MaxEnvParams = 128;
- limits.MaxNativeInstructions = 128;
- limits.MaxNativeAluInstructions = 128;
- limits.MaxNativeTexInstructions = 128;
- limits.MaxNativeTexIndirections = 128;
- limits.MaxNativeAttribs = 16;
- limits.MaxNativeTemps = 128;
- limits.MaxNativeAddressRegs = 1;
- limits.MaxNativeParameters = 128;
- limits.MaxUniformComponents = 0;
-
- state->limits = & limits;
+ state->limits = (target == GL_VERTEX_PROGRAM_ARB)
+ ? & ctx->Const.VertexProgram
+ : & ctx->Const.FragmentProgram;
state->MaxTextureImageUnits = 16;
state->MaxTextureCoordUnits = 8;
More information about the mesa-commit
mailing list