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

mesa, glsl: add support for EXT_shader_image_load_formatted

Browse source 
v3: rebase

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v2)
Signed-off-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Rhys Perry 2019-01-16 23:18:26 +00:00 • committed by Marek Olšák
parent 5131b7a43f
commit 082d180a22
5 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/compiler/glsl/ast_to_hir.cpp
View file

@ -3476,6 +3476,11 @@ apply_image_qualifier_to_variable(const struct ast_type_qualifier *qual,
} }
var->data.image_format = qual->image_format; var->data.image_format = qual->image_format;
} else if (state->has_image_load_formatted()) {
if (var->data.mode == ir_var_uniform &&
state->EXT_shader_image_load_formatted_warn) {
_mesa_glsl_warning(loc, state, "GL_EXT_image_load_formatted used");
}
} else { } else {
if (var->data.mode == ir_var_uniform) { if (var->data.mode == ir_var_uniform) {
if (state->es_shader) { if (state->es_shader) {

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

@ -721,6 +721,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
EXT(EXT_separate_shader_objects), EXT(EXT_separate_shader_objects),
EXT(EXT_shader_framebuffer_fetch), EXT(EXT_shader_framebuffer_fetch),
EXT(EXT_shader_framebuffer_fetch_non_coherent), EXT(EXT_shader_framebuffer_fetch_non_coherent),
EXT(EXT_shader_image_load_formatted),
EXT(EXT_shader_implicit_conversions), EXT(EXT_shader_implicit_conversions),
EXT(EXT_shader_integer_mix), EXT(EXT_shader_integer_mix),
EXT_AEP(EXT_shader_io_blocks), EXT_AEP(EXT_shader_io_blocks),

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

@ -344,6 +344,11 @@ struct _mesa_glsl_parse_state {
return ARB_bindless_texture_enable; return ARB_bindless_texture_enable;
} }
bool has_image_load_formatted() const
{
return EXT_shader_image_load_formatted_enable;
}
bool has_implicit_conversions() const bool has_implicit_conversions() const
{ {
return EXT_shader_implicit_conversions_enable || is_version(120, 0); return EXT_shader_implicit_conversions_enable || is_version(120, 0);
@ -822,6 +827,8 @@ struct _mesa_glsl_parse_state {
bool EXT_shader_framebuffer_fetch_warn; bool EXT_shader_framebuffer_fetch_warn;
bool EXT_shader_framebuffer_fetch_non_coherent_enable; bool EXT_shader_framebuffer_fetch_non_coherent_enable;
bool EXT_shader_framebuffer_fetch_non_coherent_warn; bool EXT_shader_framebuffer_fetch_non_coherent_warn;
bool EXT_shader_image_load_formatted_enable;
bool EXT_shader_image_load_formatted_warn;
bool EXT_shader_implicit_conversions_enable; bool EXT_shader_implicit_conversions_enable;
bool EXT_shader_implicit_conversions_warn; bool EXT_shader_implicit_conversions_warn;
bool EXT_shader_integer_mix_enable; bool EXT_shader_integer_mix_enable;

1
src/mesa/main/extensions_table.h
View file

@ -268,6 +268,7 @@ EXT(EXT_separate_shader_objects , dummy_true
EXT(EXT_separate_specular_color , dummy_true , GLL, x , x , x , 1997) EXT(EXT_separate_specular_color , dummy_true , GLL, x , x , x , 1997)
EXT(EXT_shader_framebuffer_fetch , EXT_shader_framebuffer_fetch , GLL, GLC, x , ES2, 2013) EXT(EXT_shader_framebuffer_fetch , EXT_shader_framebuffer_fetch , GLL, GLC, x , ES2, 2013)
EXT(EXT_shader_framebuffer_fetch_non_coherent, EXT_shader_framebuffer_fetch_non_coherent, GLL, GLC, x, ES2, 2018) EXT(EXT_shader_framebuffer_fetch_non_coherent, EXT_shader_framebuffer_fetch_non_coherent, GLL, GLC, x, ES2, 2018)
EXT(EXT_shader_image_load_formatted , EXT_shader_image_load_formatted , GLL, GLC, x , x , 2014)
EXT(EXT_shader_implicit_conversions , dummy_true , x , x , x , 31, 2013) EXT(EXT_shader_implicit_conversions , dummy_true , x , x , x , 31, 2013)
EXT(EXT_shader_integer_mix , EXT_shader_integer_mix , GLL, GLC, x , 30, 2013) EXT(EXT_shader_integer_mix , EXT_shader_integer_mix , GLL, GLC, x , 30, 2013)
EXT(EXT_shader_io_blocks , dummy_true , x , x , x , 31, 2014) EXT(EXT_shader_io_blocks , dummy_true , x , x , x , 31, 2014)

1
src/mesa/main/mtypes.h
View file

@ -4275,6 +4275,7 @@ struct gl_extensions
GLboolean EXT_render_snorm; GLboolean EXT_render_snorm;
GLboolean EXT_semaphore; GLboolean EXT_semaphore;
GLboolean EXT_semaphore_fd; GLboolean EXT_semaphore_fd;
GLboolean EXT_shader_image_load_formatted;
GLboolean EXT_shader_integer_mix; GLboolean EXT_shader_integer_mix;
GLboolean EXT_shader_samples_identical; GLboolean EXT_shader_samples_identical;
GLboolean EXT_sRGB; GLboolean EXT_sRGB;