Mesa (master): ARB prog parser: use correct context limits

Ian Romanick idr at kemper.freedesktop.org
Mon Aug 24 19:02:47 UTC 2009


Module: Mesa
Branch: master
Commit: 4cf27608bc069225bf91d47585e344a2c122e940
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4cf27608bc069225bf91d47585e344a2c122e940

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 24 11:05:11 2009 -0600

ARB prog parser: use correct context limits

---

 src/mesa/shader/program_parse.y |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 89e8850..e2e83e4 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -2287,12 +2287,12 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
       ? & ctx->Const.VertexProgram
       : & ctx->Const.FragmentProgram;
 
-   state->MaxTextureImageUnits = 16;
-   state->MaxTextureCoordUnits = 8;
-   state->MaxTextureUnits = 8;
-   state->MaxClipPlanes = 6;
-   state->MaxLights = 8;
-   state->MaxProgramMatrices = 8;
+   state->MaxTextureImageUnits = ctx->Const.MaxTextureImageUnits;
+   state->MaxTextureCoordUnits = ctx->Const.MaxTextureCoordUnits;
+   state->MaxTextureUnits = ctx->Const.MaxTextureUnits;
+   state->MaxClipPlanes = ctx->Const.MaxClipPlanes;
+   state->MaxLights = ctx->Const.MaxLights;
+   state->MaxProgramMatrices = ctx->Const.MaxProgramMatrices;
 
    state->state_param_enum = (target == GL_VERTEX_PROGRAM_ARB)
       ? STATE_VERTEX_PROGRAM : STATE_FRAGMENT_PROGRAM;




More information about the mesa-commit mailing list