diff options
| author | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-04-02 22:56:49 -0400 |
|---|---|---|
| committer | Ilia Mirkin <imirkin@alum.mit.edu> | 2016-04-03 18:06:52 -0400 |
| commit | 7af12a8dc6c96b8b0da802b3b25fbd6a197b2d62 (patch) | |
| tree | 10d9e4465b5d0fe5c5c16c037ca89b223a8680a9 /src/compiler/glsl/builtin_types.cpp | |
| parent | aebb0e0186b6ed086c204c3c2989ae84b0cc1bf5 (diff) | |
| download | external_mesa3d-7af12a8dc6c96b8b0da802b3b25fbd6a197b2d62.zip external_mesa3d-7af12a8dc6c96b8b0da802b3b25fbd6a197b2d62.tar.gz external_mesa3d-7af12a8dc6c96b8b0da802b3b25fbd6a197b2d62.tar.bz2 | |
glsl: make *sampler2DMSArray available in ESSL 3.20
Also avoid double-adding the *sampler2DMS types when the array ext is
enabled.
Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/compiler/glsl/builtin_types.cpp')
| -rw-r--r-- | src/compiler/glsl/builtin_types.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/compiler/glsl/builtin_types.cpp b/src/compiler/glsl/builtin_types.cpp index d250234..5f208f8 100644 --- a/src/compiler/glsl/builtin_types.cpp +++ b/src/compiler/glsl/builtin_types.cpp @@ -181,7 +181,7 @@ static const struct builtin_type_versions { T(sampler2DRect, 140, 999) T(samplerBuffer, 140, 320) T(sampler2DMS, 150, 310) - T(sampler2DMSArray, 150, 999) + T(sampler2DMSArray, 150, 320) T(isampler1D, 130, 999) T(isampler2D, 130, 300) @@ -193,7 +193,7 @@ static const struct builtin_type_versions { T(isampler2DRect, 140, 999) T(isamplerBuffer, 140, 320) T(isampler2DMS, 150, 310) - T(isampler2DMSArray, 150, 999) + T(isampler2DMSArray, 150, 320) T(usampler1D, 130, 999) T(usampler2D, 130, 300) @@ -205,7 +205,7 @@ static const struct builtin_type_versions { T(usampler2DRect, 140, 999) T(usamplerBuffer, 140, 320) T(usampler2DMS, 150, 310) - T(usampler2DMSArray, 150, 999) + T(usampler2DMSArray, 150, 320) T(sampler1DShadow, 110, 999) T(sampler2DShadow, 110, 300) @@ -305,11 +305,13 @@ _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state) add_type(symbols, glsl_type::usamplerCubeArray_type); } - if (state->ARB_texture_multisample_enable || - state->OES_texture_storage_multisample_2d_array_enable) { + if (state->ARB_texture_multisample_enable) { add_type(symbols, glsl_type::sampler2DMS_type); add_type(symbols, glsl_type::isampler2DMS_type); add_type(symbols, glsl_type::usampler2DMS_type); + } + if (state->ARB_texture_multisample_enable || + state->OES_texture_storage_multisample_2d_array_enable) { add_type(symbols, glsl_type::sampler2DMSArray_type); add_type(symbols, glsl_type::isampler2DMSArray_type); add_type(symbols, glsl_type::usampler2DMSArray_type); |