fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 03:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

glsl_to_nir: rename image_access to mem_access

Browse source 
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Marek Olšák 2019-11-07 17:54:42 -05:00
parent 193e2c9625
commit b160acb9f5
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/compiler/glsl/glsl_to_nir.cpp
View file

@ -520,17 +520,17 @@ nir_visitor::visit(ir_variable *ir)
unreachable("not reached");
}
unsigned image_access = 0;
unsigned mem_access = 0;
if (ir->data.memory_read_only)
image_access |= ACCESS_NON_WRITEABLE;
mem_access |= ACCESS_NON_WRITEABLE;
if (ir->data.memory_write_only)
image_access |= ACCESS_NON_READABLE;
mem_access |= ACCESS_NON_READABLE;
if (ir->data.memory_coherent)
image_access |= ACCESS_COHERENT;
mem_access |= ACCESS_COHERENT;
if (ir->data.memory_volatile)
image_access |= ACCESS_VOLATILE;
mem_access |= ACCESS_VOLATILE;
if (ir->data.memory_restrict)
image_access |= ACCESS_RESTRICT;
mem_access |= ACCESS_RESTRICT;
/* For UBO and SSBO variables, we need explicit types */
if (var->data.mode & (nir_var_mem_ubo | nir_var_mem_ssbo)) {
@ -553,15 +553,15 @@ nir_visitor::visit(ir_variable *ir)
var->type = field->type;
if (field->memory_read_only)
image_access |= ACCESS_NON_WRITEABLE;
mem_access |= ACCESS_NON_WRITEABLE;
if (field->memory_write_only)
image_access |= ACCESS_NON_READABLE;
mem_access |= ACCESS_NON_READABLE;
if (field->memory_coherent)
image_access |= ACCESS_COHERENT;
mem_access |= ACCESS_COHERENT;
if (field->memory_volatile)
image_access |= ACCESS_VOLATILE;
mem_access |= ACCESS_VOLATILE;
if (field->memory_restrict)
image_access |= ACCESS_RESTRICT;
mem_access |= ACCESS_RESTRICT;
found = true;
break;
@ -599,7 +599,7 @@ nir_visitor::visit(ir_variable *ir)
var->data.explicit_binding = ir->data.explicit_binding;
var->data.bindless = ir->data.bindless;
var->data.offset = ir->data.offset;
var->data.access = (gl_access_qualifier)image_access;
var->data.access = (gl_access_qualifier)mem_access;
if (var->type->without_array()->is_image()) {
var->data.image.format = ir->data.image_format;