projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vc4: Fall back to renderonly if the vc4 driver doesn't have v3d.
[mesa.git]
/
src
/
gallium
/
drivers
/
vc4
/
vc4_formats.c
diff --git
a/src/gallium/drivers/vc4/vc4_formats.c
b/src/gallium/drivers/vc4/vc4_formats.c
index ffce61237de47e296de65a7ea35fa99a209cb453..6d4a6249fbfa146c2c92a4c9cb3b590cee75ffcf 100644
(file)
--- a/
src/gallium/drivers/vc4/vc4_formats.c
+++ b/
src/gallium/drivers/vc4/vc4_formats.c
@@
-61,10
+61,10
@@
struct vc4_format {
};
#define SWIZ(x,y,z,w) { \
};
#define SWIZ(x,y,z,w) { \
-
UTIL_FORMAT
_SWIZZLE_##x, \
-
UTIL_FORMAT
_SWIZZLE_##y, \
-
UTIL_FORMAT
_SWIZZLE_##z, \
-
UTIL_FORMAT
_SWIZZLE_##w \
+
PIPE
_SWIZZLE_##x, \
+
PIPE
_SWIZZLE_##y, \
+
PIPE
_SWIZZLE_##z, \
+
PIPE
_SWIZZLE_##w \
}
#define FORMAT(pipe, rt, tex, swiz) \
}
#define FORMAT(pipe, rt, tex, swiz) \
@@
-83,6
+83,8
@@
static const struct vc4_format vc4_format_table[] = {
FORMAT(B5G6R5_UNORM, RGB565, RGB565, SWIZ(X, Y, Z, 1)),
FORMAT(B5G6R5_UNORM, RGB565, RGB565, SWIZ(X, Y, Z, 1)),
+ FORMAT(ETC1_RGB8, NO, ETC1, SWIZ(X, Y, Z, 1)),
+
/* Depth sampling will be handled by doing nearest filtering and not
* unpacking the RGBA value.
*/
/* Depth sampling will be handled by doing nearest filtering and not
* unpacking the RGBA value.
*/
@@
-92,9
+94,8
@@
static const struct vc4_format vc4_format_table[] = {
FORMAT(B4G4R4A4_UNORM, NO, RGBA4444, SWIZ(Y, Z, W, X)),
FORMAT(B4G4R4X4_UNORM, NO, RGBA4444, SWIZ(Y, Z, W, 1)),
FORMAT(B4G4R4A4_UNORM, NO, RGBA4444, SWIZ(Y, Z, W, X)),
FORMAT(B4G4R4X4_UNORM, NO, RGBA4444, SWIZ(Y, Z, W, 1)),
- /* It looks like 5551 in the hardware is the other way around from
- * gallium.
- */
+ FORMAT(A1B5G5R5_UNORM, NO, RGBA5551, SWIZ(X, Y, Z, W)),
+ FORMAT(X1B5G5R5_UNORM, NO, RGBA5551, SWIZ(X, Y, Z, 1)),
FORMAT(A8_UNORM, NO, ALPHA, SWIZ(0, 0, 0, W)),
FORMAT(L8_UNORM, NO, ALPHA, SWIZ(W, W, W, 1)),
FORMAT(A8_UNORM, NO, ALPHA, SWIZ(0, 0, 0, W)),
FORMAT(L8_UNORM, NO, ALPHA, SWIZ(W, W, W, 1)),