diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/vc5/vc5_context.h | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/vc5/vc5_program.c | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/src/gallium/drivers/vc5/vc5_context.h b/src/gallium/drivers/vc5/vc5_context.h index 28b2e165a9d..1ab5a6b1532 100644 --- a/src/gallium/drivers/vc5/vc5_context.h +++ b/src/gallium/drivers/vc5/vc5_context.h @@ -132,6 +132,13 @@ struct vc5_uncompiled_shader { struct v3d_varying_slot *tf_outputs; uint16_t tf_specs[PIPE_MAX_SO_BUFFERS]; uint32_t num_tf_specs; + + /** + * Flag for if the NIR in this shader originally came from TGSI. If + * so, we need to do some fixups at compile time, due to missing + * information in TGSI that exists in NIR. + */ + bool was_tgsi; }; struct vc5_compiled_shader { diff --git a/src/gallium/drivers/vc5/vc5_program.c b/src/gallium/drivers/vc5/vc5_program.c index ae3850a64b3..87c21abe8b1 100644 --- a/src/gallium/drivers/vc5/vc5_program.c +++ b/src/gallium/drivers/vc5/vc5_program.c @@ -170,6 +170,8 @@ vc5_shader_state_create(struct pipe_context *pctx, fprintf(stderr, "\n"); } s = tgsi_to_nir(cso->tokens, &v3d_nir_options); + + so->was_tgsi = true; } NIR_PASS_V(s, nir_opt_global_to_local); @@ -414,6 +416,13 @@ vc5_update_compiled_fs(struct vc5_context *vc5, uint8_t prim_mode) desc->channel[0].size == 32) { key->f32_color_rb |= 1 << i; } + + if (vc5->prog.bind_fs->was_tgsi) { + if (util_format_is_pure_uint(cbuf->format)) + key->uint_color_rb |= 1 << i; + else if (util_format_is_pure_sint(cbuf->format)) + key->int_color_rb |= 1 << i; + } } if (key->is_points) { |