Mesa (master): glsl_to_nir: rename image_access to mem_access
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 19 23:22:00 UTC 2019
Module: Mesa
Branch: master
Commit: b160acb9f57bd78e395a839408d3b7e6c4cd7458
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b160acb9f57bd78e395a839408d3b7e6c4cd7458
Author: Marek Olšák <marek.olsak at amd.com>
Date: Thu Nov 7 17:54:42 2019 -0500
glsl_to_nir: rename image_access to mem_access
Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
---
src/compiler/glsl/glsl_to_nir.cpp | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 5d93ac787c2..09bb11f92e7 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -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;
More information about the mesa-commit
mailing list