freedreno/a4xx: add missing formats to enable ARB_vertex_type_2_10_10_10_rev

Same as commit 84d087aea but for a4xx. The RE'd enums had the same issue
too.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/docs/relnotes/11.1.0.html b/docs/relnotes/11.1.0.html
index c1d30e8e9ecaded92d5a29338804db4318bdc35f..3c1150a6d2b1d717cdb6a1c492345cdaaf8c2f0f 100644 (file)
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -61,7 +61,7 @@ Note: some of the new features are only available with certain drivers.
 <li>GL_ARB_texture_barrier / GL_NV_texture_barrier on i965</li>
 <li>GL_ARB_texture_query_lod on softpipe</li>
 <li>GL_ARB_texture_view on radeonsi and r600 (for evergeen and newer)</li>
-<li>GL_ARB_vertex_type_2_10_10_10_rev on freedreno (a3xx)</li>
+<li>GL_ARB_vertex_type_2_10_10_10_rev on freedreno (a3xx, a4xx)</li>
 <li>GL_EXT_blend_func_extended on all drivers that support the ARB version</li>
 <li>GL_EXT_buffer_storage implemented for when ES 3.1 support is gained</li>
 <li>GL_EXT_draw_elements_base_vertex on all drivers</li>

diff --git a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
index 4436697aad4ba14d1cbe0d47dcf1258367f6ab2c..1192fc3c5fe6dd43ce65b2a81b6ac4ad9e64dbae 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
+++ b/src/gallium/drivers/freedreno/a4xx/a4xx.xml.h
@@ -152,10 +152,10 @@ enum a4xx_vtx_fmt {
        VFMT4_8_8_SNORM = 53,
        VFMT4_8_8_8_SNORM = 54,
        VFMT4_8_8_8_8_SNORM = 55,
-       VFMT4_10_10_10_2_UINT = 60,
-       VFMT4_10_10_10_2_UNORM = 61,
-       VFMT4_10_10_10_2_SINT = 62,
-       VFMT4_10_10_10_2_SNORM = 63,
+       VFMT4_10_10_10_2_UINT = 56,
+       VFMT4_10_10_10_2_UNORM = 57,
+       VFMT4_10_10_10_2_SINT = 58,
+       VFMT4_10_10_10_2_SNORM = 59,
 };
 
 enum a4xx_tex_fmt {

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_format.c b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
index a97e01aa6c220e63459c078aaab78db7d5a7dcb2..eeaa0a2b8473592a5deef5d5fdb409c2d1e9e841 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_format.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
@@ -200,9 +200,13 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(B10G10R10A2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
        _T(B10G10R10X2_UNORM,   10_10_10_2_UNORM, R10G10B10A2_UNORM, WXYZ),
        V_(R10G10B10A2_SNORM,   10_10_10_2_SNORM, NONE,              WZYX),
+       V_(B10G10R10A2_SNORM,   10_10_10_2_SNORM, NONE,              WXYZ),
        V_(R10G10B10A2_UINT,    10_10_10_2_UINT,  NONE,              WZYX),
+       V_(B10G10R10A2_UINT,    10_10_10_2_UINT,  NONE,              WXYZ),
        V_(R10G10B10A2_USCALED, 10_10_10_2_UINT,  NONE,              WZYX),
+       V_(B10G10R10A2_USCALED, 10_10_10_2_UINT,  NONE,              WXYZ),
        V_(R10G10B10A2_SSCALED, 10_10_10_2_SINT,  NONE,              WZYX),
+       V_(B10G10R10A2_SSCALED, 10_10_10_2_SINT,  NONE,              WXYZ),
 
        _T(R11G11B10_FLOAT, 11_11_10_FLOAT, R11G11B10_FLOAT, WZYX),
        _T(R9G9B9E5_FLOAT,  9_9_9_E5_FLOAT, NONE,            WZYX),