broadcom/vc5: Fix RG16I/UI texture sampling.
authorEric Anholt <eric@anholt.net>
Tue, 27 Mar 2018 21:26:17 +0000 (14:26 -0700)
committerEric Anholt <eric@anholt.net>
Tue, 27 Mar 2018 22:49:58 +0000 (15:49 -0700)
How many times did I look at this table without noticing the missing 'G'
in the texture column?

Fixes KHR-GLES3.copy_tex_image_conversions.required.* on 7268.

src/gallium/drivers/vc5/v3dx_format_table.c

index 4aaf0ecd3d45b8fae2e66cb081bd8d1949d0483b..cc356fc381161b7e3e52906a3f97dc76ef70cf18 100644 (file)
@@ -120,8 +120,8 @@ static const struct vc5_format format_table[] = {
 
         FORMAT(R16_SINT,          R16I,         R16I,        SWIZ_X001, 16, 0),
         FORMAT(R16_UINT,          R16UI,        R16UI,       SWIZ_X001, 16, 0),
-        FORMAT(R16G16_SINT,       RG16I,        R16I,        SWIZ_XY01, 16, 0),
-        FORMAT(R16G16_UINT,       RG16UI,       R16UI,       SWIZ_XY01, 16, 0),
+        FORMAT(R16G16_SINT,       RG16I,        RG16I,       SWIZ_XY01, 16, 0),
+        FORMAT(R16G16_UINT,       RG16UI,       RG16UI,      SWIZ_XY01, 16, 0),
         FORMAT(R16G16B16A16_SINT, RGBA16I,      RGBA16I,     SWIZ_XYZW, 16, 0),
         FORMAT(R16G16B16A16_UINT, RGBA16UI,     RGBA16UI,    SWIZ_XYZW, 16, 0),