diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2013-09-10 12:16:57 -0500 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2013-10-07 09:59:23 -0700 |
| commit | 5d6b0e7f1b1d8eaaded76964989a7adf4ed71662 (patch) | |
| tree | c6b680eddccc7dd77265590aa1a06a5a124d41b1 /src/glsl/builtin_variables.cpp | |
| parent | 7db50171be05016fc0a4501c0fd62ef2bed78fbf (diff) | |
glsl: Remove glsl_parser_state MaxVaryingFloats field
Pull the data directly from the context like the other varying related
limits. The parser state shadow copies were added back when the parser
state didn't have a pointer to the context. There's no reason to do it
now days.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Paul Berry <stereotype441@gmail.com>
Diffstat (limited to 'src/glsl/builtin_variables.cpp')
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index a75bb6ddab4..cb970fba314 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -501,7 +501,8 @@ builtin_variable_generator::generate_constants() add_const("gl_MaxFragmentInputVectors", state->ctx->Const.FragmentProgram.MaxInputComponents / 4); } else { - add_const("gl_MaxVaryingVectors", state->Const.MaxVaryingFloats / 4); + add_const("gl_MaxVaryingVectors", + state->ctx->Const.MaxVarying); } } else { add_const("gl_MaxVertexUniformComponents", @@ -510,7 +511,7 @@ builtin_variable_generator::generate_constants() /* Note: gl_MaxVaryingFloats was deprecated in GLSL 1.30+, but not * removed */ - add_const("gl_MaxVaryingFloats", state->Const.MaxVaryingFloats); + add_const("gl_MaxVaryingFloats", state->ctx->Const.MaxVarying * 4); add_const("gl_MaxFragmentUniformComponents", state->Const.MaxFragmentUniformComponents); @@ -531,7 +532,7 @@ builtin_variable_generator::generate_constants() if (state->is_version(130, 0)) { add_const("gl_MaxClipDistances", state->Const.MaxClipPlanes); - add_const("gl_MaxVaryingComponents", state->Const.MaxVaryingFloats); + add_const("gl_MaxVaryingComponents", state->ctx->Const.MaxVarying * 4); } if (compatibility) { |