<div dir="ltr">Drp... Ignore my comments on 12...<br><div><br>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Apr 30, 2018 at 7:18 AM, Iago Toral Quiroga <span dir="ltr"><<a href="mailto:itoral@igalia.com" target="_blank">itoral@igalia.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">It can do 32-bit packing too now.<br>
---<br>
src/amd/vulkan/radv_shader.c | 2 +-<br>
src/compiler/Makefile.sources | 2 +-<br>
src/compiler/nir/meson.build | 2 +-<br>
src/compiler/nir/nir.h | 2 +-<br>
src/compiler/nir/{nir_lower_<wbr>64bit_packing.c => nir_lower_packing.c} | 6 +++---<br>
src/intel/compiler/brw_nir.c | 2 +-<br>
src/mesa/state_tracker/st_<wbr>glsl_to_nir.cpp | 2 +-<br>
7 files changed, 9 insertions(+), 9 deletions(-)<br>
rename src/compiler/nir/{nir_lower_<wbr>64bit_packing.c => nir_lower_packing.c} (97%)<br>
<br>
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c<br>
index aaa6702975..67956000d1 100644<br>
--- a/src/amd/vulkan/radv_shader.c<br>
+++ b/src/amd/vulkan/radv_shader.c<br>
@@ -125,7 +125,7 @@ radv_optimize_nir(struct nir_shader *shader)<br>
progress = false;<br>
<br>
NIR_PASS_V(shader, nir_lower_vars_to_ssa);<br>
- NIR_PASS_V(shader, nir_lower_64bit_pack);<br>
+ NIR_PASS_V(shader, nir_lower_pack);<br>
NIR_PASS_V(shader, nir_lower_alu_to_scalar);<br>
NIR_PASS_V(shader, nir_lower_phis_to_scalar);<br>
<br>
diff --git a/src/compiler/Makefile.<wbr>sources b/src/compiler/Makefile.<wbr>sources<br>
index b5321588be..14d024b0f9 100644<br>
--- a/src/compiler/Makefile.<wbr>sources<br>
+++ b/src/compiler/Makefile.<wbr>sources<br>
@@ -208,7 +208,6 @@ NIR_FILES = \<br>
nir/nir_liveness.c \<br>
nir/nir_loop_analyze.c \<br>
nir/nir_loop_analyze.h \<br>
- nir/nir_lower_64bit_packing.c \<br>
nir/nir_lower_alpha_test.c \<br>
nir/nir_lower_alu_to_scalar.c \<br>
nir/nir_lower_atomics.c \<br>
@@ -232,6 +231,7 @@ NIR_FILES = \<br>
nir/nir_lower_io_to_<wbr>temporaries.c \<br>
nir/nir_lower_io_to_scalar.c \<br>
nir/nir_lower_io_types.c \<br>
+ nir/nir_lower_packing.c \<br>
nir/nir_lower_passthrough_<wbr>edgeflags.c \<br>
nir/nir_lower_patch_vertices.c \<br>
nir/nir_lower_phis_to_scalar.c \<br>
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build<br>
index 62fe5167d3..1307e52f92 100644<br>
--- a/src/compiler/nir/meson.build<br>
+++ b/src/compiler/nir/meson.build<br>
@@ -103,7 +103,6 @@ files_libnir = files(<br>
'nir_liveness.c',<br>
'nir_loop_analyze.c',<br>
'nir_loop_analyze.h',<br>
- 'nir_lower_64bit_packing.c',<br>
'nir_lower_alu_to_scalar.c',<br>
'nir_lower_alpha_test.c',<br>
'nir_lower_atomics.c',<br>
@@ -127,6 +126,7 @@ files_libnir = files(<br>
'nir_lower_io_to_temporaries.<wbr>c',<br>
'nir_lower_io_to_scalar.c',<br>
'nir_lower_io_types.c',<br>
+ 'nir_lower_packing.c',<br>
'nir_lower_passthrough_<wbr>edgeflags.c',<br>
'nir_lower_patch_vertices.c',<br>
'nir_lower_phis_to_scalar.c',<br>
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h<br>
index e7f2b145b3..d328d90b84 100644<br>
--- a/src/compiler/nir/nir.h<br>
+++ b/src/compiler/nir/nir.h<br>
@@ -2791,7 +2791,7 @@ typedef enum {<br>
} nir_lower_doubles_options;<br>
<br>
bool nir_lower_doubles(nir_shader *shader, nir_lower_doubles_options options);<br>
-bool nir_lower_64bit_pack(nir_<wbr>shader *shader);<br>
+bool nir_lower_pack(nir_shader *shader);<br>
<br>
bool nir_normalize_cubemap_coords(<wbr>nir_shader *shader);<br>
<br>
diff --git a/src/compiler/nir/nir_lower_<wbr>64bit_packing.c b/src/compiler/nir/nir_lower_<wbr>packing.c<br>
similarity index 97%<br>
rename from src/compiler/nir/nir_lower_<wbr>64bit_packing.c<br>
rename to src/compiler/nir/nir_lower_<wbr>packing.c<br>
index dd435490e3..ba9f4bc040 100644<br>
--- a/src/compiler/nir/nir_lower_<wbr>64bit_packing.c<br>
+++ b/src/compiler/nir/nir_lower_<wbr>packing.c<br>
@@ -87,7 +87,7 @@ lower_unpack_64_to_16(nir_<wbr>builder *b, nir_ssa_def *src)<br>
}<br>
<br>
static bool<br>
-lower_64bit_pack_impl(nir_<wbr>function_impl *impl)<br>
+lower_pack_impl(nir_function_<wbr>impl *impl)<br>
{<br>
nir_builder b;<br>
nir_builder_init(&b, impl);<br>
@@ -148,13 +148,13 @@ lower_64bit_pack_impl(nir_<wbr>function_impl *impl)<br>
}<br>
<br>
bool<br>
-nir_lower_64bit_pack(nir_<wbr>shader *shader)<br>
+nir_lower_pack(nir_shader *shader)<br>
{<br>
bool progress = false;<br>
<br>
nir_foreach_function(function, shader) {<br>
if (function->impl)<br>
- progress |= lower_64bit_pack_impl(<wbr>function->impl);<br>
+ progress |= lower_pack_impl(function-><wbr>impl);<br>
}<br>
<br>
return false;<br>
diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c<br>
index fb5e08fb33..22ef0486b7 100644<br>
--- a/src/intel/compiler/brw_nir.c<br>
+++ b/src/intel/compiler/brw_nir.c<br>
@@ -584,7 +584,7 @@ brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler,<br>
nir_lower_dfract |<br>
nir_lower_dround_even |<br>
nir_lower_dmod);<br>
- OPT(nir_lower_64bit_pack);<br>
+ OPT(nir_lower_pack);<br>
} while (progress);<br>
<br>
return nir;<br>
diff --git a/src/mesa/state_tracker/st_<wbr>glsl_to_nir.cpp b/src/mesa/state_tracker/st_<wbr>glsl_to_nir.cpp<br>
index bcf6a7ceb6..dbf506e77b 100644<br>
--- a/src/mesa/state_tracker/st_<wbr>glsl_to_nir.cpp<br>
+++ b/src/mesa/state_tracker/st_<wbr>glsl_to_nir.cpp<br>
@@ -324,7 +324,7 @@ st_nir_opts(nir_shader *nir)<br>
NIR_PASS_V(nir, nir_lower_alu_to_scalar);<br>
NIR_PASS_V(nir, nir_lower_phis_to_scalar);<br>
<br>
- NIR_PASS_V(nir, nir_lower_64bit_pack);<br>
+ NIR_PASS_V(nir, nir_lower_pack);<br>
NIR_PASS(progress, nir, nir_copy_prop);<br>
NIR_PASS(progress, nir, nir_opt_remove_phis);<br>
NIR_PASS(progress, nir, nir_opt_dce);<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.14.1<br>
<br>
</font></span></blockquote></div><br></div>