Commit 5d6b0e7f authored by Ian Romanick's avatar Ian Romanick

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: default avatarIan Romanick <ian.d.romanick@intel.com>
Reviewed-by: default avatarPaul Berry <stereotype441@gmail.com>
parent 7db50171
......@@ -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) {
......
......@@ -99,7 +99,6 @@ _mesa_glsl_parse_state::_mesa_glsl_parse_state(struct gl_context *_ctx,
this->Const.MaxTextureCoords = ctx->Const.MaxTextureCoordUnits;
this->Const.MaxVertexAttribs = ctx->Const.VertexProgram.MaxAttribs;
this->Const.MaxVertexUniformComponents = ctx->Const.VertexProgram.MaxUniformComponents;
this->Const.MaxVaryingFloats = ctx->Const.MaxVarying * 4;
this->Const.MaxVertexTextureImageUnits = ctx->Const.VertexProgram.MaxTextureImageUnits;
this->Const.MaxCombinedTextureImageUnits = ctx->Const.MaxCombinedTextureImageUnits;
this->Const.MaxTextureImageUnits = ctx->Const.FragmentProgram.MaxTextureImageUnits;
......
......@@ -208,7 +208,6 @@ struct _mesa_glsl_parse_state {
unsigned MaxTextureCoords;
unsigned MaxVertexAttribs;
unsigned MaxVertexUniformComponents;
unsigned MaxVaryingFloats;
unsigned MaxVertexTextureImageUnits;
unsigned MaxCombinedTextureImageUnits;
unsigned MaxTextureImageUnits;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment