summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Stach <[email protected]>2017-07-14 17:21:42 +0200
committerLucas Stach <[email protected]>2017-07-14 17:21:50 +0200
commit7e426ef6ec59b739fcf97efa632cf8f21f24b054 (patch)
tree31a1aa47ed4c3688c20a67081fae725bf0c3d523
parent1d05cec205100f13b2fda18fdd27c6f0eebf6422 (diff)
Revert "etnaviv: add support for snorm textures"
This reverts commit d8b2ccdb880f, which causes priglit regressions on GPUs with SNORM support. We'll have another try at enabling this feature after the 17.2 branchpoint. Signed-off-by: Lucas Stach <[email protected]>
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_format.c7
-rw-r--r--src/gallium/drivers/etnaviv/etnaviv_screen.c3
2 files changed, 3 insertions, 7 deletions
diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c b/src/gallium/drivers/etnaviv/etnaviv_format.c
index c7c032a2e39..354dc2026ca 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_format.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_format.c
@@ -91,7 +91,7 @@ struct etna_format {
static struct etna_format formats[PIPE_FORMAT_COUNT] = {
/* 8-bit */
V_(R8_UNORM, UNSIGNED_BYTE, NONE),
- VT(R8_SNORM, BYTE, EXT_R8_SNORM | EXT_FORMAT, SWIZ(X, 0, 0, 1), NONE),
+ V_(R8_SNORM, BYTE, NONE),
V_(R8_UINT, UNSIGNED_BYTE, NONE),
V_(R8_SINT, BYTE, NONE),
V_(R8_USCALED, UNSIGNED_BYTE, NONE),
@@ -121,7 +121,7 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
_T(B5G5R5X1_UNORM, X1R5G5B5, SWIZ(X, Y, Z, W), X1R5G5B5),
VT(R8G8_UNORM, UNSIGNED_BYTE, EXT_G8R8 | EXT_FORMAT, SWIZ(X, Y, 0, 1), NONE),
- VT(R8G8_SNORM, BYTE, EXT_G8R8_SNORM | EXT_FORMAT, SWIZ(X, Y, 0, 1), NONE),
+ V_(R8G8_SNORM, BYTE, NONE),
V_(R8G8_UINT, UNSIGNED_BYTE, NONE),
V_(R8G8_SINT, BYTE, NONE),
V_(R8G8_USCALED, UNSIGNED_BYTE, NONE),
@@ -156,9 +156,8 @@ static struct etna_format formats[PIPE_FORMAT_COUNT] = {
V_(A8B8G8R8_UNORM, UNSIGNED_BYTE, NONE),
V_(R8G8B8A8_UNORM, UNSIGNED_BYTE, A8B8G8R8),
- VT(R8G8B8A8_SNORM, BYTE, EXT_A8B8G8R8_SNORM | EXT_FORMAT, SWIZ(X, Y, Z, 1), NONE),
+ V_(R8G8B8A8_SNORM, BYTE, A8B8G8R8),
_T(R8G8B8X8_UNORM, X8B8G8R8, SWIZ(X, Y, Z, W), X8B8G8R8),
- _T(R8G8B8X8_SNORM, EXT_X8B8G8R8_SNORM | EXT_FORMAT, SWIZ(X, Y, Z, W), NONE),
V_(R8G8B8A8_UINT, UNSIGNED_BYTE, A8B8G8R8),
V_(R8G8B8A8_SINT, BYTE, A8B8G8R8),
V_(R8G8B8A8_USCALED, UNSIGNED_BYTE, A8B8G8R8),
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index 61bae57f74a..3a8066c0ffb 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -473,9 +473,6 @@ gpu_supports_texure_format(struct etna_screen *screen, uint32_t fmt,
if (fmt & EXT_FORMAT)
supported = VIV_FEATURE(screen, chipMinorFeatures1, HALTI0);
- if (util_format_is_snorm(format))
- supported = VIV_FEATURE(screen, chipMinorFeatures2, HALTI1);
-
if (!supported)
return false;