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

brw: drop unused color_outputs_valid key

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/39264>
This commit is contained in:
Lionel Landwerlin 2026-01-12 14:07:57 +02:00 • committed by Marge Bot
parent c3bd1a1688
commit 0a3f3fd193
3 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -582,7 +582,6 @@ iris_to_brw_fs_key(const struct iris_screen *screen,
.persample_interp = key->persample_interp ? INTEL_ALWAYS : INTEL_NEVER, .persample_interp = key->persample_interp ? INTEL_ALWAYS : INTEL_NEVER,
.multisample_fbo = key->multisample_fbo ? INTEL_ALWAYS : INTEL_NEVER, .multisample_fbo = key->multisample_fbo ? INTEL_ALWAYS : INTEL_NEVER,
.force_dual_color_blend = key->force_dual_color_blend, .force_dual_color_blend = key->force_dual_color_blend,
.color_outputs_valid = key->color_outputs_valid,
.ignore_sample_mask_out = !key->multisample_fbo, .ignore_sample_mask_out = !key->multisample_fbo,
}; };
} }

4
src/intel/compiler/brw/brw_compiler.h
View file

@ -403,8 +403,6 @@ struct brw_wm_prog_key {
float min_sample_shading; float min_sample_shading;
uint8_t color_outputs_valid;
/* Some collection of BRW_WM_IZ_* */ /* Some collection of BRW_WM_IZ_* */
unsigned nr_color_regions:5; unsigned nr_color_regions:5;
bool alpha_test_replicate_alpha:1; bool alpha_test_replicate_alpha:1;
@ -434,7 +432,7 @@ struct brw_wm_prog_key {
bool ignore_sample_mask_out:1; bool ignore_sample_mask_out:1;
bool coarse_pixel:1; bool coarse_pixel:1;
bool api_sample_shading:1; bool api_sample_shading:1;
unsigned pad:4; unsigned pad:12;
}; };
static inline bool static inline bool

7
src/intel/vulkan/anv_shader_compile.c
View file

@ -480,8 +480,7 @@ populate_wm_prog_key(struct brw_wm_prog_key *key,
populate_base_gfx_prog_key(&key->base, device, rs, state, link_stages); populate_base_gfx_prog_key(&key->base, device, rs, state, link_stages);
/* Consider all inputs as valid until look at the NIR variables. */ /* Consider all inputs as valid until look at the NIR variables. */
key->color_outputs_valid = rp_color_mask(state); key->nr_color_regions = util_last_bit(rp_color_mask(state));
key->nr_color_regions = util_last_bit(key->color_outputs_valid);
/* To reduce possible shader recompilations we would need to know if /* To reduce possible shader recompilations we would need to know if
* there is a SampleMask output variable to compute if we should emit * there is a SampleMask output variable to compute if we should emit
@ -522,7 +521,6 @@ populate_wm_prog_key(struct brw_wm_prog_key *key,
key->ignore_sample_mask_out = !key->multisample_fbo; key->ignore_sample_mask_out = !key->multisample_fbo;
} else { } else {
/* Consider all inputs as valid until we look at the NIR variables. */ /* Consider all inputs as valid until we look at the NIR variables. */
key->color_outputs_valid = BITFIELD_MASK(MAX_RTS);
key->nr_color_regions = MAX_RTS; key->nr_color_regions = MAX_RTS;
key->alpha_to_coverage = INTEL_SOMETIMES; key->alpha_to_coverage = INTEL_SOMETIMES;
@ -1200,9 +1198,8 @@ anv_shader_compute_fragment_rts(const struct brw_compiler *compiler,
const unsigned num_rts = util_last_bit64(rt_mask); const unsigned num_rts = util_last_bit64(rt_mask);
struct anv_pipeline_binding rt_bindings[MAX_RTS]; struct anv_pipeline_binding rt_bindings[MAX_RTS];
shader_data->key.wm.color_outputs_valid = rt_mask & rp_color_mask(state);
shader_data->key.wm.nr_color_regions = shader_data->key.wm.nr_color_regions =
util_last_bit(shader_data->key.wm.color_outputs_valid); util_last_bit(rt_mask & rp_color_mask(state));
if (num_rts > 0) { if (num_rts > 0) {
for (unsigned rt = 0; rt < num_rts; rt++) { for (unsigned rt = 0; rt < num_rts; rt++) {