diff options
author | Kenneth Graunke <[email protected]> | 2016-07-07 02:02:38 -0700 |
---|---|---|
committer | Kenneth Graunke <[email protected]> | 2016-07-17 19:26:48 -0700 |
commit | ac1181ffbef5250cb3b651e047cce5116727c34c (patch) | |
tree | b6aa32932d99fa3dcb15d2435ff63b662b939488 /src/mesa/state_tracker | |
parent | e7d96e7685e911b91ce048c6639a4c290faf5d06 (diff) |
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 <[email protected]>
Acked-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/mesa/state_tracker')
-rw-r--r-- | src/mesa/state_tracker/st_nir_lower_builtin.c | 6 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_program.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/state_tracker/st_nir_lower_builtin.c b/src/mesa/state_tracker/st_nir_lower_builtin.c index 20b04d1e20f..19a8ac03139 100644 --- a/src/mesa/state_tracker/st_nir_lower_builtin.c +++ b/src/mesa/state_tracker/st_nir_lower_builtin.c @@ -46,12 +46,12 @@ * * with appropriate substitutions in the uniform variables list: * - * decl_var uniform INTERP_QUALIFIER_NONE gl_FogParameters gl_Fog (0, 0) + * decl_var uniform INTERP_MODE_NONE gl_FogParameters gl_Fog (0, 0) * * would become: * - * decl_var uniform INTERP_QUALIFIER_NONE vec4 state.fog.color (0, 0) - * decl_var uniform INTERP_QUALIFIER_NONE vec4 state.fog.params (0, 1) + * decl_var uniform INTERP_MODE_NONE vec4 state.fog.color (0, 0) + * decl_var uniform INTERP_MODE_NONE vec4 state.fog.params (0, 1) * * See in particular 'struct gl_builtin_uniform_element'. */ diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 57b09354487..ebeed14ea2e 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -545,18 +545,18 @@ st_get_vp_variant(struct st_context *st, static unsigned -st_translate_interp(enum glsl_interp_qualifier glsl_qual, bool is_color) +st_translate_interp(enum glsl_interp_mode glsl_qual, bool is_color) { switch (glsl_qual) { - case INTERP_QUALIFIER_NONE: + case INTERP_MODE_NONE: if (is_color) return TGSI_INTERPOLATE_COLOR; return TGSI_INTERPOLATE_PERSPECTIVE; - case INTERP_QUALIFIER_SMOOTH: + case INTERP_MODE_SMOOTH: return TGSI_INTERPOLATE_PERSPECTIVE; - case INTERP_QUALIFIER_FLAT: + case INTERP_MODE_FLAT: return TGSI_INTERPOLATE_CONSTANT; - case INTERP_QUALIFIER_NOPERSPECTIVE: + case INTERP_MODE_NOPERSPECTIVE: return TGSI_INTERPOLATE_LINEAR; default: assert(0 && "unexpected interp mode in st_translate_interp()"); |