summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/get_hash_params.py
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2015-08-17 19:10:46 +0300
committerFrancisco Jerez <currojerez@riseup.net>2015-08-20 12:26:53 +0300
commit47e0d5b9b28b0753adda70cbfb3ad111ba6169a8 (patch)
treeb57e97bb8eaf059d5b5a403345972f6a14cf9cb8 /src/mesa/main/get_hash_params.py
parent3547d9855c2103ecc5001a082965d3dda5d69d34 (diff)
downloadexternal_mesa3d-47e0d5b9b28b0753adda70cbfb3ad111ba6169a8.zip
external_mesa3d-47e0d5b9b28b0753adda70cbfb3ad111ba6169a8.tar.gz
external_mesa3d-47e0d5b9b28b0753adda70cbfb3ad111ba6169a8.tar.bz2
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 <t_arceri@yahoo.com.au> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Diffstat (limited to 'src/mesa/main/get_hash_params.py')
-rw-r--r--src/mesa/main/get_hash_params.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py
index 7dc92f1..517c391 100644
--- a/src/mesa/main/get_hash_params.py
+++ b/src/mesa/main/get_hash_params.py
@@ -806,7 +806,7 @@ descriptor=[
[ "MAX_VERTEX_ATTRIB_BINDINGS", "CONTEXT_ENUM(Const.MaxVertexAttribBindings), NO_EXTRA" ],
# GL_ARB_shader_image_load_store
- [ "MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS", "CONTEXT_INT(Const.MaxCombinedImageUnitsAndFragmentOutputs), extra_ARB_shader_image_load_store" ],
+ [ "MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS", "CONTEXT_INT(Const.MaxCombinedShaderOutputResources), extra_ARB_shader_image_load_store" ],
[ "MAX_IMAGE_SAMPLES", "CONTEXT_INT(Const.MaxImageSamples), extra_ARB_shader_image_load_store" ],
[ "MAX_GEOMETRY_IMAGE_UNIFORMS", "CONTEXT_INT(Const.Program[MESA_SHADER_GEOMETRY].MaxImageUniforms), extra_ARB_shader_image_load_store_and_geometry_shader"],