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/glsl_parser_extras.h | |
| 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/glsl_parser_extras.h')
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index 57a7555158a..e3cdbc5ee2b 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -395,7 +395,7 @@ struct _mesa_glsl_parse_state { /* ARB_shader_image_load_store */ unsigned MaxImageUnits; - unsigned MaxCombinedImageUnitsAndFragmentOutputs; + unsigned MaxCombinedShaderOutputResources; unsigned MaxImageSamples; unsigned MaxVertexImageUniforms; unsigned MaxTessControlImageUniforms; |