diff options
| author | Kristian H. Kristensen <[email protected]> | 2019-04-18 10:38:56 -0700 |
|---|---|---|
| committer | Kristian H. Kristensen <[email protected]> | 2019-04-18 11:46:13 -0700 |
| commit | 6aa211b3169e86271caf1251d8fb7f88f3e42ebd (patch) | |
| tree | 6ea7fbf9e186a4b4c68be3e4077059efff4b38ff /src | |
| parent | c34b285b38400ca1aaa7d00410bc99d393c79e2f (diff) | |
freedreno: Use enum values from matching enum
We get a couple of warnings from using mismatched enum values. This
fixes that.
Signed-off-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/freedreno/a2xx/fd2_gmem.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/a4xx/fd4_gmem.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c b/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c index 692188ebd4e..867cb0a3d09 100644 --- a/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c +++ b/src/gallium/drivers/freedreno/a2xx/fd2_gmem.c @@ -328,7 +328,7 @@ fd2_emit_tile_mem2gmem(struct fd_batch *batch, struct fd_tile *tile) OUT_PKT3(ring, CP_SET_CONSTANT, 2); OUT_RING(ring, CP_REG(REG_A2XX_RB_COLORCONTROL)); - OUT_RING(ring, A2XX_RB_COLORCONTROL_ALPHA_FUNC(PIPE_FUNC_ALWAYS) | + OUT_RING(ring, A2XX_RB_COLORCONTROL_ALPHA_FUNC(FUNC_ALWAYS) | A2XX_RB_COLORCONTROL_BLEND_DISABLE | A2XX_RB_COLORCONTROL_ROP_CODE(12) | A2XX_RB_COLORCONTROL_DITHER_MODE(DITHER_DISABLE) | diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c index d061c8ac70f..7543658dc08 100644 --- a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c +++ b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c @@ -183,7 +183,7 @@ emit_gmem2mem_surf(struct fd_batch *batch, bool stencil, A4XX_RB_COPY_DEST_INFO_SWAP(fd4_pipe2swap(pformat))); fd4_draw(batch, ring, DI_PT_RECTLIST, IGNORE_VISIBILITY, - DI_SRC_SEL_AUTO_INDEX, 2, 1, INDEX_SIZE_IGN, 0, 0, NULL); + DI_SRC_SEL_AUTO_INDEX, 2, 1, INDEX4_SIZE_8_BIT, 0, 0, NULL); } static void @@ -321,7 +321,7 @@ emit_mem2gmem_surf(struct fd_batch *batch, uint32_t *bases, fd4_emit_gmem_restore_tex(ring, nr_bufs, bufs); fd4_draw(batch, ring, DI_PT_RECTLIST, IGNORE_VISIBILITY, - DI_SRC_SEL_AUTO_INDEX, 2, 1, INDEX_SIZE_IGN, 0, 0, NULL); + DI_SRC_SEL_AUTO_INDEX, 2, 1, INDEX4_SIZE_8_BIT, 0, 0, NULL); } static void |