diff options
| author | Eric Anholt <[email protected]> | 2017-09-28 14:02:05 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2017-10-10 11:42:05 -0700 |
| commit | 361c5f28bdc6858618e9de85a340adce1b217e2c (patch) | |
| tree | f2a93b771d1c949b1208753eda296d0d1cbe5c09 /src/gallium/drivers/vc5 | |
| parent | d0dfc4bd5f3711ac48de88aa51fc6f442eaa0b20 (diff) | |
broadcom/vc5: Fix handling of interp qualifiers on builtin color inputs.
The interpolation qualifier, if specified, is supposed to take precedence
over glShadeModel().
Diffstat (limited to 'src/gallium/drivers/vc5')
| -rw-r--r-- | src/gallium/drivers/vc5/vc5_emit.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/vc5/vc5_program.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/vc5/vc5_emit.c b/src/gallium/drivers/vc5/vc5_emit.c index 29ccfcdacdb..60883d96d4b 100644 --- a/src/gallium/drivers/vc5/vc5_emit.c +++ b/src/gallium/drivers/vc5/vc5_emit.c @@ -408,7 +408,7 @@ vc5_emit_state(struct pipe_context *pctx) if (vc5->rasterizer->base.flatshade) { flags.flat_shade_flags_for_varyings_v024 |= - vc5->prog.fs->prog_data.fs->color_inputs[0] & 0xfffff; + vc5->prog.fs->prog_data.fs->shade_model_flags[0] & 0xfffff; } } } diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/vc5/vc5_program.c index 02625ed192b..107c9c05335 100644 --- a/src/gallium/drivers/vc5/vc5_program.c +++ b/src/gallium/drivers/vc5/vc5_program.c @@ -367,8 +367,8 @@ vc5_update_compiled_fs(struct vc5_context *vc5, uint8_t prim_mode) (vc5->prog.fs->prog_data.fs->flat_shade_flags != old_fs->prog_data.fs->flat_shade_flags || (vc5->rasterizer->base.flatshade && - vc5->prog.fs->prog_data.fs->color_inputs != - old_fs->prog_data.fs->color_inputs))) { + vc5->prog.fs->prog_data.fs->shade_model_flags != + old_fs->prog_data.fs->shade_model_flags))) { vc5->dirty |= VC5_DIRTY_FLAT_SHADE_FLAGS; } |