[Mesa-dev] [PATCH 18/23] glsl: Add built-in constants for ARB_shader_image_load_store.

[Paul Berry]

On 26 November 2013 00:02, Francisco Jerez <currojerez at riseup.net> wrote:

> ---
>  src/glsl/builtin_variables.cpp  | 19 +++++++++++++++++++
>  src/glsl/glsl_parser_extras.cpp |  8 ++++++++
>  src/glsl/glsl_parser_extras.h   |  9 +++++++++
>  3 files changed, 36 insertions(+)
>
> diff --git a/src/glsl/builtin_variables.cpp
> b/src/glsl/builtin_variables.cpp
> index d57324c..47a6b39 100644
> --- a/src/glsl/builtin_variables.cpp
> +++ b/src/glsl/builtin_variables.cpp
> @@ -658,6 +658,25 @@ builtin_variable_generator::generate_constants()
>        add_const("gl_MaxTessControlAtomicCounters", 0);
>        add_const("gl_MaxTessEvaluationAtomicCounters", 0);
>     }
> +
> +   if (state->ARB_shader_image_load_store_enable) {
>

Let's make this "if (state->is_version(420, 0) ||
state->ARB_shader_image_load_store_enable)" so that the right thing will
happen when we get to GLSL version 4.20.

With that changed, this patch is:

Reviewed-by: Paul Berry <stereotype441 at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20131211/ca6ee7f2/attachment.html>