diff options
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.cpp | 1 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser_extras.h | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/compiler/glsl/glsl_parser_extras.cpp b/src/compiler/glsl/glsl_parser_extras.cpp index 106417c5c30..275c4d75711 100644 --- a/src/compiler/glsl/glsl_parser_extras.cpp +++ b/src/compiler/glsl/glsl_parser_extras.cpp @@ -707,6 +707,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = { EXT_AEP(EXT_primitive_bounding_box), EXT(EXT_separate_shader_objects), EXT(EXT_shader_framebuffer_fetch), + EXT(EXT_shader_framebuffer_fetch_non_coherent), EXT(EXT_shader_integer_mix), EXT_AEP(EXT_shader_io_blocks), EXT(EXT_shader_samples_identical), diff --git a/src/compiler/glsl/glsl_parser_extras.h b/src/compiler/glsl/glsl_parser_extras.h index f88cb783473..66bd1a3db6e 100644 --- a/src/compiler/glsl/glsl_parser_extras.h +++ b/src/compiler/glsl/glsl_parser_extras.h @@ -317,8 +317,7 @@ struct _mesa_glsl_parse_state { bool has_framebuffer_fetch() const { return EXT_shader_framebuffer_fetch_enable || - MESA_shader_framebuffer_fetch_enable || - MESA_shader_framebuffer_fetch_non_coherent_enable; + EXT_shader_framebuffer_fetch_non_coherent_enable; } bool has_texture_cube_map_array() const @@ -782,6 +781,8 @@ struct _mesa_glsl_parse_state { bool EXT_separate_shader_objects_warn; bool EXT_shader_framebuffer_fetch_enable; bool EXT_shader_framebuffer_fetch_warn; + bool EXT_shader_framebuffer_fetch_non_coherent_enable; + bool EXT_shader_framebuffer_fetch_non_coherent_warn; bool EXT_shader_integer_mix_enable; bool EXT_shader_integer_mix_warn; bool EXT_shader_io_blocks_enable; @@ -800,10 +801,6 @@ struct _mesa_glsl_parse_state { bool EXT_texture_cube_map_array_warn; bool INTEL_conservative_rasterization_enable; bool INTEL_conservative_rasterization_warn; - bool MESA_shader_framebuffer_fetch_enable; - bool MESA_shader_framebuffer_fetch_warn; - bool MESA_shader_framebuffer_fetch_non_coherent_enable; - bool MESA_shader_framebuffer_fetch_non_coherent_warn; bool MESA_shader_integer_functions_enable; bool MESA_shader_integer_functions_warn; bool NV_image_formats_enable; |