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/gallium/drivers/freedreno/ir3 | |
| 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/gallium/drivers/freedreno/ir3')
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/ir3/ir3_shader.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c index 5c7ad84c250..14d5e50f992 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c @@ -1146,7 +1146,7 @@ static void add_sysval_input(struct ir3_compile *ctx, gl_system_value slot, so->inputs[n].slot = slot; so->inputs[n].compmask = 1; so->inputs[n].regid = r; - so->inputs[n].interpolate = INTERP_QUALIFIER_FLAT; + so->inputs[n].interpolate = INTERP_MODE_FLAT; so->total_in++; ctx->ir->ninputs = MAX2(ctx->ir->ninputs, r + 1); @@ -2055,7 +2055,7 @@ setup_input(struct ir3_compile *ctx, nir_variable *in) * we need to do flat vs smooth shading depending on * rast state: */ - if (in->data.interpolation == INTERP_QUALIFIER_NONE) { + if (in->data.interpolation == INTERP_MODE_NONE) { switch (slot) { case VARYING_SLOT_COL0: case VARYING_SLOT_COL1: @@ -2069,7 +2069,7 @@ setup_input(struct ir3_compile *ctx, nir_variable *in) } if (ctx->flat_bypass) { - if ((so->inputs[n].interpolate == INTERP_QUALIFIER_FLAT) || + if ((so->inputs[n].interpolate == INTERP_MODE_FLAT) || (so->inputs[n].rasterflat && ctx->so->key.rasterflat)) use_ldlv = true; } diff --git a/src/gallium/drivers/freedreno/ir3/ir3_shader.h b/src/gallium/drivers/freedreno/ir3/ir3_shader.h index c17a76be189..b773609249f 100644 --- a/src/gallium/drivers/freedreno/ir3/ir3_shader.h +++ b/src/gallium/drivers/freedreno/ir3/ir3_shader.h @@ -197,7 +197,7 @@ struct ir3_shader_variant { /* fragment shader specific: */ bool bary : 1; /* fetched varying (vs one loaded into reg) */ bool rasterflat : 1; /* special handling for emit->rasterflat */ - enum glsl_interp_qualifier interpolate; + enum glsl_interp_mode interpolate; } inputs[16 + 2]; /* +POSITION +FACE */ /* sum of input components (scalar). For frag shaders, it only counts |