<div dir="ltr"><div>Reviewed-by: Marek Olšák <<a href="mailto:marek.olsak@amd.com">marek.olsak@amd.com</a>></div><div><br></div><div>Marek<br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jun 5, 2019 at 6:49 AM Connor Abbott <<a href="mailto:cwabbott0@gmail.com">cwabbott0@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">When e9d935ed0e2 added force_dcc_off(), we forced it off for any<br>
preloaded image descriptor which had stores associated with them, since<br>
the same preloaded descriptors were used for loads and stores. However,<br>
when the preloading was removed in 16be87c9042, the existing logic was<br>
kept despite it not being necessary anymore. The comment above<br>
force_dcc_off() only mentions stores, so only force DCC off for stores.<br>
<br>
Cc: Nicolai Hähnle <<a href="mailto:nicolai.haehnle@amd.com" target="_blank">nicolai.haehnle@amd.com</a>><br>
Cc: Marek Olšák <<a href="mailto:marek.olsak@amd.com" target="_blank">marek.olsak@amd.com</a>><br>
---<br>
src/gallium/drivers/radeonsi/si_shader_nir.c | 6 ------<br>
src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c | 7 -------<br>
2 files changed, 13 deletions(-)<br>
<br>
diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c<br>
index 72e6ffbac8a..a852283aff0 100644<br>
--- a/src/gallium/drivers/radeonsi/si_shader_nir.c<br>
+++ b/src/gallium/drivers/radeonsi/si_shader_nir.c<br>
@@ -997,16 +997,10 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi,<br>
bool write, bool bindless)<br>
{<br>
struct si_shader_context *ctx = si_shader_context_from_abi(abi);<br>
- const struct tgsi_shader_info *info = &ctx->shader->selector->info;<br>
LLVMBuilderRef builder = ctx->ac.builder;<br>
unsigned const_index = base_index + constant_index;<br>
bool dcc_off = write;<br>
<br>
- /* TODO: images_store and images_atomic are not set */<br>
- if (!dynamic_index && image &&<br>
- (info->images_store | info->images_atomic) & (1 << const_index))<br>
- dcc_off = true;<br>
-<br>
assert(!descriptor_set);<br>
assert(!image || desc_type == AC_DESC_IMAGE || desc_type == AC_DESC_BUFFER);<br>
<br>
diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c<br>
index c5704bc0eae..53075f1b546 100644<br>
--- a/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c<br>
+++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_mem.c<br>
@@ -218,15 +218,8 @@ image_fetch_rsrc(<br>
bool dcc_off = is_store;<br>
<br>
if (!image->Register.Indirect) {<br>
- const struct tgsi_shader_info *info = bld_base->info;<br>
- unsigned images_writemask = info->images_store |<br>
- info->images_atomic;<br>
-<br>
index = LLVMConstInt(ctx->i32,<br>
si_get_image_slot(image->Register.Index), 0);<br>
-<br>
- if (images_writemask & (1 << image->Register.Index))<br>
- dcc_off = true;<br>
} else {<br>
/* From the GL_ARB_shader_image_load_store extension spec:<br>
*<br>
-- <br>
2.17.2<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">mesa-dev@lists.freedesktop.org</a><br>
<a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a></blockquote></div>