When using multi layer formats pe and rs formats will differ.
Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com>
---
src/gallium/drivers/etnaviv/etnaviv_format.c | 357 ++++++++++---------
src/gallium/drivers/etnaviv/etnaviv_format.h | 3 +
src/gallium/drivers/etnaviv/etnaviv_screen.c | 3 +-
src/gallium/drivers/etnaviv/etnaviv_state.c | 2 +-
4 files changed, 190 insertions(+), 175 deletions(-)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.c
b/src/gallium/drivers/etnaviv/etnaviv_format.c
index 29e81c4a8b..c24f851ab1 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_format.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_format.c
@@ -41,6 +41,7 @@ struct etna_format {
unsigned tex;
unsigned rs;
unsigned ts;
+ unsigned pe;
boolean present;
const unsigned char tex_swiz[4];
};
@@ -64,226 +65,229 @@ struct etna_format {
}
/* vertex + texture */
-#define VT(pipe, vtxfmt, texfmt, texswiz, rsfmt, tsfmt) \
+#define VT(pipe, vtxfmt, texfmt, texswiz, rsfmt, tsfmt, pefmt) \
[PIPE_FORMAT_##pipe] = { \
.vtx = FE_DATA_TYPE_##vtxfmt, \
.tex = TEXTURE_FORMAT_##texfmt, \
.rs = RS_FORMAT_##rsfmt, \
.ts = TS_SAMPLER_FORMAT_##tsfmt, \
+ .pe = RS_FORMAT_##pefmt, \
.present = 1, \
.tex_swiz = texswiz, \
}
/* texture-only */
-#define _T(pipe, fmt, swiz, rsfmt, tsfmt) \
+#define _T(pipe, fmt, swiz, rsfmt, tsfmt, pefmt) \
[PIPE_FORMAT_##pipe] = { \
.vtx = ETNA_NO_MATCH, \
.tex = TEXTURE_FORMAT_##fmt, \
.rs = RS_FORMAT_##rsfmt, \
.ts = TS_SAMPLER_FORMAT_##tsfmt, \
+ .pe = RS_FORMAT_##pefmt, \
.present = 1, \
.tex_swiz = swiz, \
}
/* vertex-only */
-#define V_(pipe, fmt, rsfmt) \
+#define V_(pipe, fmt, rsfmt, pefmt) \
[PIPE_FORMAT_##pipe] = { \
.vtx = FE_DATA_TYPE_##fmt, \
.tex = ETNA_NO_MATCH, \
.rs = RS_FORMAT_##rsfmt, \
+ .pe = RS_FORMAT_##pefmt, \
.present = 1, \
}
static struct etna_format formats[PIPE_FORMAT_COUNT] = {
/* 8-bit */
- VT(R8_UNORM, UNSIGNED_BYTE, L8, SWIZ(X, 0, 0, 1), NONE, NONE),
- V_(R8_SNORM, BYTE, NONE),
- V_(R8_UINT, UNSIGNED_BYTE, NONE),
- V_(R8_SINT, BYTE, NONE),
- V_(R8_USCALED, UNSIGNED_BYTE, NONE),
- V_(R8_SSCALED, BYTE, NONE),
+ VT(R8_UNORM, UNSIGNED_BYTE, L8, SWIZ(X, 0, 0, 1), NONE, NONE, NONE),
+ V_(R8_SNORM, BYTE, NONE, NONE),
+ V_(R8_UINT, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8_SINT, BYTE, NONE, NONE),
+ V_(R8_USCALED, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8_SSCALED, BYTE, NONE, NONE),
- _T(A8_UNORM, A8, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(L8_UNORM, L8, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(I8_UNORM, I8, SWIZ(X, Y, Z, W), NONE, NONE),
+ _T(A8_UNORM, A8, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(L8_UNORM, L8, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(I8_UNORM, I8, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
/* 16-bit */
- V_(R16_UNORM, UNSIGNED_SHORT, NONE),
- V_(R16_SNORM, SHORT, NONE),
- V_(R16_UINT, UNSIGNED_SHORT, NONE),
- V_(R16_SINT, SHORT, NONE),
- V_(R16_USCALED, UNSIGNED_SHORT, NONE),
- V_(R16_SSCALED, SHORT, NONE),
- V_(R16_FLOAT, HALF_FLOAT, NONE),
-
- _T(B4G4R4A4_UNORM, A4R4G4B4, SWIZ(X, Y, Z, W), A4R4G4B4, A4R4G4B4),
- _T(B4G4R4X4_UNORM, X4R4G4B4, SWIZ(X, Y, Z, W), X4R4G4B4, A4R4G4B4),
-
- _T(L8A8_UNORM, A8L8, SWIZ(X, Y, Z, W), NONE, NONE),
-
- _T(Z16_UNORM, D16, SWIZ(X, Y, Z, W), A4R4G4B4, D16),
- _T(B5G6R5_UNORM, R5G6B5, SWIZ(X, Y, Z, W), R5G6B5, R5G6B5),
- _T(B5G5R5A1_UNORM, A1R5G5B5, SWIZ(X, Y, Z, W), A1R5G5B5, A1R5G5B5),
- _T(B5G5R5X1_UNORM, X1R5G5B5, SWIZ(X, Y, Z, W), X1R5G5B5, A1R5G5B5),
-
- VT(R8G8_UNORM, UNSIGNED_BYTE, EXT_G8R8 | EXT_FORMAT, SWIZ(X, Y, 0, 1),
NONE, NONE),
- V_(R8G8_SNORM, BYTE, NONE),
- V_(R8G8_UINT, UNSIGNED_BYTE, NONE),
- V_(R8G8_SINT, BYTE, NONE),
- V_(R8G8_USCALED, UNSIGNED_BYTE, NONE),
- V_(R8G8_SSCALED, BYTE, NONE),
+ V_(R16_UNORM, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16_SNORM, SHORT, NONE, NONE),
+ V_(R16_UINT, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16_SINT, SHORT, NONE, NONE),
+ V_(R16_USCALED, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16_SSCALED, SHORT, NONE, NONE),
+ V_(R16_FLOAT, HALF_FLOAT, NONE, NONE),
+
+ _T(B4G4R4A4_UNORM, A4R4G4B4, SWIZ(X, Y, Z, W), A4R4G4B4, A4R4G4B4,
A4R4G4B4),
+ _T(B4G4R4X4_UNORM, X4R4G4B4, SWIZ(X, Y, Z, W), X4R4G4B4, A4R4G4B4,
X4R4G4B4),
+
+ _T(L8A8_UNORM, A8L8, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+
+ _T(Z16_UNORM, D16, SWIZ(X, Y, Z, W), A4R4G4B4, D16, A4R4G4B4),
+ _T(B5G6R5_UNORM, R5G6B5, SWIZ(X, Y, Z, W), R5G6B5, R5G6B5, R5G6B5),
+ _T(B5G5R5A1_UNORM, A1R5G5B5, SWIZ(X, Y, Z, W), A1R5G5B5, A1R5G5B5,
A1R5G5B5),
+ _T(B5G5R5X1_UNORM, X1R5G5B5, SWIZ(X, Y, Z, W), X1R5G5B5, A1R5G5B5,
X1R5G5B5),
+
+ VT(R8G8_UNORM, UNSIGNED_BYTE, EXT_G8R8 | EXT_FORMAT, SWIZ(X, Y, 0, 1),
NONE, NONE, NONE),
+ V_(R8G8_SNORM, BYTE, NONE, NONE),
+ V_(R8G8_UINT, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8G8_SINT, BYTE, NONE, NONE),
+ V_(R8G8_USCALED, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8G8_SSCALED, BYTE, NONE, NONE),
/* 24-bit */
- V_(R8G8B8_UNORM, UNSIGNED_BYTE, NONE),
- V_(R8G8B8_SNORM, BYTE, NONE),
- V_(R8G8B8_UINT, UNSIGNED_BYTE, NONE),
- V_(R8G8B8_SINT, BYTE, NONE),
- V_(R8G8B8_USCALED, UNSIGNED_BYTE, NONE),
- V_(R8G8B8_SSCALED, BYTE, NONE),
+ V_(R8G8B8_UNORM, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8G8B8_SNORM, BYTE, NONE, NONE),
+ V_(R8G8B8_UINT, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8G8B8_SINT, BYTE, NONE, NONE),
+ V_(R8G8B8_USCALED, UNSIGNED_BYTE, NONE, NONE),
+ V_(R8G8B8_SSCALED, BYTE, NONE, NONE),
/* 32-bit */
- V_(R32_UNORM, UNSIGNED_INT, NONE),
- V_(R32_SNORM, INT, NONE),
- V_(R32_SINT, INT, NONE),
- V_(R32_UINT, UNSIGNED_INT, NONE),
- V_(R32_USCALED, UNSIGNED_INT, NONE),
- V_(R32_SSCALED, INT, NONE),
- V_(R32_FLOAT, FLOAT, NONE),
- V_(R32_FIXED, FIXED, NONE),
-
- V_(R16G16_UNORM, UNSIGNED_SHORT, NONE),
- V_(R16G16_SNORM, SHORT, NONE),
- V_(R16G16_UINT, UNSIGNED_SHORT, NONE),
- V_(R16G16_SINT, SHORT, NONE),
- V_(R16G16_USCALED, UNSIGNED_SHORT, NONE),
- V_(R16G16_SSCALED, SHORT, NONE),
- V_(R16G16_FLOAT, HALF_FLOAT, NONE),
-
- V_(A8B8G8R8_UNORM, UNSIGNED_BYTE, NONE),
-
- VT(R8G8B8A8_UNORM, UNSIGNED_BYTE, A8B8G8R8, SWIZ(X, Y, Z, W), A8B8G8R8,
A8R8G8B8),
- V_(R8G8B8A8_SNORM, BYTE, A8B8G8R8),
- _T(R8G8B8X8_UNORM, X8B8G8R8, SWIZ(X, Y, Z, W), X8B8G8R8, X8R8G8B8),
- V_(R8G8B8A8_UINT, UNSIGNED_BYTE, A8B8G8R8),
- V_(R8G8B8A8_SINT, BYTE, A8B8G8R8),
- V_(R8G8B8A8_USCALED, UNSIGNED_BYTE, A8B8G8R8),
- V_(R8G8B8A8_SSCALED, BYTE, A8B8G8R8),
-
- _T(B8G8R8A8_UNORM, A8R8G8B8, SWIZ(X, Y, Z, W), A8R8G8B8, A8R8G8B8),
- _T(B8G8R8X8_UNORM, X8R8G8B8, SWIZ(X, Y, Z, W), X8R8G8B8, X8R8G8B8),
- _T(B8G8R8A8_SRGB, A8R8G8B8, SWIZ(X, Y, Z, W), A8R8G8B8, A8R8G8B8),
- _T(B8G8R8X8_SRGB, X8R8G8B8, SWIZ(X, Y, Z, W), X8R8G8B8, X8R8G8B8),
-
- V_(R10G10B10A2_UNORM, UNSIGNED_INT_10_10_10_2, NONE),
- V_(R10G10B10A2_SNORM, INT_10_10_10_2, NONE),
- V_(R10G10B10A2_USCALED, UNSIGNED_INT_10_10_10_2, NONE),
- V_(R10G10B10A2_SSCALED, INT_10_10_10_2, NONE),
-
- _T(X8Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24X8),
- _T(S8_UINT_Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24X8),
+ V_(R32_UNORM, UNSIGNED_INT, NONE, NONE),
+ V_(R32_SNORM, INT, NONE, NONE),
+ V_(R32_SINT, INT, NONE, NONE),
+ V_(R32_UINT, UNSIGNED_INT, NONE, NONE),
+ V_(R32_USCALED, UNSIGNED_INT, NONE, NONE),
+ V_(R32_SSCALED, INT, NONE, NONE),
+ V_(R32_FLOAT, FLOAT, NONE, NONE),
+ V_(R32_FIXED, FIXED, NONE, NONE),
+
+ V_(R16G16_UNORM, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16_SNORM, SHORT, NONE, NONE),
+ V_(R16G16_UINT, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16_SINT, SHORT, NONE, NONE),
+ V_(R16G16_USCALED, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16_SSCALED, SHORT, NONE, NONE),
+ V_(R16G16_FLOAT, HALF_FLOAT, NONE, NONE),
+
+ V_(A8B8G8R8_UNORM, UNSIGNED_BYTE, NONE, NONE),
+
+ VT(R8G8B8A8_UNORM, UNSIGNED_BYTE, A8B8G8R8, SWIZ(X, Y, Z, W), A8B8G8R8,
A8R8G8B8, NONE),
+ V_(R8G8B8A8_SNORM, BYTE, A8B8G8R8, NONE),
+ _T(R8G8B8X8_UNORM, X8B8G8R8, SWIZ(X, Y, Z, W), X8B8G8R8, X8R8G8B8,
NONE),
+ V_(R8G8B8A8_UINT, UNSIGNED_BYTE, A8B8G8R8, NONE),
+ V_(R8G8B8A8_SINT, BYTE, A8B8G8R8, NONE),
+ V_(R8G8B8A8_USCALED, UNSIGNED_BYTE, A8B8G8R8, NONE),
+ V_(R8G8B8A8_SSCALED, BYTE, A8B8G8R8, NONE),
+
+ _T(B8G8R8A8_UNORM, A8R8G8B8, SWIZ(X, Y, Z, W), A8R8G8B8, A8R8G8B8,
A8R8G8B8),
+ _T(B8G8R8X8_UNORM, X8R8G8B8, SWIZ(X, Y, Z, W), X8R8G8B8, X8R8G8B8,
X8R8G8B8),
+ _T(B8G8R8A8_SRGB, A8R8G8B8, SWIZ(X, Y, Z, W), A8R8G8B8, A8R8G8B8,
A8R8G8B8),
+ _T(B8G8R8X8_SRGB, X8R8G8B8, SWIZ(X, Y, Z, W), X8R8G8B8, X8R8G8B8,
X8R8G8B8),
+
+ V_(R10G10B10A2_UNORM, UNSIGNED_INT_10_10_10_2, NONE, NONE),
+ V_(R10G10B10A2_SNORM, INT_10_10_10_2, NONE, NONE),
+ V_(R10G10B10A2_USCALED, UNSIGNED_INT_10_10_10_2, NONE, NONE),
+ V_(R10G10B10A2_SSCALED, INT_10_10_10_2, NONE, NONE),
+
+ _T(X8Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24X8, A8R8G8B8),
+ _T(S8_UINT_Z24_UNORM, D24X8, SWIZ(X, Y, Z, W), A8R8G8B8, D24X8, A8R8G8B8),
/* 48-bit */
- V_(R16G16B16_UNORM, UNSIGNED_SHORT, NONE),
- V_(R16G16B16_SNORM, SHORT, NONE),
- V_(R16G16B16_UINT, UNSIGNED_SHORT, NONE),
- V_(R16G16B16_SINT, SHORT, NONE),
- V_(R16G16B16_USCALED, UNSIGNED_SHORT, NONE),
- V_(R16G16B16_SSCALED, SHORT, NONE),
- V_(R16G16B16_FLOAT, HALF_FLOAT, NONE),
+ V_(R16G16B16_UNORM, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16B16_SNORM, SHORT, NONE, NONE),
+ V_(R16G16B16_UINT, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16B16_SINT, SHORT, NONE, NONE),
+ V_(R16G16B16_USCALED, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16B16_SSCALED, SHORT, NONE, NONE),
+ V_(R16G16B16_FLOAT, HALF_FLOAT, NONE, NONE),
/* 64-bit */
- V_(R16G16B16A16_UNORM, UNSIGNED_SHORT, NONE),
- V_(R16G16B16A16_SNORM, SHORT, NONE),
- V_(R16G16B16A16_UINT, UNSIGNED_SHORT, NONE),
- V_(R16G16B16A16_SINT, SHORT, NONE),
- V_(R16G16B16A16_USCALED, UNSIGNED_SHORT, NONE),
- V_(R16G16B16A16_SSCALED, SHORT, NONE),
- V_(R16G16B16A16_FLOAT, HALF_FLOAT, NONE),
-
- V_(R32G32_UNORM, UNSIGNED_INT, NONE),
- V_(R32G32_SNORM, INT, NONE),
- V_(R32G32_UINT, UNSIGNED_INT, NONE),
- V_(R32G32_SINT, INT, NONE),
- V_(R32G32_USCALED, UNSIGNED_INT, NONE),
- V_(R32G32_SSCALED, INT, NONE),
- V_(R32G32_FLOAT, FLOAT, NONE),
- V_(R32G32_FIXED, FIXED, NONE),
+ V_(R16G16B16A16_UNORM, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16B16A16_SNORM, SHORT, NONE, NONE),
+ V_(R16G16B16A16_UINT, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16B16A16_SINT, SHORT, NONE, NONE),
+ V_(R16G16B16A16_USCALED, UNSIGNED_SHORT, NONE, NONE),
+ V_(R16G16B16A16_SSCALED, SHORT, NONE, NONE),
+ V_(R16G16B16A16_FLOAT, HALF_FLOAT, NONE, NONE),
+
+ V_(R32G32_UNORM, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32_SNORM, INT, NONE, NONE),
+ V_(R32G32_UINT, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32_SINT, INT, NONE, NONE),
+ V_(R32G32_USCALED, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32_SSCALED, INT, NONE, NONE),
+ V_(R32G32_FLOAT, FLOAT, NONE, NONE),
+ V_(R32G32_FIXED, FIXED, NONE, NONE),
/* 96-bit */
- V_(R32G32B32_UNORM, UNSIGNED_INT, NONE),
- V_(R32G32B32_SNORM, INT, NONE),
- V_(R32G32B32_UINT, UNSIGNED_INT, NONE),
- V_(R32G32B32_SINT, INT, NONE),
- V_(R32G32B32_USCALED, UNSIGNED_INT, NONE),
- V_(R32G32B32_SSCALED, INT, NONE),
- V_(R32G32B32_FLOAT, FLOAT, NONE),
- V_(R32G32B32_FIXED, FIXED, NONE),
+ V_(R32G32B32_UNORM, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32B32_SNORM, INT, NONE, NONE),
+ V_(R32G32B32_UINT, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32B32_SINT, INT, NONE, NONE),
+ V_(R32G32B32_USCALED, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32B32_SSCALED, INT, NONE, NONE),
+ V_(R32G32B32_FLOAT, FLOAT, NONE, NONE),
+ V_(R32G32B32_FIXED, FIXED, NONE, NONE),
/* 128-bit */
- V_(R32G32B32A32_UNORM, UNSIGNED_INT, NONE),
- V_(R32G32B32A32_SNORM, INT, NONE),
- V_(R32G32B32A32_UINT, UNSIGNED_INT, NONE),
- V_(R32G32B32A32_SINT, INT, NONE),
- V_(R32G32B32A32_USCALED, UNSIGNED_INT, NONE),
- V_(R32G32B32A32_SSCALED, INT, NONE),
- V_(R32G32B32A32_FLOAT, FLOAT, NONE),
- V_(R32G32B32A32_FIXED, FIXED, NONE),
+ V_(R32G32B32A32_UNORM, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32B32A32_SNORM, INT, NONE, NONE),
+ V_(R32G32B32A32_UINT, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32B32A32_SINT, INT, NONE, NONE),
+ V_(R32G32B32A32_USCALED, UNSIGNED_INT, NONE, NONE),
+ V_(R32G32B32A32_SSCALED, INT, NONE, NONE),
+ V_(R32G32B32A32_FLOAT, FLOAT, NONE, NONE),
+ V_(R32G32B32A32_FIXED, FIXED, NONE, NONE),
/* compressed */
- _T(ETC1_RGB8, ETC1, SWIZ(X, Y, Z, W), NONE, NONE),
-
- _T(DXT1_RGB, DXT1, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(DXT1_SRGBA,DXT1, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(DXT1_RGBA, DXT1, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(DXT3_SRGBA,DXT2_DXT3, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(DXT3_RGBA, DXT2_DXT3, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(DXT5_SRGBA,DXT4_DXT5, SWIZ(X, Y, Z, W), NONE, NONE),
- _T(DXT5_RGBA, DXT4_DXT5, SWIZ(X, Y, Z, W), NONE, NONE),
-
- _T(ETC2_RGB8, EXT_NONE | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE), /* Extd. format NONE doubles as ETC2_RGB8 */
- _T(ETC2_SRGB8, EXT_NONE | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_RGB8A1, EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_SRGB8A1, EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_RGBA8, EXT_RGBA8_ETC2_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_SRGBA8, EXT_RGBA8_ETC2_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_R11_UNORM, EXT_R11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_R11_SNORM, EXT_SIGNED_R11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_RG11_UNORM, EXT_RG11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ETC2_RG11_SNORM, EXT_SIGNED_RG11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
-
- _T(ASTC_4x4, ASTC_RGBA_4x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_5x4, ASTC_RGBA_5x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_5x5, ASTC_RGBA_5x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_6x5, ASTC_RGBA_6x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_6x6, ASTC_RGBA_6x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_8x5, ASTC_RGBA_8x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_8x6, ASTC_RGBA_8x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_8x8, ASTC_RGBA_8x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x5, ASTC_RGBA_10x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x6, ASTC_RGBA_10x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x8, ASTC_RGBA_10x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x10, ASTC_RGBA_10x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_12x10, ASTC_RGBA_12x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_12x12, ASTC_RGBA_12x12 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
-
- _T(ASTC_4x4_SRGB, ASTC_SRGB8_ALPHA8_4x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_5x4_SRGB, ASTC_SRGB8_ALPHA8_5x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_5x5_SRGB, ASTC_SRGB8_ALPHA8_5x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_6x5_SRGB, ASTC_SRGB8_ALPHA8_6x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_6x6_SRGB, ASTC_SRGB8_ALPHA8_6x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_8x5_SRGB, ASTC_SRGB8_ALPHA8_8x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_8x6_SRGB, ASTC_SRGB8_ALPHA8_8x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_8x8_SRGB, ASTC_SRGB8_ALPHA8_8x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x5_SRGB, ASTC_SRGB8_ALPHA8_10x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x6_SRGB, ASTC_SRGB8_ALPHA8_10x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x8_SRGB, ASTC_SRGB8_ALPHA8_10x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_10x10_SRGB, ASTC_SRGB8_ALPHA8_10x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_12x10_SRGB, ASTC_SRGB8_ALPHA8_12x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
- _T(ASTC_12x12_SRGB, ASTC_SRGB8_ALPHA8_12x12 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE),
+ _T(ETC1_RGB8, ETC1, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+
+ _T(DXT1_RGB, DXT1, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(DXT1_SRGBA,DXT1, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(DXT1_RGBA, DXT1, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(DXT3_SRGBA,DXT2_DXT3, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(DXT3_RGBA, DXT2_DXT3, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(DXT5_SRGBA,DXT4_DXT5, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+ _T(DXT5_RGBA, DXT4_DXT5, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
+
+ _T(ETC2_RGB8, EXT_NONE | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE), /* Extd. format NONE doubles as ETC2_RGB8 */
+ _T(ETC2_SRGB8, EXT_NONE | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_RGB8A1, EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_SRGB8A1, EXT_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_RGBA8, EXT_RGBA8_ETC2_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_SRGBA8, EXT_RGBA8_ETC2_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_R11_UNORM, EXT_R11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_R11_SNORM, EXT_SIGNED_R11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_RG11_UNORM, EXT_RG11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ETC2_RG11_SNORM, EXT_SIGNED_RG11_EAC | EXT_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+
+ _T(ASTC_4x4, ASTC_RGBA_4x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_5x4, ASTC_RGBA_5x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_5x5, ASTC_RGBA_5x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_6x5, ASTC_RGBA_6x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_6x6, ASTC_RGBA_6x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_8x5, ASTC_RGBA_8x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_8x6, ASTC_RGBA_8x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_8x8, ASTC_RGBA_8x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x5, ASTC_RGBA_10x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x6, ASTC_RGBA_10x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x8, ASTC_RGBA_10x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x10, ASTC_RGBA_10x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_12x10, ASTC_RGBA_12x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_12x12, ASTC_RGBA_12x12 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+
+ _T(ASTC_4x4_SRGB, ASTC_SRGB8_ALPHA8_4x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_5x4_SRGB, ASTC_SRGB8_ALPHA8_5x4 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_5x5_SRGB, ASTC_SRGB8_ALPHA8_5x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_6x5_SRGB, ASTC_SRGB8_ALPHA8_6x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_6x6_SRGB, ASTC_SRGB8_ALPHA8_6x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_8x5_SRGB, ASTC_SRGB8_ALPHA8_8x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_8x6_SRGB, ASTC_SRGB8_ALPHA8_8x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_8x8_SRGB, ASTC_SRGB8_ALPHA8_8x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x5_SRGB, ASTC_SRGB8_ALPHA8_10x5 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x6_SRGB, ASTC_SRGB8_ALPHA8_10x6 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x8_SRGB, ASTC_SRGB8_ALPHA8_10x8 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_10x10_SRGB, ASTC_SRGB8_ALPHA8_10x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_12x10_SRGB, ASTC_SRGB8_ALPHA8_12x10 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
+ _T(ASTC_12x12_SRGB, ASTC_SRGB8_ALPHA8_12x12 | ASTC_FORMAT, SWIZ(X,
Y, Z, W), NONE, NONE, NONE),
/* YUV */
- _T(YUYV, YUY2, SWIZ(X, Y, Z, W), YUY2, NONE),
- _T(UYVY, UYVY, SWIZ(X, Y, Z, W), NONE, NONE),
+ _T(YUYV, YUY2, SWIZ(X, Y, Z, W), YUY2, NONE, YUY2),
+ _T(UYVY, UYVY, SWIZ(X, Y, Z, W), NONE, NONE, NONE),
};
uint32_t
@@ -370,3 +374,12 @@ translate_ts_sampler_format(enum pipe_format fmt)
return formats[fmt].ts;
}
+
+uint32_t
+translate_pe_format(enum pipe_format fmt)
+{
+ if (!formats[fmt].present)
+ return ETNA_NO_MATCH;
+
+ return formats[fmt].pe;
+}
diff --git a/src/gallium/drivers/etnaviv/etnaviv_format.h
b/src/gallium/drivers/etnaviv/etnaviv_format.h
index 20c8e1bcaf..448f4c298f 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_format.h
+++ b/src/gallium/drivers/etnaviv/etnaviv_format.h
@@ -56,4 +56,7 @@ translate_vertex_format_type(enum pipe_format fmt);
uint32_t
translate_ts_sampler_format(enum pipe_format fmt);
+uint32_t
+translate_pe_format(enum pipe_format fmt);
+
#endif /* ETNAVIV_FORMAT_H_ */
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c
b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index b0f8b4bebe..e3a3a9c51c 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -534,8 +534,7 @@ etna_screen_is_format_supported(struct pipe_screen *pscreen,
return FALSE;
if (usage & PIPE_BIND_RENDER_TARGET) {
- /* if render target, must be RS-supported format */
- if (translate_rs_format(format) != ETNA_NO_MATCH) {
+ if (translate_pe_format(format) != ETNA_NO_MATCH) {
/* Validate MSAA; number of samples must be allowed, and render target
* must have MSAA'able format. */
if (sample_count > 1) {
diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c
b/src/gallium/drivers/etnaviv/etnaviv_state.c
index 87ba10b0dc..de1adb86ae 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_state.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_state.c
@@ -132,7 +132,7 @@ etna_set_framebuffer_state(struct pipe_context *pctx,
pipe_surface_reference(&cs->cbuf, &cbuf->base);
cs->PE_COLOR_FORMAT =
- VIVS_PE_COLOR_FORMAT_FORMAT(translate_rs_format(cbuf->base.format)) |
+ VIVS_PE_COLOR_FORMAT_FORMAT(translate_pe_format(cbuf->base.format)) |
VIVS_PE_COLOR_FORMAT_COMPONENTS__MASK |
VIVS_PE_COLOR_FORMAT_OVERWRITE |
COND(color_supertiled, VIVS_PE_COLOR_FORMAT_SUPER_TILED) |
--
2.17.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
