OSDN Git Service

broadcom/vc5: Fix swizzling of RGB10_A2UI render targets.
authorEric Anholt <eric@anholt.net>
Mon, 26 Mar 2018 19:39:12 +0000 (12:39 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 27 Mar 2018 00:46:23 +0000 (17:46 -0700)
This is the actual hardware layout, and we were only swizzling R/B back
around in texturing.  Fixes part of
KHR-GLES3.copy_tex_image_conversions.required.cubemap_negx_cubemap_negx in
simulation.

src/gallium/drivers/vc5/v3dx_format_table.c

index 884f737..4aaf0ec 100644 (file)
@@ -68,7 +68,7 @@ static const struct vc5_format format_table[] = {
         FORMAT(R8G8B8A8_SNORM,    NO,           RGBA8_SNORM, SWIZ_XYZW, 16, 0),
         FORMAT(R8G8B8X8_SNORM,    NO,           RGBA8_SNORM, SWIZ_XYZ1, 16, 0),
         FORMAT(R10G10B10A2_UNORM, RGB10_A2,     RGB10_A2,    SWIZ_XYZW, 16, 0),
-        FORMAT(B10G10R10A2_UINT,  RGB10_A2UI,   RGB10_A2UI,  SWIZ_ZYXW, 16, 0),
+        FORMAT(R10G10B10A2_UINT,  RGB10_A2UI,   RGB10_A2UI,  SWIZ_XYZW, 16, 0),
 
         FORMAT(A4B4G4R4_UNORM,    ABGR4444,     RGBA4,       SWIZ_XYZW, 16, 0),