fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 18:08:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

iris: Set HasWriteableRT correctly

Browse source 
A bit of irritating state cross dependency here, but nothing too hard
This commit is contained in:
Kenneth Graunke 2019-02-11 12:07:51 -08:00
parent d612cd1bf8
commit bf23e79629
2 changed files with 45 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/iris/iris_program.c
View file

@ -516,6 +516,21 @@ iris_bind_gs_state(struct pipe_context *ctx, void *state)
static void static void
iris_bind_fs_state(struct pipe_context *ctx, void *state) iris_bind_fs_state(struct pipe_context *ctx, void *state)
{ {
struct iris_context *ice = (struct iris_context *) ctx;
struct iris_uncompiled_shader *old_ish =
ice->shaders.uncompiled[MESA_SHADER_FRAGMENT];
struct iris_uncompiled_shader *new_ish = state;
const unsigned color_bits =
BITFIELD64_BIT(FRAG_RESULT_COLOR) |
BITFIELD64_RANGE(FRAG_RESULT_DATA0, BRW_MAX_DRAW_BUFFERS);
/* Fragment shader outputs influence HasWriteableRT */
if (!old_ish || !new_ish ||
(old_ish->nir->info.outputs_written & color_bits) !=
(new_ish->nir->info.outputs_written & color_bits))
ice->state.dirty |= IRIS_DIRTY_PS_BLEND;
bind_state((void *) ctx, state, MESA_SHADER_FRAGMENT); bind_state((void *) ctx, state, MESA_SHADER_FRAGMENT);
} }

31
src/gallium/drivers/iris/iris_state.c
View file

@ -821,6 +821,9 @@ struct iris_blend_state {
/** Bitfield of whether blending is enabled for RT[i] - for aux resolves */ /** Bitfield of whether blending is enabled for RT[i] - for aux resolves */
uint8_t blend_enables; uint8_t blend_enables;
/** Bitfield of whether color writes are enabled for RT[i] */
uint8_t color_write_enables;
}; };
static enum pipe_blendfactor static enum pipe_blendfactor
@ -850,6 +853,7 @@ iris_create_blend_state(struct pipe_context *ctx,
uint32_t *blend_entry = cso->blend_state + GENX(BLEND_STATE_length); uint32_t *blend_entry = cso->blend_state + GENX(BLEND_STATE_length);
cso->blend_enables = 0; cso->blend_enables = 0;
cso->color_write_enables = 0;
STATIC_ASSERT(BRW_MAX_DRAW_BUFFERS <= 8); STATIC_ASSERT(BRW_MAX_DRAW_BUFFERS <= 8);
cso->alpha_to_coverage = state->alpha_to_coverage; cso->alpha_to_coverage = state->alpha_to_coverage;
@ -876,6 +880,9 @@ iris_create_blend_state(struct pipe_context *ctx,
if (rt->blend_enable) if (rt->blend_enable)
cso->blend_enables |= 1u << i; cso->blend_enables |= 1u << i;
if (rt->colormask)
cso->color_write_enables |= 1u << i;
iris_pack_state(GENX(BLEND_STATE_ENTRY), blend_entry, be) { iris_pack_state(GENX(BLEND_STATE_ENTRY), blend_entry, be) {
be.LogicOpEnable = state->logicop_enable; be.LogicOpEnable = state->logicop_enable;
be.LogicOpFunction = state->logicop_func; be.LogicOpFunction = state->logicop_func;
@ -952,6 +959,25 @@ iris_bind_blend_state(struct pipe_context *ctx, void *state)
ice->state.dirty |= ice->state.dirty_for_nos[IRIS_NOS_BLEND]; ice->state.dirty |= ice->state.dirty_for_nos[IRIS_NOS_BLEND];
} }
/**
* Return true if the FS writes to any color outputs which are not disabled
* via color masking.
*/
static bool
has_writeable_rt(const struct iris_blend_state *cso_blend,
const struct shader_info *fs_info)
{
if (!fs_info)
return false;
unsigned rt_outputs = fs_info->outputs_written >> FRAG_RESULT_DATA0;
if (fs_info->outputs_written & BITFIELD64_BIT(FRAG_RESULT_COLOR))
rt_outputs = (1 << BRW_MAX_DRAW_BUFFERS) - 1;
return cso_blend->color_write_enables & rt_outputs;
}
/** /**
* Gallium CSO for depth, stencil, and alpha testing state. * Gallium CSO for depth, stencil, and alpha testing state.
*/ */
@ -4422,9 +4448,12 @@ iris_upload_dirty_render_state(struct iris_context *ice,
if (dirty & IRIS_DIRTY_PS_BLEND) { if (dirty & IRIS_DIRTY_PS_BLEND) {
struct iris_blend_state *cso_blend = ice->state.cso_blend; struct iris_blend_state *cso_blend = ice->state.cso_blend;
struct iris_depth_stencil_alpha_state *cso_zsa = ice->state.cso_zsa; struct iris_depth_stencil_alpha_state *cso_zsa = ice->state.cso_zsa;
const struct shader_info *fs_info =
iris_get_shader_info(ice, MESA_SHADER_FRAGMENT);
uint32_t dynamic_pb[GENX(3DSTATE_PS_BLEND_length)]; uint32_t dynamic_pb[GENX(3DSTATE_PS_BLEND_length)];
iris_pack_command(GENX(3DSTATE_PS_BLEND), &dynamic_pb, pb) { iris_pack_command(GENX(3DSTATE_PS_BLEND), &dynamic_pb, pb) {
pb.HasWriteableRT = true; // XXX: comes from somewhere :( pb.HasWriteableRT = has_writeable_rt(cso_blend, fs_info);
pb.AlphaTestEnable = cso_zsa->alpha.enabled; pb.AlphaTestEnable = cso_zsa->alpha.enabled;
} }