KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

radeonsi: remove redundant info.uses_fbfetch 

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6782>
This commit is contained in:
Marek Olšák 2020-09-17 20:31:02 -04:00
parent 7b1e01fec7
commit d1d27e9db4
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/radeonsi/si_descriptors.c
View File

@ -863,7 +863,7 @@ void si_update_ps_colorbuf0_slot(struct si_context *sctx)
return;
/* See whether FBFETCH is used and color buffer 0 is set. */
if (sctx->ps_shader.cso && sctx->ps_shader.cso->info.uses_fbfetch &&
if (sctx->ps_shader.cso && sctx->ps_shader.cso->info.base.fs.uses_fbfetch_output &&
sctx->framebuffer.state.nr_cbufs && sctx->framebuffer.state.cbufs[0])
surf = sctx->framebuffer.state.cbufs[0];

1
src/gallium/drivers/radeonsi/si_shader.h
View File

@ -382,7 +382,6 @@ struct si_shader_info {
bool writes_layer;
bool uses_bindless_samplers;
bool uses_bindless_images;
bool uses_fbfetch;
/** Whether all codepaths write tess factors in all invocations. */
bool tessfactors_are_def_in_all_invocs;

4
src/gallium/drivers/radeonsi/si_shader_nir.c
View File

@ -137,10 +137,6 @@ static void scan_io_usage(struct si_shader_info *info, nir_intrinsic_instr *intr
if (is_output_load) {
/* Output loads have only a few things that we need to track. */
info->output_readmask[loc] |= mask;
if (info->stage == MESA_SHADER_FRAGMENT &&
nir_intrinsic_io_semantics(intr).fb_fetch_output)
info->uses_fbfetch = true;
} else if (mask) {
/* Output stores. */
if (info->stage == MESA_SHADER_GEOMETRY) {