From: Eduardo Lima Mitev <elima@igalia.com>
Date: Fri, 10 Jun 2016 17:15:33 +0000 (+0200)
Subject: glsl/builtin_variables: Populate MaxCombinedShaderStorageBlocks on GLSL 4.40
X-Git-Tag: upstream/17.1.0~8747
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a93bb2e33f189c838a80125bcd5ce388f681dcaf;p=platform%2Fupstream%2Fmesa.git

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>
---

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);