summaryrefslogtreecommitdiffstats
path: root/src/compiler/nir
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2016-07-07 02:02:38 -0700
committerKenneth Graunke <kenneth@whitecape.org>2016-07-17 19:26:48 -0700
commitac1181ffbef5250cb3b651e047cce5116727c34c (patch)
treeb6aa32932d99fa3dcb15d2435ff63b662b939488 /src/compiler/nir
parente7d96e7685e911b91ce048c6639a4c290faf5d06 (diff)
downloadexternal_mesa3d-ac1181ffbef5250cb3b651e047cce5116727c34c.tar.gz
external_mesa3d-ac1181ffbef5250cb3b651e047cce5116727c34c.tar.bz2
external_mesa3d-ac1181ffbef5250cb3b651e047cce5116727c34c.zip
compiler: Rename INTERP_QUALIFIER_* to INTERP_MODE_*.
Likewise, rename the enum type to glsl_interp_mode. Beyond the GLSL front-end, talking about "interpolation modes" seems more natural than "interpolation qualifiers" - in the IR, we're removed from how exactly the source language specifies how to interpolate an input. Also, SPIR-V calls these "decorations" rather than "qualifiers". Generated by: $ find . -regextype egrep -regex '.*\.(c|cpp|h)' -type f -exec sed -i \ -e 's/INTERP_QUALIFIER_/INTERP_MODE_/g' \ -e 's/glsl_interp_qualifier/glsl_interp_mode/g' {} \; Signed-off-by: Kenneth Graunke <kenneth@whitecape.org> Acked-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'src/compiler/nir')
-rw-r--r--src/compiler/nir/nir.c2
-rw-r--r--src/compiler/nir/nir.h2
-rw-r--r--src/compiler/nir/nir_lower_two_sided_color.c2
-rw-r--r--src/compiler/nir/nir_print.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/compiler/nir/nir.c b/src/compiler/nir/nir.c
index 3c8b4e0e5d..b5d46145aa 100644
--- a/src/compiler/nir/nir.c
+++ b/src/compiler/nir/nir.c
@@ -161,7 +161,7 @@ nir_variable_create(nir_shader *shader, nir_variable_mode mode,
if ((mode == nir_var_shader_in && shader->stage != MESA_SHADER_VERTEX) ||
(mode == nir_var_shader_out && shader->stage != MESA_SHADER_FRAGMENT))
- var->data.interpolation = INTERP_QUALIFIER_SMOOTH;
+ var->data.interpolation = INTERP_MODE_SMOOTH;
if (mode == nir_var_shader_in || mode == nir_var_uniform)
var->data.read_only = true;
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index a7921eeb2a..c5d3b6b698 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -179,7 +179,7 @@ typedef struct nir_variable {
/**
* Interpolation mode for shader inputs / outputs
*
- * \sa glsl_interp_qualifier
+ * \sa glsl_interp_mode
*/
unsigned interpolation:2;
diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c
index 5d8779e14c..3e666691a6 100644
--- a/src/compiler/nir/nir_lower_two_sided_color.c
+++ b/src/compiler/nir/nir_lower_two_sided_color.c
@@ -114,7 +114,7 @@ setup_inputs(lower_2side_state *state)
/* if we don't already have one, insert a FACE input: */
if (!state->face) {
state->face = create_input(state->shader, ++maxloc, VARYING_SLOT_FACE);
- state->face->data.interpolation = INTERP_QUALIFIER_FLAT;
+ state->face->data.interpolation = INTERP_MODE_FLAT;
}
/* add required back-face color inputs: */
diff --git a/src/compiler/nir/nir_print.c b/src/compiler/nir/nir_print.c
index bca8a3525e..a3380e677d 100644
--- a/src/compiler/nir/nir_print.c
+++ b/src/compiler/nir/nir_print.c
@@ -374,7 +374,7 @@ print_var_decl(nir_variable *var, print_state *state)
const char *const inv = (var->data.invariant) ? "invariant " : "";
fprintf(fp, "%s%s%s%s%s %s ",
cent, samp, patch, inv, get_variable_mode_str(var->data.mode),
- glsl_interp_qualifier_name(var->data.interpolation));
+ glsl_interp_mode_name(var->data.interpolation));
const char *const coher = (var->data.image.coherent) ? "coherent " : "";
const char *const volat = (var->data.image._volatile) ? "volatile " : "";