Module: Mesa
Branch: main
Commit: b1172540f345d7644553fa8c18ca0a13ef2259f5
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1172540f345d7644553fa8c18ca0a13ef2259f5

Author: Boris Brezillon <[email protected]>
Date:   Tue Sep  7 14:22:59 2021 +0200

panfrost: Drop the R and T flags on SCALED formats

Sampling from SCALED textures / rendering to SCALED FBOs is a bit tricky
(requires extra int <-> float conversions in a few places).
mesa/st only use SCALED formats as vertex formats, and those formats
are optional in Vulkan, so let's drop the RENDER/TEXTURE flags to keep
things simple.

Signed-off-by: Boris Brezillon <[email protected]>
Suggested-by: Alyssa Rosenzweig <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12508>

---

 src/panfrost/lib/pan_format.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index 9483d94a5b2..546de507a7f 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -247,12 +247,12 @@ const struct panfrost_format 
GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
 #endif
         FMT(R10G10B10A2_UINT,        RGB10_A2UI,      RGBA, L, VTR_),
         FMT(B10G10R10A2_UINT,        RGB10_A2UI,      BGRA, L, VTR_),
-        FMT(R10G10B10A2_USCALED,     RGB10_A2UI,      RGBA, L, VTR_),
-        FMT(B10G10R10A2_USCALED,     RGB10_A2UI,      BGRA, L, VTR_),
+        FMT(R10G10B10A2_USCALED,     RGB10_A2UI,      RGBA, L, V___),
+        FMT(B10G10R10A2_USCALED,     RGB10_A2UI,      BGRA, L, V___),
         FMT(R10G10B10A2_SINT,        RGB10_A2I,       RGBA, L, VTR_),
         FMT(B10G10R10A2_SINT,        RGB10_A2I,       BGRA, L, VTR_),
-        FMT(R10G10B10A2_SSCALED,     RGB10_A2I,       RGBA, L, VTR_),
-        FMT(B10G10R10A2_SSCALED,     RGB10_A2I,       BGRA, L, VTR_),
+        FMT(R10G10B10A2_SSCALED,     RGB10_A2I,       RGBA, L, V___),
+        FMT(B10G10R10A2_SSCALED,     RGB10_A2I,       BGRA, L, V___),
         FMT(R8_SSCALED,              R8I,             R001, L, V___),
         FMT(R8G8_SSCALED,            RG8I,            RG01, L, V___),
         FMT(R8G8B8_SSCALED,          RGB8I,           RGB1, L, V___),

Reply via email to