diff options
| author | Rob Clark <[email protected]> | 2019-05-09 15:58:16 -0700 |
|---|---|---|
| committer | Rob Clark <[email protected]> | 2019-05-09 16:21:05 -0700 |
| commit | 9faf218b8cdda81b5813e935d5ba6e0d57706a03 (patch) | |
| tree | 879d724074a9f64c04f7aaeb4c5a48d096888b22 /src/freedreno | |
| parent | f2f6ac1c0811858374142022f81bdcf0207e640c (diff) | |
freedreno/ir3: fix rasterflat/glxgears
Ofc legacy gl features that are broken don't trigger fails in deqp. I
should remember to test glxgears more often.
Fixes: 7ff6705b8d8 freedreno/ir3: convert to "new style" frag inputs
Signed-off-by: Rob Clark <[email protected]>
Diffstat (limited to 'src/freedreno')
| -rw-r--r-- | src/freedreno/ir3/ir3_compiler_nir.c | 9 | ||||
| -rw-r--r-- | src/freedreno/ir3/ir3_shader.h | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/freedreno/ir3/ir3_compiler_nir.c b/src/freedreno/ir3/ir3_compiler_nir.c index a35a1518398..c230fbd3b70 100644 --- a/src/freedreno/ir3/ir3_compiler_nir.c +++ b/src/freedreno/ir3/ir3_compiler_nir.c @@ -1308,7 +1308,8 @@ emit_intrinsic(struct ir3_context *ctx, nir_intrinsic_instr *intr) idx += nir_src_as_uint(intr->src[1]); for (int i = 0; i < intr->num_components; i++) { unsigned inloc = idx * 4 + i + comp; - if (ctx->so->inputs[idx].bary) { + if (ctx->so->inputs[idx].bary && + !ctx->so->inputs[idx].use_ldlv) { dst[i] = ir3_BARY_F(b, create_immed(b, inloc), 0, coord, 0); } else { /* for non-varyings use the pre-setup input, since @@ -2406,8 +2407,6 @@ setup_input(struct ir3_context *ctx, nir_variable *in) so->inputs[n].bary = true; instr = create_frag_input(ctx, false, idx); } else { - bool use_ldlv = false; - /* detect the special case for front/back colors where * we need to do flat vs smooth shading depending on * rast state: @@ -2428,12 +2427,12 @@ setup_input(struct ir3_context *ctx, nir_variable *in) if (ctx->compiler->flat_bypass) { if ((so->inputs[n].interpolate == INTERP_MODE_FLAT) || (so->inputs[n].rasterflat && ctx->so->key.rasterflat)) - use_ldlv = true; + so->inputs[n].use_ldlv = true; } so->inputs[n].bary = true; - instr = create_frag_input(ctx, use_ldlv, idx); + instr = create_frag_input(ctx, so->inputs[n].use_ldlv, idx); } compile_assert(ctx, idx < ctx->ir->ninputs); diff --git a/src/freedreno/ir3/ir3_shader.h b/src/freedreno/ir3/ir3_shader.h index c13cf1df0bb..c2c1a5312bc 100644 --- a/src/freedreno/ir3/ir3_shader.h +++ b/src/freedreno/ir3/ir3_shader.h @@ -459,6 +459,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 */ + bool use_ldlv : 1; /* internal to ir3_compiler_nir */ bool half : 1; enum glsl_interp_mode interpolate; } inputs[16 + 2]; /* +POSITION +FACE */ |