Mesa (master): freedreno/a5xx: remove one image stateblock

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 570844059789cf497123a85ed19eac9274f11139
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=570844059789cf497123a85ed19eac9274f11139

Author: Rob Clark <robdclark at gmail.com>
Date:   Sun Jun 10 11:35:56 2018 -0400

freedreno/a5xx: remove one image stateblock

I think this ends up just setting uniform/const memory.  But we upload
x/y/z stride differently.  At best this is unneeded, at worst it could
possibly clobber other uniform/const memory.

Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/gallium/drivers/freedreno/a5xx/fd5_image.c | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_image.c b/src/gallium/drivers/freedreno/a5xx/fd5_image.c
index be31c5d5fb..f5d25ff8a6 100644
--- a/src/gallium/drivers/freedreno/a5xx/fd5_image.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_image.c
@@ -160,19 +160,6 @@ static void emit_image_tex(struct fd_ringbuffer *ring, unsigned slot,
 static void emit_image_ssbo(struct fd_ringbuffer *ring, unsigned slot,
 		struct fd5_image *img, enum pipe_shader_type shader)
 {
-	OUT_PKT7(ring, CP_LOAD_STATE4, 3 + 4);
-	OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(slot) |
-		CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |
-		CP_LOAD_STATE4_0_STATE_BLOCK(imgsb[shader]) |
-		CP_LOAD_STATE4_0_NUM_UNIT(1));
-	OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(0) |
-		CP_LOAD_STATE4_1_EXT_SRC_ADDR(0));
-	OUT_RING(ring, CP_LOAD_STATE4_2_EXT_SRC_ADDR_HI(0));
-	OUT_RING(ring, A5XX_SSBO_0_0_BASE_LO(0));
-	OUT_RING(ring, A5XX_SSBO_0_1_PITCH(img->pitch));
-	OUT_RING(ring, A5XX_SSBO_0_2_ARRAY_PITCH(img->array_pitch));
-	OUT_RING(ring, A5XX_SSBO_0_3_CPP(img->cpp));
-
 	OUT_PKT7(ring, CP_LOAD_STATE4, 3 + 2);
 	OUT_RING(ring, CP_LOAD_STATE4_0_DST_OFF(slot) |
 		CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) |