diff options
| author | Kristian H. Kristensen <[email protected]> | 2019-02-11 21:50:21 -0800 |
|---|---|---|
| committer | Kristian H. Kristensen <[email protected]> | 2019-02-13 11:14:06 -0800 |
| commit | 1831238c8e1fb45c15770b0ae7fed9a62cb2f0eb (patch) | |
| tree | b08484a671b39ee1202c3a2afe3bf9c9533e11b0 /src/gallium | |
| parent | 182e5c011f225709c12e192012b2e4cc228ba735 (diff) | |
freedreno/a6xx: Update headers
This pulls in changes for compute shaders and a6xx ssbo/image support.
FACENESS bit moved from position 1 to 2 and there's a global invert
bit for point coord.
Signed-off-by: Kristian H. Kristensen <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_emit.c | 10 | ||||
| -rw-r--r-- | src/gallium/drivers/freedreno/a6xx/fd6_image.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c index befb025930e..fad3c09a733 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_emit.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_emit.c @@ -458,8 +458,8 @@ emit_ssbos(struct fd_context *ctx, struct fd_ringbuffer *ring, return; switch (sb) { - case SB6_SSBO: - case SB6_CS_SSBO: + case SB6_IBO: + case SB6_CS_IBO: opcode = CP_LOAD_STATE6_GEOM; break; default: @@ -922,7 +922,7 @@ fd6_emit_state(struct fd_ringbuffer *ring, struct fd6_emit *emit) emit_border_color(ctx, ring); if (ctx->dirty_shader[PIPE_SHADER_FRAGMENT] & FD_DIRTY_SHADER_SSBO) - emit_ssbos(ctx, ring, SB6_SSBO, &ctx->shaderbuf[PIPE_SHADER_FRAGMENT]); + emit_ssbos(ctx, ring, SB6_IBO, &ctx->shaderbuf[PIPE_SHADER_FRAGMENT]); if (ctx->dirty_shader[PIPE_SHADER_FRAGMENT] & FD_DIRTY_SHADER_IMAGE) fd6_emit_images(ctx, ring, PIPE_SHADER_FRAGMENT); @@ -992,7 +992,7 @@ fd6_emit_cs_state(struct fd_context *ctx, struct fd_ringbuffer *ring, #endif if (dirty & FD_DIRTY_SHADER_SSBO) - emit_ssbos(ctx, ring, SB6_CS_SSBO, &ctx->shaderbuf[PIPE_SHADER_COMPUTE]); + emit_ssbos(ctx, ring, SB6_CS_IBO, &ctx->shaderbuf[PIPE_SHADER_COMPUTE]); if (dirty & FD_DIRTY_SHADER_IMAGE) fd6_emit_images(ctx, ring, PIPE_SHADER_COMPUTE); @@ -1036,7 +1036,7 @@ t7 opcode: CP_WAIT_FOR_IDLE (26) (1 dwords) WRITE(REG_A6XX_GRAS_UNKNOWN_8600, 0x880); WRITE(REG_A6XX_HLSQ_UNKNOWN_BE04, 0); WRITE(REG_A6XX_SP_UNKNOWN_AE03, 0x00000410); - WRITE(REG_A6XX_SP_UNKNOWN_AB20, 0); + WRITE(REG_A6XX_SP_IBO_COUNT, 0); WRITE(REG_A6XX_SP_UNKNOWN_B182, 0); WRITE(REG_A6XX_HLSQ_UNKNOWN_BB11, 0); WRITE(REG_A6XX_UCHE_UNKNOWN_0E12, 0x3200000); diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_image.c b/src/gallium/drivers/freedreno/a6xx/fd6_image.c index cc33a00c4cd..f4e3492154d 100644 --- a/src/gallium/drivers/freedreno/a6xx/fd6_image.c +++ b/src/gallium/drivers/freedreno/a6xx/fd6_image.c @@ -38,8 +38,8 @@ static enum a6xx_state_block texsb[] = { }; static enum a6xx_state_block imgsb[] = { - [PIPE_SHADER_COMPUTE] = SB6_CS_SSBO, - [PIPE_SHADER_FRAGMENT] = SB6_SSBO, + [PIPE_SHADER_COMPUTE] = SB6_CS_IBO, + [PIPE_SHADER_FRAGMENT] = SB6_IBO, }; struct fd6_image { |