Re: [Mesa-dev] [PATCH 2/4] intel/compiler: rename brw_nir_lower_glsl_images

[Jason Ekstrand]

First two are R-b me

On September 5, 2018 09:11:18 Alejandro Piñeiro <apinhe...@igalia.com> wrote:

To brw_nir_lower_gl_images, as it will be also used on the
ARB_gl_spirv codepath, that doesn't involves GLSL at all. So the
lowering is about images following the OpenGL semantics. In any case
"brw_nir_lower_opengl_images" seemed too long to me, so I just used
gl. That shortening is already used on other parts of the code.
---
src/intel/compiler/brw_nir.h                   | 4 ++--
src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp | 4 ++--
src/mesa/drivers/dri/i965/brw_program.c        | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h
index 50073265539..06f0e8690e4 100644
--- a/src/intel/compiler/brw_nir.h
+++ b/src/intel/compiler/brw_nir.h

@@ -149,8 +149,8 @@ void brw_nir_setup_arb_uniforms(void *mem_ctx, nir_shader *shader,

                                struct gl_program *prog,
                                struct brw_stage_prog_data *stage_prog_data);

-void brw_nir_lower_glsl_images(nir_shader *shader,
-                               const struct gl_program *prog);
+void brw_nir_lower_gl_images(nir_shader *shader,
+                             const struct gl_program *prog);

void brw_nir_analyze_ubo_ranges(const struct brw_compiler *compiler,
                                nir_shader *nir,

diff --git a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp

index 34cabdc2977..35416a74b9c 100644
--- a/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
+++ b/src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
@@ -299,8 +299,8 @@ get_aoa_deref_offset(nir_builder *b,
}

void
-brw_nir_lower_glsl_images(nir_shader *shader,
-                          const struct gl_program *prog)
+brw_nir_lower_gl_images(nir_shader *shader,
+                        const struct gl_program *prog)
{
   /* We put image uniforms at the end */
   nir_foreach_variable(var, &shader->uniforms) {

diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c

index 041395ec4c0..ba418e45b85 100644
--- a/src/mesa/drivers/dri/i965/brw_program.c
+++ b/src/mesa/drivers/dri/i965/brw_program.c
@@ -140,7 +140,7 @@ brw_create_nir(struct brw_context *brw,
   }

   NIR_PASS_V(nir, brw_nir_lower_uniforms, is_scalar);
-   NIR_PASS_V(nir, brw_nir_lower_glsl_images, prog);
+   NIR_PASS_V(nir, brw_nir_lower_gl_images, prog);

   return nir;
}
--
2.14.1

_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev