OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

freedreno/a6xx: Fix border color with Z24UINT_S8UINT

Browse Source 
With this special format the border color is in the second component of
the f16 member (that's also used for 8-bit and 16-bit integer formats).
This means we have to fix it up.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17177>
This commit is contained in:
Connor Abbott
2022-06-21 00:14:31 +02:00
committed by Marge Bot
parent e135c03446
commit 74d09cac98
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/freedreno/a6xx/fd6_emit.c
View File

@@ -68,7 +68,7 @@ struct PACKED bcolor_entry {
uint8_t ui8[4]; uint8_t ui8[4];
int8_t si8[4]; int8_t si8[4];
uint32_t rgb10a2; uint32_t rgb10a2;
uint32_t z24; /* also s8? */ uint32_t z24;
uint16_t uint16_t
srgb[4]; /* appears to duplicate fp16[], but clamped, used for srgb */ srgb[4]; /* appears to duplicate fp16[], but clamped, used for srgb */
uint8_t __pad1[56]; uint8_t __pad1[56];
@@ -80,10 +80,12 @@ struct PACKED bcolor_entry {
static void static void
setup_border_colors(struct fd_texture_stateobj *tex, setup_border_colors(struct fd_texture_stateobj *tex,
struct bcolor_entry *entries) struct bcolor_entry *entries,
struct fd_screen *screen)
{ {
unsigned i, j; unsigned i, j;
STATIC_ASSERT(sizeof(struct bcolor_entry) == FD6_BORDER_COLOR_SIZE); STATIC_ASSERT(sizeof(struct bcolor_entry) == FD6_BORDER_COLOR_SIZE);
const bool has_z24uint_s8uint = screen->info->a6xx.has_z24uint_s8uint;
for (i = 0; i < tex->num_samplers; i++) { for (i = 0; i < tex->num_samplers; i++) {
struct bcolor_entry *e = &entries[i]; struct bcolor_entry *e = &entries[i];
@@ -132,13 +134,14 @@ setup_border_colors(struct fd_texture_stateobj *tex,
* to desc->swizzle and desc->channel, the .x/.w component * to desc->swizzle and desc->channel, the .x/.w component
* is NONE and the stencil value is in the y component. * is NONE and the stencil value is in the y component.
* Meanwhile the hardware wants this in the .x component * Meanwhile the hardware wants this in the .x component
* for x24s8 and x32_s8x24. * for x24s8 and x32_s8x24, or the .y component for x24s8 with the
* special Z24UINT_S8UINT format.
*/ */
if ((format == PIPE_FORMAT_X24S8_UINT) || if ((format == PIPE_FORMAT_X24S8_UINT) ||
(format == PIPE_FORMAT_X32_S8X24_UINT)) { (format == PIPE_FORMAT_X32_S8X24_UINT)) {
if (j == 0) { if (j == 0) {
c = 1; c = 1;
cd = 0; cd = (format == PIPE_FORMAT_X24S8_UINT && has_z24uint_s8uint) ? 1 : 0;
} else { } else {
continue; continue;
} }
@@ -231,9 +234,10 @@ emit_border_color(struct fd_context *ctx, struct fd_ringbuffer *ring) assert_dt
entries = ptr; entries = ptr;
setup_border_colors(&ctx->tex[PIPE_SHADER_VERTEX], &entries[0]); setup_border_colors(&ctx->tex[PIPE_SHADER_VERTEX], &entries[0], ctx->screen);
setup_border_colors(&ctx->tex[PIPE_SHADER_FRAGMENT], setup_border_colors(&ctx->tex[PIPE_SHADER_FRAGMENT],
&entries[ctx->tex[PIPE_SHADER_VERTEX].num_samplers]); &entries[ctx->tex[PIPE_SHADER_VERTEX].num_samplers],
ctx->screen);
OUT_PKT4(ring, REG_A6XX_SP_TP_BORDER_COLOR_BASE_ADDR, 2); OUT_PKT4(ring, REG_A6XX_SP_TP_BORDER_COLOR_BASE_ADDR, 2);
OUT_RELOC(ring, fd_resource(fd6_ctx->border_color_buf)->bo, off, 0, 0); OUT_RELOC(ring, fd_resource(fd6_ctx->border_color_buf)->bo, off, 0, 0);