freedreno: Fix the type of single-component scaled vertex attrs.

This looks like clear copy-and-pasteos, and fixes:

dEQP-GLES2.functional.draw.random.40

(on A307 and A630, both tested in the new CI farm)

Reviewed-by: Rob Clark <robdclark@chromium.org>

diff --git a/src/gallium/drivers/freedreno/a3xx/fd3_format.c b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
index 0012b81e40754bc2a3ab67e4f03c24b18fe84c25..b72a3751758e8dbc58583c45ca88dabfe6d1e1fe 100644 (file)
--- a/src/gallium/drivers/freedreno/a3xx/fd3_format.c
+++ b/src/gallium/drivers/freedreno/a3xx/fd3_format.c
@@ -78,7 +78,7 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        VT(R8_UINT,    8_UINT,  R8_UINT,  WZYX),
        VT(R8_SINT,    8_SINT,  R8_SINT,  WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
-       V_(R8_SSCALED, 8_UINT,  NONE,     WZYX),
+       V_(R8_SSCALED, 8_SINT,  NONE,     WZYX),
 
        _T(A8_UNORM,   8_UNORM, A8_UNORM, WZYX),
        _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
@@ -99,7 +99,7 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        VT(R16_UINT,    16_UINT,  R16_UINT, WZYX),
        VT(R16_SINT,    16_SINT,  R16_SINT, WZYX),
        V_(R16_USCALED, 16_UINT,  NONE,     WZYX),
-       V_(R16_SSCALED, 16_UINT,  NONE,     WZYX),
+       V_(R16_SSCALED, 16_SINT,  NONE,     WZYX),
        VT(R16_FLOAT,   16_FLOAT, R16_FLOAT,WZYX),
 
        _T(A16_UINT,    16_UINT,  NONE,     WZYX),
@@ -137,7 +137,7 @@ static struct fd3_format formats[PIPE_FORMAT_COUNT] = {
        VT(R32_UINT,    32_UINT,  R32_UINT, WZYX),
        VT(R32_SINT,    32_SINT,  R32_SINT, WZYX),
        V_(R32_USCALED, 32_UINT,  NONE,     WZYX),
-       V_(R32_SSCALED, 32_UINT,  NONE,     WZYX),
+       V_(R32_SSCALED, 32_SINT,  NONE,     WZYX),
        VT(R32_FLOAT,   32_FLOAT, R32_FLOAT,WZYX),
        V_(R32_FIXED,   32_FIXED, NONE,     WZYX),
 

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_format.c b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
index 702f7d0a885abd53a0cea07ae18a2b11097a719b..0a36382b79d1fe28c1f0fd222debbdf37ca14f2f 100644 (file)
--- a/src/gallium/drivers/freedreno/a4xx/fd4_format.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_format.c
@@ -81,7 +81,7 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(R8_UINT,    8_UINT,  R8_UINT,  WZYX),
        VT(R8_SINT,    8_SINT,  R8_SINT,  WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
-       V_(R8_SSCALED, 8_UINT,  NONE,     WZYX),
+       V_(R8_SSCALED, 8_SINT,  NONE,     WZYX),
 
        _T(A8_UNORM,   8_UNORM, A8_UNORM, WZYX),
        _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
@@ -102,7 +102,7 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(R16_UINT,    16_UINT,  R16_UINT,  WZYX),
        VT(R16_SINT,    16_SINT,  R16_SINT,  WZYX),
        V_(R16_USCALED, 16_UINT,  NONE,      WZYX),
-       V_(R16_SSCALED, 16_UINT,  NONE,      WZYX),
+       V_(R16_SSCALED, 16_SINT,  NONE,      WZYX),
        VT(R16_FLOAT,   16_FLOAT, R16_FLOAT, WZYX),
 
        _T(A16_UNORM,   16_UNORM, NONE,      WZYX),
@@ -145,7 +145,7 @@ static struct fd4_format formats[PIPE_FORMAT_COUNT] = {
        VT(R32_UINT,    32_UINT,  R32_UINT, WZYX),
        VT(R32_SINT,    32_SINT,  R32_SINT, WZYX),
        V_(R32_USCALED, 32_UINT,  NONE,     WZYX),
-       V_(R32_SSCALED, 32_UINT,  NONE,     WZYX),
+       V_(R32_SSCALED, 32_SINT,  NONE,     WZYX),
        VT(R32_FLOAT,   32_FLOAT, R32_FLOAT,WZYX),
        V_(R32_FIXED,   32_FIXED, NONE,     WZYX),
 

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_format.c b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
index 59c13fad2964fbd1db478be0e5ba007d8b69ea73..f2091ad7cc06dffdd160ef09cbdb8d3f6be7feff 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_format.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_format.c
@@ -84,7 +84,7 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        VT(R8_UINT,    8_UINT,  R8_UINT,  WZYX),
        VT(R8_SINT,    8_SINT,  R8_SINT,  WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
-       V_(R8_SSCALED, 8_UINT,  NONE,     WZYX),
+       V_(R8_SSCALED, 8_SINT,  NONE,     WZYX),
 
        _T(A8_UNORM,   8_UNORM, A8_UNORM, WZYX),
        _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
@@ -105,7 +105,7 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        VT(R16_UINT,    16_UINT,  R16_UINT,  WZYX),
        VT(R16_SINT,    16_SINT,  R16_SINT,  WZYX),
        V_(R16_USCALED, 16_UINT,  NONE,      WZYX),
-       V_(R16_SSCALED, 16_UINT,  NONE,      WZYX),
+       V_(R16_SSCALED, 16_SINT,  NONE,      WZYX),
        VT(R16_FLOAT,   16_FLOAT, R16_FLOAT, WZYX),
        _T(Z16_UNORM,   16_UNORM, R16_UNORM, WZYX),
 
@@ -149,7 +149,7 @@ static struct fd5_format formats[PIPE_FORMAT_COUNT] = {
        VT(R32_UINT,    32_UINT,  R32_UINT, WZYX),
        VT(R32_SINT,    32_SINT,  R32_SINT, WZYX),
        V_(R32_USCALED, 32_UINT,  NONE,     WZYX),
-       V_(R32_SSCALED, 32_UINT,  NONE,     WZYX),
+       V_(R32_SSCALED, 32_SINT,  NONE,     WZYX),
        VT(R32_FLOAT,   32_FLOAT, R32_FLOAT,WZYX),
        V_(R32_FIXED,   32_FIXED, NONE,     WZYX),
 

diff --git a/src/gallium/drivers/freedreno/a6xx/fd6_format.c b/src/gallium/drivers/freedreno/a6xx/fd6_format.c
index 5748017633a13b156c39b9d7e05ff6ac3a337246..a3d857fb88c3f5532c585e3686d8e864103c63e2 100644 (file)
--- a/src/gallium/drivers/freedreno/a6xx/fd6_format.c
+++ b/src/gallium/drivers/freedreno/a6xx/fd6_format.c
@@ -86,7 +86,7 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
        VT(R8_UINT,    8_UINT,  R8_UINT,  WZYX),
        VT(R8_SINT,    8_SINT,  R8_SINT,  WZYX),
        V_(R8_USCALED, 8_UINT,  NONE,     WZYX),
-       V_(R8_SSCALED, 8_UINT,  NONE,     WZYX),
+       V_(R8_SSCALED, 8_SINT,  NONE,     WZYX),
 
        _T(A8_UNORM,   8_UNORM, A8_UNORM, WZYX),
        _T(L8_UNORM,   8_UNORM, R8_UNORM, WZYX),
@@ -107,7 +107,7 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
        VT(R16_UINT,    16_UINT,  R16_UINT,  WZYX),
        VT(R16_SINT,    16_SINT,  R16_SINT,  WZYX),
        V_(R16_USCALED, 16_UINT,  NONE,      WZYX),
-       V_(R16_SSCALED, 16_UINT,  NONE,      WZYX),
+       V_(R16_SSCALED, 16_SINT,  NONE,      WZYX),
        VT(R16_FLOAT,   16_FLOAT, R16_FLOAT, WZYX),
        _T(Z16_UNORM,   16_UNORM, R16_UNORM, WZYX),
 
@@ -151,7 +151,7 @@ static struct fd6_format formats[PIPE_FORMAT_COUNT] = {
        VT(R32_UINT,    32_UINT,  R32_UINT, WZYX),
        VT(R32_SINT,    32_SINT,  R32_SINT, WZYX),
        V_(R32_USCALED, 32_UINT,  NONE,     WZYX),
-       V_(R32_SSCALED, 32_UINT,  NONE,     WZYX),
+       V_(R32_SSCALED, 32_SINT,  NONE,     WZYX),
        VT(R32_FLOAT,   32_FLOAT, R32_FLOAT,WZYX),
        V_(R32_FIXED,   32_FIXED, NONE,     WZYX),