fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

glsl: Replace MESA_shader_framebuffer_fetch extension flags with EXT ones.

Browse source 
Reviewed-by: Plamena Manolova <plamena.manolova@intel.com>
This commit is contained in:
Francisco Jerez 2018-02-12 14:54:27 -08:00
parent ba79a90fb5
commit 6ebefb0fd5
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compiler/glsl/glsl_parser_extras.cpp
View file

@ -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),

9
src/compiler/glsl/glsl_parser_extras.h
View file

@ -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;