freedreno/a3xx: add missing formats to enable ARB_vertex_type_2_10_10_10_rev

The previously RE'd formats were from an ES driver implementing
OES_vertex_type_10_10_10_2 and thus backwards. A future change could add
the 2_10_10_10 support.

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/docs/relnotes/11.1.0.html b/docs/relnotes/11.1.0.html
index 6654311a3ac21c53d087e51af948c03859be6a96..0075a00ad88ff0876fd0151a80b1dd5a58767dc6 100644 (file)
--- a/docs/relnotes/11.1.0.html
+++ b/docs/relnotes/11.1.0.html
@@ -57,6 +57,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_EXT_buffer_storage implemented for when ES 3.1 support is gained</li>
 <li>GL_EXT_draw_elements_base_vertex on all drivers</li>
 <li>GL_OES_draw_elements_base_vertex on all drivers</li>

diff --git a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
index b5e1ddadde0d3cb93bd5da84ac21509006b27b56..9f382baba977dc9e98a88812e0eb824c1b0ab6e3 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
+++ b/src/gallium/drivers/freedreno/a3xx/a3xx.xml.h
@@ -111,10 +111,10 @@ enum a3xx_vtx_fmt {
        VFMT_8_8_SNORM = 53,
        VFMT_8_8_8_SNORM = 54,
        VFMT_8_8_8_8_SNORM = 55,
-       VFMT_10_10_10_2_UINT = 60,
-       VFMT_10_10_10_2_UNORM = 61,
-       VFMT_10_10_10_2_SINT = 62,
-       VFMT_10_10_10_2_SNORM = 63,
+       VFMT_10_10_10_2_UINT = 56,
+       VFMT_10_10_10_2_UNORM = 57,
+       VFMT_10_10_10_2_SINT = 58,
+       VFMT_10_10_10_2_SNORM = 59,
 };
 
 enum a3xx_tex_fmt {

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
index 857d156c869c5576d6462e1cc8826fafdc1af88d..9b313b598a88a803a8df3ed44828c74facabda70 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
@@ -188,9 +188,13 @@ static struct fd3_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),