Mesa (main): nir: s/nir_var_mem_image/nir_var_image/g
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Oct 16 04:22:06 UTC 2021
Module: Mesa
Branch: main
Commit: 956199e87088895682b2d86fc4ac3327bed0a4e0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=956199e87088895682b2d86fc4ac3327bed0a4e0
Author: Jason Ekstrand <jason at jlekstrand.net>
Date: Fri Oct 15 12:58:22 2021 -0500
nir: s/nir_var_mem_image/nir_var_image/g
We typically use nir_var_mem_* for stuff that has an explicit byte-based
memory layout. Images are opaque.
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13386>
---
src/amd/compiler/aco_instruction_selection.cpp | 2 +-
src/amd/llvm/ac_nir_to_llvm.c | 2 +-
src/amd/vulkan/radv_meta_bufimage.c | 14 +++++++-------
src/amd/vulkan/radv_meta_clear.c | 2 +-
src/amd/vulkan/radv_meta_decompress.c | 4 ++--
src/amd/vulkan/radv_meta_fast_clear.c | 4 ++--
src/amd/vulkan/radv_meta_fmask_expand.c | 2 +-
src/amd/vulkan/radv_meta_resolve_cs.c | 4 ++--
src/compiler/glsl/gl_nir_link_uniforms.c | 2 +-
src/compiler/glsl/gl_nir_linker.h | 2 +-
src/compiler/glsl/gl_nir_lower_images.c | 2 +-
src/compiler/glsl/gl_nir_lower_samplers_as_deref.c | 2 +-
src/compiler/glsl/glsl_to_nir.cpp | 2 +-
src/compiler/nir/nir.c | 2 +-
src/compiler/nir/nir.h | 6 +++---
src/compiler/nir/nir_divergence_analysis.c | 2 +-
src/compiler/nir/nir_gather_info.c | 2 +-
src/compiler/nir/nir_opt_access.c | 8 ++++----
src/compiler/nir/nir_opt_peephole_select.c | 2 +-
src/compiler/nir/nir_print.c | 4 ++--
src/compiler/nir/nir_validate.c | 4 ++--
src/compiler/spirv/spirv_to_nir.c | 8 ++++----
src/compiler/spirv/vtn_variables.c | 4 ++--
src/freedreno/ir3/ir3_compiler_nir.c | 2 +-
src/gallium/auxiliary/nir/tgsi_to_nir.c | 2 +-
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c | 8 ++++----
src/gallium/drivers/zink/zink_compiler.c | 6 +++---
src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c | 2 +-
src/gallium/frontends/lavapipe/lvp_pipeline.c | 2 +-
src/intel/compiler/brw_fs_nir.cpp | 2 +-
src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 +-
src/mesa/state_tracker/st_pbo.c | 2 +-
src/microsoft/clc/clc_compiler.c | 2 +-
33 files changed, 58 insertions(+), 58 deletions(-)
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index fe66ae7603c..1ace1605172 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -7082,7 +7082,7 @@ emit_scoped_barrier(isel_context* ctx, nir_intrinsic_instr* instr)
unsigned nir_storage = nir_intrinsic_memory_modes(instr);
if (nir_storage & (nir_var_mem_ssbo | nir_var_mem_global))
storage |= storage_buffer;
- if (nir_storage & nir_var_mem_image)
+ if (nir_storage & nir_var_image)
storage |= storage_image;
if (shared_storage_used && (nir_storage & nir_var_mem_shared))
storage |= storage_shared;
diff --git a/src/amd/llvm/ac_nir_to_llvm.c b/src/amd/llvm/ac_nir_to_llvm.c
index aee61522985..6f13f44ab8f 100644
--- a/src/amd/llvm/ac_nir_to_llvm.c
+++ b/src/amd/llvm/ac_nir_to_llvm.c
@@ -3863,7 +3863,7 @@ static void visit_intrinsic(struct ac_nir_context *ctx, nir_intrinsic_instr *ins
nir_variable_mode modes = nir_intrinsic_memory_modes(instr);
unsigned wait_flags = 0;
- if (modes & (nir_var_mem_global | nir_var_mem_ssbo | nir_var_mem_image))
+ if (modes & (nir_var_mem_global | nir_var_mem_ssbo | nir_var_image))
wait_flags |= AC_WAIT_VLOAD | AC_WAIT_VSTORE;
if (modes & nir_var_mem_shared)
wait_flags |= AC_WAIT_LGKM;
diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c
index 8f9801f8630..60884d03426 100644
--- a/src/amd/vulkan/radv_meta_bufimage.c
+++ b/src/amd/vulkan/radv_meta_bufimage.c
@@ -47,7 +47,7 @@ build_nir_itob_compute_shader(struct radv_device *dev, bool is_3d)
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
@@ -229,7 +229,7 @@ build_nir_btoi_compute_shader(struct radv_device *dev, bool is_3d)
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
@@ -409,7 +409,7 @@ build_nir_btoi_r32g32b32_compute_shader(struct radv_device *dev)
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
@@ -563,7 +563,7 @@ build_nir_itoi_compute_shader(struct radv_device *dev, bool is_3d, int samples)
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
@@ -764,7 +764,7 @@ build_nir_itoi_r32g32b32_compute_shader(struct radv_device *dev)
input_img->data.binding = 0;
nir_variable *output_img =
- nir_variable_create(b.shader, nir_var_mem_image, img_type, "output_img");
+ nir_variable_create(b.shader, nir_var_image, img_type, "output_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
@@ -920,7 +920,7 @@ build_nir_cleari_compute_shader(struct radv_device *dev, bool is_3d, int samples
b.shader->info.workgroup_size[1] = 8;
b.shader->info.workgroup_size[2] = 1;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 0;
@@ -1078,7 +1078,7 @@ build_nir_cleari_r32g32b32_compute_shader(struct radv_device *dev)
b.shader->info.workgroup_size[1] = 8;
b.shader->info.workgroup_size[2] = 1;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 0;
diff --git a/src/amd/vulkan/radv_meta_clear.c b/src/amd/vulkan/radv_meta_clear.c
index 0b53ec4d51a..8a3ff022ec1 100644
--- a/src/amd/vulkan/radv_meta_clear.c
+++ b/src/amd/vulkan/radv_meta_clear.c
@@ -1175,7 +1175,7 @@ build_clear_dcc_comp_to_single_shader(bool is_msaa)
nir_channel(&b, global_id, 2),
nir_ssa_undef(&b, 1, 32));
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 0;
diff --git a/src/amd/vulkan/radv_meta_decompress.c b/src/amd/vulkan/radv_meta_decompress.c
index 647f38f4f29..43ffa184b8c 100644
--- a/src/amd/vulkan/radv_meta_decompress.c
+++ b/src/amd/vulkan/radv_meta_decompress.c
@@ -45,11 +45,11 @@ build_expand_depth_stencil_compute_shader(struct radv_device *dev)
b.shader->info.workgroup_size[0] = 8;
b.shader->info.workgroup_size[1] = 8;
b.shader->info.workgroup_size[2] = 1;
- nir_variable *input_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "in_img");
+ nir_variable *input_img = nir_variable_create(b.shader, nir_var_image, img_type, "in_img");
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
diff --git a/src/amd/vulkan/radv_meta_fast_clear.c b/src/amd/vulkan/radv_meta_fast_clear.c
index 6e72f63c46a..6beb898f699 100644
--- a/src/amd/vulkan/radv_meta_fast_clear.c
+++ b/src/amd/vulkan/radv_meta_fast_clear.c
@@ -46,11 +46,11 @@ build_dcc_decompress_compute_shader(struct radv_device *dev)
b.shader->info.workgroup_size[0] = 16;
b.shader->info.workgroup_size[1] = 16;
b.shader->info.workgroup_size[2] = 1;
- nir_variable *input_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "in_img");
+ nir_variable *input_img = nir_variable_create(b.shader, nir_var_image, img_type, "in_img");
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
diff --git a/src/amd/vulkan/radv_meta_fmask_expand.c b/src/amd/vulkan/radv_meta_fmask_expand.c
index 644e53cf6fa..0b75520c9a7 100644
--- a/src/amd/vulkan/radv_meta_fmask_expand.c
+++ b/src/amd/vulkan/radv_meta_fmask_expand.c
@@ -43,7 +43,7 @@ build_fmask_expand_compute_shader(struct radv_device *device, int samples)
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
output_img->data.access = ACCESS_NON_READABLE;
diff --git a/src/amd/vulkan/radv_meta_resolve_cs.c b/src/amd/vulkan/radv_meta_resolve_cs.c
index 8aca7805c4c..0e8bad1dde0 100644
--- a/src/amd/vulkan/radv_meta_resolve_cs.c
+++ b/src/amd/vulkan/radv_meta_resolve_cs.c
@@ -75,7 +75,7 @@ build_resolve_compute_shader(struct radv_device *dev, bool is_integer, bool is_s
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
@@ -147,7 +147,7 @@ build_depth_stencil_resolve_compute_shader(struct radv_device *dev, int samples,
input_img->data.descriptor_set = 0;
input_img->data.binding = 0;
- nir_variable *output_img = nir_variable_create(b.shader, nir_var_mem_image, img_type, "out_img");
+ nir_variable *output_img = nir_variable_create(b.shader, nir_var_image, img_type, "out_img");
output_img->data.descriptor_set = 0;
output_img->data.binding = 1;
diff --git a/src/compiler/glsl/gl_nir_link_uniforms.c b/src/compiler/glsl/gl_nir_link_uniforms.c
index 52e85ae8fae..05b6e036e10 100644
--- a/src/compiler/glsl/gl_nir_link_uniforms.c
+++ b/src/compiler/glsl/gl_nir_link_uniforms.c
@@ -395,7 +395,7 @@ add_var_use_deref(nir_deref_instr *deref, struct hash_table *live,
!nir_deref_mode_is_one_of(deref, nir_var_uniform |
nir_var_mem_ubo |
nir_var_mem_ssbo |
- nir_var_mem_image)) {
+ nir_var_image)) {
nir_deref_path_finish(&path);
return;
}
diff --git a/src/compiler/glsl/gl_nir_linker.h b/src/compiler/glsl/gl_nir_linker.h
index 7d506bb97df..5b9e9de2379 100644
--- a/src/compiler/glsl/gl_nir_linker.h
+++ b/src/compiler/glsl/gl_nir_linker.h
@@ -39,7 +39,7 @@ struct gl_nir_linker_options {
nir_foreach_variable_with_modes(var, shader, nir_var_uniform | \
nir_var_mem_ubo | \
nir_var_mem_ssbo | \
- nir_var_mem_image)
+ nir_var_image)
bool gl_nir_link_spirv(struct gl_context *ctx,
struct gl_shader_program *prog,
diff --git a/src/compiler/glsl/gl_nir_lower_images.c b/src/compiler/glsl/gl_nir_lower_images.c
index 018b45cf7f0..fde996051ce 100644
--- a/src/compiler/glsl/gl_nir_lower_images.c
+++ b/src/compiler/glsl/gl_nir_lower_images.c
@@ -87,7 +87,7 @@ lower_impl(nir_builder *b, nir_instr *instr, bool bindless_only)
return false;
}
- bool bindless = var->data.mode != nir_var_mem_image || var->data.bindless;
+ bool bindless = var->data.mode != nir_var_image || var->data.bindless;
if (bindless_only && !bindless)
return false;
diff --git a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
index f6c7c2ab31a..8c193e2115b 100644
--- a/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
+++ b/src/compiler/glsl/gl_nir_lower_samplers_as_deref.c
@@ -141,7 +141,7 @@ lower_deref(nir_builder *b, struct lower_samplers_as_deref_state *state,
nir_variable *var = nir_deref_instr_get_variable(deref);
gl_shader_stage stage = state->shader->info.stage;
- if (!(var->data.mode & (nir_var_uniform | nir_var_mem_image)) ||
+ if (!(var->data.mode & (nir_var_uniform | nir_var_image)) ||
var->data.bindless)
return NULL;
diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 1a1252f11ad..30edad871f8 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -546,7 +546,7 @@ nir_visitor::visit(ir_variable *ir)
if (ir->get_interface_type())
var->data.mode = nir_var_mem_ubo;
else if (ir->type->contains_image() && !ir->data.bindless)
- var->data.mode = nir_var_mem_image;
+ var->data.mode = nir_var_image;
else
var->data.mode = nir_var_uniform;
break;
diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index 494527a6ac9..d5e85dfc99d 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -189,7 +189,7 @@ nir_shader_add_variable(nir_shader *shader, nir_variable *var)
case nir_var_uniform:
case nir_var_mem_ubo:
case nir_var_mem_ssbo:
- case nir_var_mem_image:
+ case nir_var_image:
case nir_var_mem_shared:
case nir_var_system_value:
case nir_var_mem_push_const:
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index fddfce82978..c6f491b616d 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -140,7 +140,7 @@ typedef enum {
nir_var_shader_call_data = (1 << 12),
/** Ray hit attributes */
nir_var_ray_hit_attrib = (1 << 13),
- nir_var_mem_image = (1 << 14),
+ nir_var_image = (1 << 14),
nir_var_read_only_modes = nir_var_shader_in | nir_var_uniform |
nir_var_system_value | nir_var_mem_constant |
nir_var_mem_ubo,
@@ -716,10 +716,10 @@ _nir_shader_variable_has_mode(nir_variable *var, unsigned modes)
nir_foreach_variable_with_modes_safe(var, shader, nir_var_uniform)
#define nir_foreach_image_variable(var, shader) \
- nir_foreach_variable_with_modes(var, shader, nir_var_mem_image)
+ nir_foreach_variable_with_modes(var, shader, nir_var_image)
#define nir_foreach_image_variable_safe(var, shader) \
- nir_foreach_variable_with_modes_safe(var, shader, nir_var_mem_image)
+ nir_foreach_variable_with_modes_safe(var, shader, nir_var_image)
static inline bool
nir_variable_is_global(const nir_variable *var)
diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 06b92f26408..9cda1cd6c35 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -603,7 +603,7 @@ nir_variable_mode_is_uniform(nir_variable_mode mode) {
case nir_var_mem_ssbo:
case nir_var_mem_shared:
case nir_var_mem_global:
- case nir_var_mem_image:
+ case nir_var_image:
return true;
default:
return false;
diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c
index 327ff857b79..4da3a11be0c 100644
--- a/src/compiler/nir/nir_gather_info.c
+++ b/src/compiler/nir/nir_gather_info.c
@@ -834,7 +834,7 @@ nir_shader_gather_info(nir_shader *shader, nir_function_impl *entrypoint)
shader->info.bit_sizes_float = 0;
shader->info.bit_sizes_int = 0;
- nir_foreach_variable_with_modes(var, shader, nir_var_mem_image | nir_var_uniform) {
+ nir_foreach_variable_with_modes(var, shader, nir_var_image | nir_var_uniform) {
/* Bindless textures and images don't use non-bindless slots.
* Interface blocks imply inputs, outputs, UBO, or SSBO, which can only
* mean bindless.
diff --git a/src/compiler/nir/nir_opt_access.c b/src/compiler/nir/nir_opt_access.c
index 59276d2504d..4e5f0c41940 100644
--- a/src/compiler/nir/nir_opt_access.c
+++ b/src/compiler/nir/nir_opt_access.c
@@ -116,10 +116,10 @@ gather_intrinsic(struct access_state *state, nir_intrinsic_instr *instr)
}
if ((var->data.mode == nir_var_uniform ||
- var->data.mode == nir_var_mem_image) && read)
+ var->data.mode == nir_var_image) && read)
_mesa_set_add(state->vars_read, var);
if ((var->data.mode == nir_var_uniform ||
- var->data.mode == nir_var_mem_image) && write)
+ var->data.mode == nir_var_image) && write)
_mesa_set_add(state->vars_written, var);
break;
@@ -190,7 +190,7 @@ process_variable(struct access_state *state, nir_variable *var)
const struct glsl_type *type = glsl_without_array(var->type);
if (var->data.mode != nir_var_mem_ssbo &&
!(var->data.mode == nir_var_uniform && glsl_type_is_image(type)) &&
- var->data.mode != nir_var_mem_image)
+ var->data.mode != nir_var_image)
return false;
/* Ignore variables we've already marked */
@@ -347,7 +347,7 @@ nir_opt_access(nir_shader *shader, const nir_opt_access_options *options)
nir_foreach_variable_with_modes(var, shader, nir_var_uniform |
nir_var_mem_ubo |
nir_var_mem_ssbo |
- nir_var_mem_image)
+ nir_var_image)
var_progress |= process_variable(&state, var);
nir_foreach_function(func, shader) {
diff --git a/src/compiler/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c
index bf0332aa328..9d7e4e4b3a4 100644
--- a/src/compiler/nir/nir_opt_peephole_select.c
+++ b/src/compiler/nir/nir_opt_peephole_select.c
@@ -104,7 +104,7 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count,
switch (deref->modes) {
case nir_var_shader_in:
case nir_var_uniform:
- case nir_var_mem_image:
+ case nir_var_image:
/* Don't try to remove flow control around an indirect load
* because that flow control may be trying to avoid invalid
* loads.
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c
index 31c838dd74f..56ce1f9be44 100644
--- a/src/compiler/nir/nir_print.c
+++ b/src/compiler/nir/nir_print.c
@@ -464,7 +464,7 @@ get_variable_mode_str(nir_variable_mode mode, bool want_local_global_mode)
return "push_const";
case nir_var_mem_constant:
return "constant";
- case nir_var_mem_image:
+ case nir_var_image:
return "image";
case nir_var_shader_temp:
return want_local_global_mode ? "shader_temp" : "";
@@ -529,7 +529,7 @@ print_var_decl(nir_variable *var, print_state *state)
nir_var_uniform |
nir_var_mem_ubo |
nir_var_mem_ssbo |
- nir_var_mem_image)) {
+ nir_var_image)) {
const char *loc = NULL;
char buf[4];
diff --git a/src/compiler/nir/nir_validate.c b/src/compiler/nir/nir_validate.c
index d75fe957ce4..04e25dff1c0 100644
--- a/src/compiler/nir/nir_validate.c
+++ b/src/compiler/nir/nir_validate.c
@@ -1518,7 +1518,7 @@ validate_var_decl(nir_variable *var, nir_variable_mode valid_modes,
if (var->constant_initializer)
validate_constant(var->constant_initializer, var->type, state);
- if (var->data.mode == nir_var_mem_image) {
+ if (var->data.mode == nir_var_image) {
validate_assert(state, !var->data.bindless);
validate_assert(state, glsl_type_is_image(glsl_without_array(var->type)));
}
@@ -1753,7 +1753,7 @@ nir_validate_shader(nir_shader *shader, const char *when)
nir_var_mem_shared |
nir_var_mem_push_const |
nir_var_mem_constant |
- nir_var_mem_image;
+ nir_var_image;
if (gl_shader_stage_is_callable(shader->info.stage))
valid_modes |= nir_var_shader_call_data;
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index 9dcf8ab3160..e685704c017 100644
--- a/src/compiler/spirv/spirv_to_nir.c
+++ b/src/compiler/spirv/spirv_to_nir.c
@@ -368,7 +368,7 @@ vtn_get_image(struct vtn_builder *b, uint32_t value_id,
if (access)
*access |= spirv_to_gl_access_qualifier(b, type->access_qualifier);
nir_variable_mode mode = glsl_type_is_image(type->glsl_image) ?
- nir_var_mem_image : nir_var_uniform;
+ nir_var_image : nir_var_uniform;
return nir_build_deref_cast(&b->nb, vtn_get_nir_ssa(b, value_id),
mode, type->glsl_image, 0);
}
@@ -422,7 +422,7 @@ vtn_get_sampled_image(struct vtn_builder *b, uint32_t value_id)
*/
const struct glsl_type *image_type = type->image->glsl_image;
nir_variable_mode image_mode = glsl_type_is_image(image_type) ?
- nir_var_mem_image : nir_var_uniform;
+ nir_var_image : nir_var_uniform;
struct vtn_sampled_image si = { NULL, };
si.image = nir_build_deref_cast(&b->nb, nir_channel(&b->nb, si_vec2, 0),
@@ -2420,7 +2420,7 @@ vtn_mem_semantics_to_nir_var_modes(struct vtn_builder *b,
nir_var_mem_global;
}
if (semantics & SpvMemorySemanticsImageMemoryMask)
- modes |= nir_var_mem_image;
+ modes |= nir_var_image;
if (semantics & SpvMemorySemanticsWorkgroupMemoryMask)
modes |= nir_var_mem_shared;
if (semantics & SpvMemorySemanticsCrossWorkgroupMemoryMask)
@@ -6138,7 +6138,7 @@ vtn_emit_kernel_entry_point_wrapper(struct vtn_builder *b,
in_var->data.mode = nir_var_uniform;
in_var->type = param_type->deref->type;
} else if (param_type->base_type == vtn_base_type_image) {
- in_var->data.mode = nir_var_mem_image;
+ in_var->data.mode = nir_var_image;
in_var->type = param_type->glsl_image;
in_var->data.access =
spirv_to_gl_access_qualifier(b, param_type->access_qualifier);
diff --git a/src/compiler/spirv/vtn_variables.c b/src/compiler/spirv/vtn_variables.c
index 1b9c232a5cb..8657d5b81b2 100644
--- a/src/compiler/spirv/vtn_variables.c
+++ b/src/compiler/spirv/vtn_variables.c
@@ -1511,7 +1511,7 @@ vtn_storage_class_to_mode(struct vtn_builder *b,
interface_type->base_type == vtn_base_type_image &&
glsl_type_is_image(interface_type->glsl_image)) {
mode = vtn_variable_mode_image;
- nir_mode = nir_var_mem_image;
+ nir_mode = nir_var_image;
} else if (b->shader->info.stage == MESA_SHADER_KERNEL) {
mode = vtn_variable_mode_constant;
nir_mode = nir_var_mem_constant;
@@ -1564,7 +1564,7 @@ vtn_storage_class_to_mode(struct vtn_builder *b,
break;
case SpvStorageClassImage:
mode = vtn_variable_mode_image;
- nir_mode = nir_var_mem_image;
+ nir_mode = nir_var_image;
break;
case SpvStorageClassCallableDataKHR:
mode = vtn_variable_mode_call_data;
diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c
index 420e5b40837..036c2e3bc59 100644
--- a/src/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/freedreno/ir3/ir3_compiler_nir.c
@@ -1382,7 +1382,7 @@ emit_intrinsic_barrier(struct ir3_context *ctx, nir_intrinsic_instr *intr)
IR3_BARRIER_BUFFER_R | IR3_BARRIER_BUFFER_W;
}
- if (modes & nir_var_mem_image) {
+ if (modes & nir_var_image) {
barrier->barrier_class |= IR3_BARRIER_IMAGE_W;
barrier->barrier_conflict |=
IR3_BARRIER_IMAGE_W | IR3_BARRIER_IMAGE_R;
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 42d06f203f9..17149855953 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -1280,7 +1280,7 @@ get_image_var(struct ttn_compile *c, int binding,
if (!var) {
const struct glsl_type *type = glsl_image_type(dim, is_array, base_type);
- var = nir_variable_create(c->build.shader, nir_var_mem_image, type, "image");
+ var = nir_variable_create(c->build.shader, nir_var_image, type, "image");
var->data.binding = binding;
var->data.explicit_binding = true;
var->data.access = access;
diff --git a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
index 99d25b541e9..22d4525cfba 100644
--- a/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
+++ b/src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
@@ -305,7 +305,7 @@ get_storage_class(struct nir_variable *var)
case nir_var_shader_out:
return SpvStorageClassOutput;
case nir_var_uniform:
- case nir_var_mem_image:
+ case nir_var_image:
return SpvStorageClassUniformConstant;
default:
unreachable("Unsupported nir_variable_mode");
@@ -1006,7 +1006,7 @@ emit_uniform(struct ntv_context *ctx, struct nir_variable *var)
emit_bo(ctx, var, 0);
else {
assert(var->data.mode == nir_var_uniform ||
- var->data.mode == nir_var_mem_image);
+ var->data.mode == nir_var_image);
const struct glsl_type *type = glsl_without_array(var->type);
if (glsl_type_is_sampler(type) || glsl_type_is_image(type))
emit_image(ctx, var, false);
@@ -3417,7 +3417,7 @@ emit_deref_array(struct ntv_context *ctx, nir_deref_instr *deref)
break;
case nir_var_uniform:
- case nir_var_mem_image: {
+ case nir_var_image: {
struct hash_entry *he = _mesa_hash_table_search(ctx->vars, var);
assert(he);
base = (SpvId)(intptr_t)he->data;
@@ -3947,7 +3947,7 @@ nir_to_spirv(struct nir_shader *s, const struct zink_so_info *so_info, uint32_t
/* we have to reverse iterate to match what's done in zink_compiler.c */
foreach_list_typed_reverse(nir_variable, var, node, &s->variables)
if (_nir_shader_variable_has_mode(var, nir_var_uniform |
- nir_var_mem_image |
+ nir_var_image |
nir_var_mem_ubo |
nir_var_mem_ssbo))
emit_uniform(&ctx, var);
diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index a798bf93eee..ec88729adc0 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -1064,7 +1064,7 @@ create_bindless_image(nir_shader *nir, enum glsl_sampler_dim dim)
nir_variable *var;
const struct glsl_type *image_type = glsl_image_type(dim, false, GLSL_TYPE_FLOAT);
- var = nir_variable_create(nir, nir_var_mem_image, glsl_array_type(image_type, ZINK_MAX_BINDLESS_HANDLES, 0), "bindless_image");
+ var = nir_variable_create(nir, nir_var_image, glsl_array_type(image_type, ZINK_MAX_BINDLESS_HANDLES, 0), "bindless_image");
var->data.descriptor_set = ZINK_DESCRIPTOR_BINDLESS;
var->data.driver_location = var->data.binding = binding;
var->data.image.format = PIPE_FORMAT_R8G8B8A8_UNORM;
@@ -1364,7 +1364,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
foreach_list_typed_reverse_safe(nir_variable, var, node, &nir->variables) {
if (_nir_shader_variable_has_mode(var, nir_var_uniform |
- nir_var_mem_image |
+ nir_var_image |
nir_var_mem_ubo |
nir_var_mem_ssbo)) {
enum zink_descriptor_type ztype;
@@ -1401,7 +1401,7 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir,
ret->num_bindings[ztype]++;
} else {
assert(var->data.mode == nir_var_uniform ||
- var->data.mode == nir_var_mem_image);
+ var->data.mode == nir_var_image);
if (var->data.bindless) {
ret->bindless = true;
handle_bindless_var(nir, var, type, bindless);
diff --git a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c
index 71af4753abb..49285384f1a 100644
--- a/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c
+++ b/src/gallium/frontends/lavapipe/lvp_lower_vulkan_resource.c
@@ -211,7 +211,7 @@ void lvp_lower_pipeline_layout(const struct lvp_device *device,
{
nir_shader_lower_instructions(shader, lower_vulkan_resource_index, lower_vri_instr, layout);
nir_foreach_variable_with_modes(var, shader, nir_var_uniform |
- nir_var_mem_image) {
+ nir_var_image) {
const struct glsl_type *type = var->type;
enum glsl_base_type base_type =
glsl_get_base_type(glsl_without_array(type));
diff --git a/src/gallium/frontends/lavapipe/lvp_pipeline.c b/src/gallium/frontends/lavapipe/lvp_pipeline.c
index ef868dd7cac..36c403d4f47 100644
--- a/src/gallium/frontends/lavapipe/lvp_pipeline.c
+++ b/src/gallium/frontends/lavapipe/lvp_pipeline.c
@@ -561,7 +561,7 @@ lvp_shader_compile_to_ir(struct lvp_pipeline *pipeline,
NIR_PASS_V(nir, nir_lower_clip_cull_distance_arrays);
NIR_PASS_V(nir, nir_remove_dead_variables,
- nir_var_uniform | nir_var_mem_image, NULL);
+ nir_var_uniform | nir_var_image, NULL);
lvp_lower_pipeline_layout(pipeline->device, pipeline->layout, nir);
diff --git a/src/intel/compiler/brw_fs_nir.cpp b/src/intel/compiler/brw_fs_nir.cpp
index a18c39ef383..b8c03f1e4ac 100644
--- a/src/intel/compiler/brw_fs_nir.cpp
+++ b/src/intel/compiler/brw_fs_nir.cpp
@@ -4436,7 +4436,7 @@ fs_visitor::nir_emit_intrinsic(const fs_builder &bld, nir_intrinsic_instr *instr
nir_variable_mode modes = nir_intrinsic_memory_modes(instr);
ugm_fence = modes & (nir_var_mem_ssbo | nir_var_mem_global);
slm_fence = modes & nir_var_mem_shared;
- tgm_fence = modes & nir_var_mem_image;
+ tgm_fence = modes & nir_var_image;
urb_fence = modes & nir_var_shader_out;
break;
}
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index 8b8804891e7..ae50af01400 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -205,7 +205,7 @@ st_nir_assign_uniform_locations(struct gl_context *ctx,
int imageidx = 0;
nir_foreach_variable_with_modes(uniform, nir, nir_var_uniform |
- nir_var_mem_image) {
+ nir_var_image) {
int loc;
const struct glsl_type *type = glsl_without_array(uniform->type);
diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c
index 2b1ca17c58b..0dc7de50c56 100644
--- a/src/mesa/state_tracker/st_pbo.c
+++ b/src/mesa/state_tracker/st_pbo.c
@@ -557,7 +557,7 @@ create_fs(struct st_context *st, bool download,
[ST_PBO_CONVERT_SINT_TO_UINT] = GLSL_TYPE_UINT,
};
nir_variable *img_var =
- nir_variable_create(b.shader, nir_var_mem_image,
+ nir_variable_create(b.shader, nir_var_image,
glsl_image_type(GLSL_SAMPLER_DIM_BUF, false,
type[conversion]), "img");
img_var->data.access = ACCESS_NON_READABLE;
diff --git a/src/microsoft/clc/clc_compiler.c b/src/microsoft/clc/clc_compiler.c
index 604a1f76dd9..7880a060740 100644
--- a/src/microsoft/clc/clc_compiler.c
+++ b/src/microsoft/clc/clc_compiler.c
@@ -93,7 +93,7 @@ lower_read_write_image_deref(nir_builder *b, struct clc_image_lower_context *con
glsl_image_type(glsl_get_sampler_dim(in_var->type),
glsl_sampler_type_is_array(in_var->type),
nir_get_glsl_base_type_for_nir_type(image_type | 32));
- return lower_image_deref_impl(b, context, new_var_type, nir_var_mem_image, context->num_uavs);
+ return lower_image_deref_impl(b, context, new_var_type, nir_var_image, context->num_uavs);
}
static void
More information about the mesa-commit
mailing list