From: Marek Olšák <marek.olsak@amd.com>
Date: Tue, 3 Apr 2018 01:30:41 +0000 (-0400)
Subject: radeonsi: don't do GFX-specific texture decompression for compute
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8a28679987dc768e868c7123e0daea7dd02ab05e;p=mesa.git

radeonsi: don't do GFX-specific texture decompression for compute

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
---

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 35506dd74b3..d6eab58b3a8 100644
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -801,22 +801,22 @@ void si_decompress_textures(struct si_context *sctx, unsigned shader_mask)
 			si_decompress_resident_textures(sctx);
 		if (sctx->uses_bindless_images)
 			si_decompress_resident_images(sctx);
+
+		if (sctx->ps_uses_fbfetch) {
+			struct pipe_surface *cb0 = sctx->framebuffer.state.cbufs[0];
+			si_decompress_color_texture(sctx,
+						    (struct r600_texture*)cb0->texture,
+						    cb0->u.tex.first_layer,
+						    cb0->u.tex.last_layer);
+		}
+
+		si_check_render_feedback(sctx);
 	} else if (shader_mask & (1 << PIPE_SHADER_COMPUTE)) {
 		if (sctx->cs_shader_state.program->uses_bindless_samplers)
 			si_decompress_resident_textures(sctx);
 		if (sctx->cs_shader_state.program->uses_bindless_images)
 			si_decompress_resident_images(sctx);
 	}
-
-	if (sctx->ps_uses_fbfetch) {
-		struct pipe_surface *cb0 = sctx->framebuffer.state.cbufs[0];
-		si_decompress_color_texture(sctx,
-					    (struct r600_texture*)cb0->texture,
-					    cb0->u.tex.first_layer,
-					    cb0->u.tex.last_layer);
-	}
-
-	si_check_render_feedback(sctx);
 }
 
 /* Helper for decompressing a portion of a color or depth resource before