diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/glsl/builtin_functions.cpp | 6 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/compiler/glsl/builtin_functions.cpp b/src/compiler/glsl/builtin_functions.cpp index db2d3e3b0cd..161c98bd018 100644 --- a/src/compiler/glsl/builtin_functions.cpp +++ b/src/compiler/glsl/builtin_functions.cpp @@ -334,15 +334,13 @@ static bool fs_texture_cube_map_array(const _mesa_glsl_parse_state *state) { return state->stage == MESA_SHADER_FRAGMENT && - (state->is_version(400, 0) || - state->ARB_texture_cube_map_array_enable); + state->has_texture_cube_map_array(); } static bool texture_cube_map_array(const _mesa_glsl_parse_state *state) { - return state->is_version(400, 0) || - state->ARB_texture_cube_map_array_enable; + return state->has_texture_cube_map_array(); } static bool diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index 7092281a2b4..82ce6a78164 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -317,6 +317,12 @@ struct _mesa_glsl_parse_state { MESA_shader_framebuffer_fetch_non_coherent_enable; } + bool has_texture_cube_map_array() const + { + return ARB_texture_cube_map_array_enable || + is_version(400, 0); + } + void process_version_directive(YYLTYPE *locp, int version, const char *ident); |