diff options
| author | Francisco Jerez <[email protected]> | 2015-08-17 19:10:46 +0300 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2015-08-20 12:26:53 +0300 |
| commit | 47e0d5b9b28b0753adda70cbfb3ad111ba6169a8 (patch) | |
| tree | b57e97bb8eaf059d5b5a403345972f6a14cf9cb8 /src/glsl/builtin_variables.cpp | |
| parent | 3547d9855c2103ecc5001a082965d3dda5d69d34 (diff) | |
mesa: Rename MaxCombinedImageUnitsAndFragmentOutputs to MaxCombinedShaderOutputResources.
The name of both the GLSL built-in variable and the glGetInteger param
with the same value changed in GLSL ES 3.1 and GL 4.5. Its semantics
also changed slightly, since the limit now also takes into account the
number of SSBs in use. Switch our internal data structures to the
up-to-date name.
Reviewed-by: Timothy Arceri <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glsl/builtin_variables.cpp')
| -rw-r--r-- | src/glsl/builtin_variables.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 53d3500b1f4..c6fdccfd721 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl/builtin_variables.cpp @@ -749,7 +749,7 @@ builtin_variable_generator::generate_constants() add_const("gl_MaxImageUnits", state->Const.MaxImageUnits); add_const("gl_MaxCombinedImageUnitsAndFragmentOutputs", - state->Const.MaxCombinedImageUnitsAndFragmentOutputs); + state->Const.MaxCombinedShaderOutputResources); add_const("gl_MaxImageSamples", state->Const.MaxImageSamples); add_const("gl_MaxVertexImageUniforms", |