summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Lima Mitev <elima@igalia.com>2016-06-10 19:15:33 +0200
committerEduardo Lima Mitev <elima@igalia.com>2016-06-14 10:21:26 +0200
commita93bb2e33f189c838a80125bcd5ce388f681dcaf (patch)
tree27b4fddfd4f3befa6e70d208c5d374f6583ae8fe
parent1cdb4da1d6ce94d947e41d4f0e568074f4f59577 (diff)
downloadexternal_mesa3d-a93bb2e33f189c838a80125bcd5ce388f681dcaf.zip
external_mesa3d-a93bb2e33f189c838a80125bcd5ce388f681dcaf.tar.gz
external_mesa3d-a93bb2e33f189c838a80125bcd5ce388f681dcaf.tar.bz2
glsl/builtin_variables: Populate MaxCombinedShaderStorageBlocks on GLSL 4.40
Built-in variable "MaxCombinedShaderStorageBlocks" was added to GLSL 4.40 revision 9. Section "1.2.1 Changes since revision 8 of GLSL version 4.40", page 3 of the PDF states: "Bug 11734: Add gl_MaxCombinedShaderOutputResources and mark gl_MaxCombinedImageUnitsAndFragmentOutputs as deprecated." Fixes: GL44-CTS.shader_image_load_store.basic-glsl-const Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
-rw-r--r--src/compiler/glsl/builtin_variables.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp
index 05b3b0b..e5e7380 100644
--- a/src/compiler/glsl/builtin_variables.cpp
+++ b/src/compiler/glsl/builtin_variables.cpp
@@ -864,7 +864,7 @@ builtin_variable_generator::generate_constants()
}
}
- if (state->is_version(450, 310) ||
+ if (state->is_version(440, 310) ||
state->ARB_ES3_1_compatibility_enable) {
add_const("gl_MaxCombinedShaderOutputResources",
state->Const.MaxCombinedShaderOutputResources);