diff options
| author | Emma Anholt <emma@anholt.net> | 2021-08-06 14:05:53 -0700 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-08-18 00:15:18 +0000 |
| commit | f10c7c4a5d403ebcecf8e2364f671c8e43dc50ef (patch) | |
| tree | 4f4dc01dba3eb68fa02efd8809b53d868ef8a4e8 | |
| parent | 5b5dcbfe8942c15ecf2c8cd2d0d15ada61d7000d (diff) | |
freedreno/a5xx: Use ST4_ constants for SSBO/image state types.
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12258>
| -rw-r--r-- | src/gallium/drivers/freedreno/a5xx/fd5_emit.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/a5xx/fd5_image.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c index 4f44210c35c..85bb1b89231 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_emit.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_emit.c @@ -435,7 +435,7 @@ emit_ssbos(struct fd_context *ctx, struct fd_ringbuffer *ring, CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) | CP_LOAD_STATE4_0_STATE_BLOCK(sb) | CP_LOAD_STATE4_0_NUM_UNIT(1)); - OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(1) | + OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(ST4_CONSTANTS) | CP_LOAD_STATE4_1_EXT_SRC_ADDR(0)); OUT_RING(ring, CP_LOAD_STATE4_2_EXT_SRC_ADDR_HI(0)); @@ -451,7 +451,7 @@ emit_ssbos(struct fd_context *ctx, struct fd_ringbuffer *ring, CP_LOAD_STATE4_0_STATE_SRC(SS4_DIRECT) | CP_LOAD_STATE4_0_STATE_BLOCK(sb) | CP_LOAD_STATE4_0_NUM_UNIT(1)); - OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(2) | + OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(ST4_UBO) | CP_LOAD_STATE4_1_EXT_SRC_ADDR(0)); OUT_RING(ring, CP_LOAD_STATE4_2_EXT_SRC_ADDR_HI(0)); diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_image.c b/src/gallium/drivers/freedreno/a5xx/fd5_image.c index f4201698a58..975fc800605 100644 --- a/src/gallium/drivers/freedreno/a5xx/fd5_image.c +++ b/src/gallium/drivers/freedreno/a5xx/fd5_image.c @@ -182,8 +182,8 @@ emit_image_ssbo(struct fd_ringbuffer *ring, unsigned 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(1) | CP_LOAD_STATE4_1_EXT_SRC_ADDR(0)); + OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(ST4_CONSTANTS) | + 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_1_0_FMT(img->fmt) | A5XX_SSBO_1_0_WIDTH(img->width)); @@ -195,8 +195,8 @@ emit_image_ssbo(struct fd_ringbuffer *ring, unsigned 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(2) | CP_LOAD_STATE4_1_EXT_SRC_ADDR(0)); + OUT_RING(ring, CP_LOAD_STATE4_1_STATE_TYPE(ST4_UBO) | + CP_LOAD_STATE4_1_EXT_SRC_ADDR(0)); OUT_RING(ring, CP_LOAD_STATE4_2_EXT_SRC_ADDR_HI(0)); if (img->bo) { OUT_RELOC(ring, img->bo, img->offset, 0, 0); |