From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Mon, 8 Jul 2019 11:34:13 +0000 (+0200)
Subject: zink/spirv: rename vec_type
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=af0dc71d6f60904f5b96558621407f214c418822;p=mesa.git

zink/spirv: rename vec_type

These aren't guaranteed to be vectors, they can also be scalars. The
var-part is the significant part here, not the vector-ness. So let's
rename these.

Acked-by: Jordan Justen <jordan.l.justen@intel.com>
---

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 a3d0d571c71..2989838919a 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
@@ -183,10 +183,10 @@ get_glsl_type(struct ntv_context *ctx, const struct glsl_type *type)
 static void
 emit_input(struct ntv_context *ctx, struct nir_variable *var)
 {
-   SpvId vec_type = get_glsl_type(ctx, var->type);
+   SpvId var_type = get_glsl_type(ctx, var->type);
    SpvId pointer_type = spirv_builder_type_pointer(&ctx->builder,
                                                    SpvStorageClassInput,
-                                                   vec_type);
+                                                   var_type);
    SpvId var_id = spirv_builder_emit_var(&ctx->builder, pointer_type,
                                          SpvStorageClassInput);
 
@@ -229,7 +229,7 @@ emit_input(struct ntv_context *ctx, struct nir_variable *var)
    assert(var->data.location_frac < 4);
    assert(ctx->inputs[var->data.driver_location][var->data.location_frac] == 0);
    ctx->inputs[var->data.driver_location][var->data.location_frac] = var_id;
-   ctx->input_types[var->data.driver_location][var->data.location_frac] = vec_type;
+   ctx->input_types[var->data.driver_location][var->data.location_frac] = var_type;
 
    assert(ctx->num_entry_ifaces < ARRAY_SIZE(ctx->entry_ifaces));
    ctx->entry_ifaces[ctx->num_entry_ifaces++] = var_id;
@@ -238,10 +238,10 @@ emit_input(struct ntv_context *ctx, struct nir_variable *var)
 static void
 emit_output(struct ntv_context *ctx, struct nir_variable *var)
 {
-   SpvId vec_type = get_glsl_type(ctx, var->type);
+   SpvId var_type = get_glsl_type(ctx, var->type);
    SpvId pointer_type = spirv_builder_type_pointer(&ctx->builder,
                                                    SpvStorageClassOutput,
-                                                   vec_type);
+                                                   var_type);
    SpvId var_id = spirv_builder_emit_var(&ctx->builder, pointer_type,
                                          SpvStorageClassOutput);
    if (var->name)
@@ -288,7 +288,7 @@ emit_output(struct ntv_context *ctx, struct nir_variable *var)
    assert(var->data.location_frac < 4);
    assert(ctx->outputs[var->data.driver_location][var->data.location_frac] == 0);
    ctx->outputs[var->data.driver_location][var->data.location_frac] = var_id;
-   ctx->output_types[var->data.driver_location][var->data.location_frac] = vec_type;
+   ctx->output_types[var->data.driver_location][var->data.location_frac] = var_type;
 
    assert(ctx->num_entry_ifaces < ARRAY_SIZE(ctx->entry_ifaces));
    ctx->entry_ifaces[ctx->num_entry_ifaces++] = var_id;