fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 05:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

freedreno/a5xx: Fix up border color pointers.

Browse source 
We were forgetting to increment in the loop, but also it looks from blob
dumps on Pixel 2 like all the pointers it emitted were shifted up by 3
compared to our xml, and that's the same shift that a6xx uses for its
pointers.  None of the tests seem to use more than one
border-color-requiring texture, so it's hard to tell.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9904>
This commit is contained in:
Eric Anholt 2021-03-29 14:11:28 -07:00 • committed by Marge Bot
parent de1a20f4be
commit cc5df4398a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/freedreno/registers/adreno/a5xx.xml
View file

@ -2882,7 +2882,7 @@ different border-color states per texture.. Looks something like:
0340: 3c003c00 3c003c00 00000000 00000000 00000000 00000000 00000000 00000000
-->
<bitfield name="BCOLOR_OFFSET" low="4" high="31"/>
<bitfield name="BCOLOR_OFFSET" low="7" high="31"/>
</reg32>
<reg32 offset="3" name="3"/>
</domain>

2
src/gallium/drivers/freedreno/a5xx/fd5_emit.c
View file

@ -366,7 +366,7 @@ emit_textures(struct fd_context *ctx, struct fd_ringbuffer *ring,
OUT_RING(ring, sampler->texsamp0);
OUT_RING(ring, sampler->texsamp1);
OUT_RING(ring, sampler->texsamp2 |
A5XX_TEX_SAMP_2_BCOLOR_OFFSET(bcolor_offset));
A5XX_TEX_SAMP_2_BCOLOR_OFFSET(bcolor_offset + i));
OUT_RING(ring, sampler->texsamp3);
needs_border |= sampler->needs_border;