[Mesa-dev] [PATCH 08/18] i965/blorp: Drop LOAD_UNIFORM macro

[Topi Pohjolainen]

Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
 src/mesa/drivers/dri/i965/brw_blorp_blit.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
index e021d23..1683f8e 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_blorp_blit.cpp
@@ -374,14 +374,9 @@ brw_blorp_blit_vars_init(nir_builder *b, struct brw_blorp_blit_vars *v,
    v->u_coord_transform->data.location =
       offsetof(struct brw_blorp_wm_inputs, x_transform.multiplier);
 
-#define LOAD_UNIFORM(name, type)\
-   v->u_##name = nir_variable_create(b->shader, nir_var_uniform, type, #name); \
-   v->u_##name->data.location = \
-      offsetof(struct brw_blorp_wm_inputs, name);
-
-   LOAD_UNIFORM(src_z, glsl_uint_type())
-
-#undef DECL_UNIFORM
+   v->u_src_z = nir_variable_create(b->shader, nir_var_uniform,
+                                    glsl_type::uint_type, "src_z");
+   v->u_src_z->data.location = offsetof(struct brw_blorp_wm_inputs, src_z);
 
    v->frag_coord = nir_variable_create(b->shader, nir_var_shader_in,
                                        glsl_vec4_type(), "gl_FragCoord");
-- 
2.5.5