[Mesa-dev] [PATCH] glsl/builtin_variables: Populate MaxCombinedShaderStorageBlocks on GLSL 4.40

[Kenneth Graunke]

On Monday, June 13, 2016 12:50:12 PM PDT Eduardo Lima Mitev wrote:
> 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
> ---
>  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 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);
> 

Interesting, it's definitely not in revision 6, and I see it in the
"changes since revision 8" part of the spec.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160613/4d6a5325/attachment.sig>