From a93bb2e33f189c838a80125bcd5ce388f681dcaf Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Fri, 10 Jun 2016 19:15:33 +0200 Subject: [PATCH] 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 --- src/compiler/glsl/builtin_variables.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compiler/glsl/builtin_variables.cpp b/src/compiler/glsl/builtin_variables.cpp index 05b3b0b8a3a..e5e73802126 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); -- 2.30.2