diff options
author | Pierre-Eric Pelloux-Prayer <[email protected]> | 2020-06-19 18:37:00 +0200 |
---|---|---|
committer | Pierre-Eric Pelloux-Prayer <[email protected]> | 2020-07-09 09:58:01 +0200 |
commit | 1e3aeda5281e5d246e37a035d91f08af4bb0e5e3 (patch) | |
tree | de20f7b65018194ec787871570194a26df649fd8 /src/compiler/glsl | |
parent | 233af4a412db87a9b8430104a58c1b6adb704b1c (diff) |
glsl: only allow 32 bits atomic operations on images
EXT_shader_image_load_store says:
The format of the image unit must be in the "1x32" equivalence class
otherwise the atomic operation is invalid.
ARB_shader_image_load_store says:
We will only support 32-bit atomic operations on images
Fixes: fc0a2e5d017 ("glsl: add EXT_shader_image_load_store new image functions")
Reviewed-by: Marek Olšák <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5688>
Diffstat (limited to 'src/compiler/glsl')
-rw-r--r-- | src/compiler/glsl/ast_function.cpp | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/src/compiler/glsl/ast_function.cpp b/src/compiler/glsl/ast_function.cpp index d097410d4bd..73e72b5baa9 100644 --- a/src/compiler/glsl/ast_function.cpp +++ b/src/compiler/glsl/ast_function.cpp @@ -182,6 +182,37 @@ is_atomic_function(const char *func_name) !strcmp(func_name, "atomicCompSwap"); } +static bool +verify_atomic_image_parameter_qualifier(YYLTYPE *loc, _mesa_glsl_parse_state *state, + ir_variable *var) +{ + if (!var || + (var->data.image_format != PIPE_FORMAT_R32_UINT && + var->data.image_format != PIPE_FORMAT_R32_SINT && + var->data.image_format != PIPE_FORMAT_R32_FLOAT)) { + _mesa_glsl_error(loc, state, "Image atomic functions should use r32i/r32ui " + "format qualifier"); + return false; + } + return true; +} + +static bool +is_atomic_image_function(const char *func_name) +{ + return !strcmp(func_name, "imageAtomicAdd") || + !strcmp(func_name, "imageAtomicMin") || + !strcmp(func_name, "imageAtomicMax") || + !strcmp(func_name, "imageAtomicAnd") || + !strcmp(func_name, "imageAtomicOr") || + !strcmp(func_name, "imageAtomicXor") || + !strcmp(func_name, "imageAtomicExchange") || + !strcmp(func_name, "imageAtomicCompSwap") || + !strcmp(func_name, "imageAtomicIncWrap") || + !strcmp(func_name, "imageAtomicDecWrap"); +} + + /** * Verify that 'out' and 'inout' actual parameters are lvalues. Also, verify * that 'const_in' formal parameters (an extension in our IR) correspond to @@ -347,6 +378,19 @@ verify_parameter_modes(_mesa_glsl_parse_state *state, actual->variable_referenced())) { return false; } + } else if (is_atomic_image_function(func_name)) { + const ir_rvalue *const actual = + (ir_rvalue *) actual_ir_parameters.get_head_raw(); + + const ast_expression *const actual_ast = + exec_node_data(ast_expression, + actual_ast_parameters.get_head_raw(), link); + YYLTYPE loc = actual_ast->get_location(); + + if (!verify_atomic_image_parameter_qualifier(&loc, state, + actual->variable_referenced())) { + return false; + } } return true; |