diff options
| -rw-r--r-- | src/amd/vulkan/radv_shader.c | 2 | ||||
| -rw-r--r-- | src/compiler/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/compiler/nir/meson.build | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_packing.c (renamed from src/compiler/nir/nir_lower_64bit_packing.c) | 6 | ||||
| -rw-r--r-- | src/intel/compiler/brw_nir.c | 2 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_nir.cpp | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 014ed78c228..27b3fbed16d 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -125,7 +125,7 @@ radv_optimize_nir(struct nir_shader *shader) progress = false; NIR_PASS_V(shader, nir_lower_vars_to_ssa); - NIR_PASS_V(shader, nir_lower_64bit_pack); + NIR_PASS_V(shader, nir_lower_pack); NIR_PASS_V(shader, nir_lower_alu_to_scalar); NIR_PASS_V(shader, nir_lower_phis_to_scalar); diff --git a/src/compiler/Makefile.sources b/src/compiler/Makefile.sources index a219ed9f794..80a61e507b2 100644 --- a/src/compiler/Makefile.sources +++ b/src/compiler/Makefile.sources @@ -212,7 +212,6 @@ NIR_FILES = \ nir/nir_liveness.c \ nir/nir_loop_analyze.c \ nir/nir_loop_analyze.h \ - nir/nir_lower_64bit_packing.c \ nir/nir_lower_alpha_test.c \ nir/nir_lower_alu_to_scalar.c \ nir/nir_lower_atomics_to_ssbo.c \ @@ -236,6 +235,7 @@ NIR_FILES = \ nir/nir_lower_io_to_temporaries.c \ nir/nir_lower_io_to_scalar.c \ nir/nir_lower_io_types.c \ + nir/nir_lower_packing.c \ nir/nir_lower_passthrough_edgeflags.c \ nir/nir_lower_patch_vertices.c \ nir/nir_lower_phis_to_scalar.c \ diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 57bf90c58b1..f5a4affc893 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -103,7 +103,6 @@ files_libnir = files( 'nir_liveness.c', 'nir_loop_analyze.c', 'nir_loop_analyze.h', - 'nir_lower_64bit_packing.c', 'nir_lower_alu_to_scalar.c', 'nir_lower_alpha_test.c', 'nir_lower_atomics_to_ssbo.c', @@ -126,6 +125,7 @@ files_libnir = files( 'nir_lower_io_to_temporaries.c', 'nir_lower_io_to_scalar.c', 'nir_lower_io_types.c', + 'nir_lower_packing.c', 'nir_lower_passthrough_edgeflags.c', 'nir_lower_patch_vertices.c', 'nir_lower_phis_to_scalar.c', diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index a538d6981cc..a379928cdcd 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -2786,7 +2786,7 @@ typedef enum { } nir_lower_doubles_options; bool nir_lower_doubles(nir_shader *shader, nir_lower_doubles_options options); -bool nir_lower_64bit_pack(nir_shader *shader); +bool nir_lower_pack(nir_shader *shader); bool nir_normalize_cubemap_coords(nir_shader *shader); diff --git a/src/compiler/nir/nir_lower_64bit_packing.c b/src/compiler/nir/nir_lower_packing.c index dd435490e3d..ba9f4bc040a 100644 --- a/src/compiler/nir/nir_lower_64bit_packing.c +++ b/src/compiler/nir/nir_lower_packing.c @@ -87,7 +87,7 @@ lower_unpack_64_to_16(nir_builder *b, nir_ssa_def *src) } static bool -lower_64bit_pack_impl(nir_function_impl *impl) +lower_pack_impl(nir_function_impl *impl) { nir_builder b; nir_builder_init(&b, impl); @@ -148,13 +148,13 @@ lower_64bit_pack_impl(nir_function_impl *impl) } bool -nir_lower_64bit_pack(nir_shader *shader) +nir_lower_pack(nir_shader *shader) { bool progress = false; nir_foreach_function(function, shader) { if (function->impl) - progress |= lower_64bit_pack_impl(function->impl); + progress |= lower_pack_impl(function->impl); } return false; diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index 97d28db88e1..dfeea73b06a 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -586,7 +586,7 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, nir_lower_dfract | nir_lower_dround_even | nir_lower_dmod); - OPT(nir_lower_64bit_pack); + OPT(nir_lower_pack); } while (progress); return nir; diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 8d80c8cae22..3b261cf1b2c 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -325,7 +325,7 @@ st_nir_opts(nir_shader *nir) NIR_PASS_V(nir, nir_lower_alu_to_scalar); NIR_PASS_V(nir, nir_lower_phis_to_scalar); - NIR_PASS_V(nir, nir_lower_64bit_pack); + NIR_PASS_V(nir, nir_lower_pack); NIR_PASS(progress, nir, nir_copy_prop); NIR_PASS(progress, nir, nir_opt_remove_phis); NIR_PASS(progress, nir, nir_opt_dce); |