[Mesa-dev] [PATCH 1/2] glsl: add support for textureSamples function

[Matt Turner]

On Tue, Aug 11, 2015 at 6:51 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
> ---
>  src/glsl/builtin_functions.cpp             | 32 +++++++++++++++++++++++++++++-
>  src/glsl/glcpp/glcpp-parse.y               |  3 +++
>  src/glsl/glsl_parser_extras.cpp            |  1 +
>  src/glsl/glsl_parser_extras.h              |  2 ++
>  src/glsl/ir.cpp                            |  5 +++--
>  src/glsl/ir.h                              |  3 ++-
>  src/glsl/ir_clone.cpp                      |  1 +
>  src/glsl/ir_equals.cpp                     |  1 +
>  src/glsl/ir_hv_accept.cpp                  |  1 +
>  src/glsl/ir_print_visitor.cpp              |  6 ++++--
>  src/glsl/ir_reader.cpp                     |  6 +++++-
>  src/glsl/ir_rvalue_visitor.cpp             |  1 +
>  src/glsl/nir/glsl_to_nir.cpp               |  5 +++++
>  src/glsl/nir/nir.h                         |  4 +++-
>  src/glsl/nir/nir_print.c                   |  3 +++
>  src/glsl/opt_tree_grafting.cpp             |  1 +
>  src/mesa/main/mtypes.h                     |  1 +
>  src/mesa/state_tracker/st_glsl_to_tgsi.cpp |  2 ++
>  18 files changed, 70 insertions(+), 8 deletions(-)
>
> diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp
> index 2175c66..1a71d74 100644
> --- a/src/glsl/builtin_functions.cpp
> +++ b/src/glsl/builtin_functions.cpp
> @@ -399,6 +399,13 @@ shader_image_load_store(const _mesa_glsl_parse_state *state)
>  }
>
>  static bool
> +shader_samples(const _mesa_glsl_parse_state *state)
> +{
> +   return state->is_version(450, 0) ||
> +      state->ARB_shader_texture_image_samples_enable;

Vertically align these expressions.

> +}