commit bc467ef5ef35f013ba76faadb15220ef5b26ea9f
author Aaron Clarke <aaclarke@google.com> Mon Jun 10 16:30:44 2024 -0700
committer SkCQ <skcq-be@skia-corp.google.com.iam.gserviceaccount.com> Tue Jun 11 13:39:06 2024 +0000
tree 24d5a052c08f82d2bfc884af0cf4d51bce4a54d7
parent 5d9221d28f9cbbe6db0b745b36d4e5efc09e168e

Fixed BGRA10XR to have padding be 6 *least* significant bits.

This is verified in the more robust integration test: https://github.com/flutter/engine/pull/53320

Bug: skia:https://github.com/flutter/flutter/issues/149946
Change-Id: I57fb34e3cc02db63c3125faee7e1846d9b6f2583
Reviewed-on: https://skia-review.googlesource.com/c/skcms/+/864516
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/Transform_inl.h

diff --git a/src/Transform_inl.h b/src/Transform_inl.h
index b9c27ac..c2c10c7 100644
--- a/src/Transform_inl.h
+++ b/src/Transform_inl.h
@@ -906,11 +906,11 @@
     static constexpr float min = -0.752941f;
     static constexpr float max = 1.25098f;
     static constexpr float range = max - min;
-    U64 rgba = load<U64>(src + 8*i);
-    r = cast<F>((rgba >>  0) & 0x3ff) * (1/1023.0f) * range + min;
-    g = cast<F>((rgba >> 16) & 0x3ff) * (1/1023.0f) * range + min;
-    b = cast<F>((rgba >> 32) & 0x3ff) * (1/1023.0f) * range + min;
-    a = cast<F>((rgba >> 48) & 0x3ff) * (1/1023.0f) * range + min;
+    U64 rgba = load<U64>(src + 8 * i);
+    r = cast<F>((rgba >>  (0+6)) & 0x3ff) * (1/1023.0f) * range + min;
+    g = cast<F>((rgba >> (16+6)) & 0x3ff) * (1/1023.0f) * range + min;
+    b = cast<F>((rgba >> (32+6)) & 0x3ff) * (1/1023.0f) * range + min;
+    a = cast<F>((rgba >> (48+6)) & 0x3ff) * (1/1023.0f) * range + min;
 }
 
 STAGE(load_161616LE, NoCtx) {

tests.c

diff --git a/tests.c b/tests.c
index 2c463a4..90bd9dd 100644
--- a/tests.c
+++ b/tests.c
@@ -422,8 +422,8 @@
 
 static void test_FormatConversions_10101010_xr(void) {
     uint64_t src[2];
-    src[0] = 384LL | (894LL << 16) | (384LL << 32) | (639LL << 48);
-    src[1] = 384LL | (639LL << 16) | (384LL << 32) | (894LL << 48);
+    src[0] = (384ULL << (0 + 6)) | (894ULL << (16 + 6)) | (384ULL << (32 + 6)) | (639ULL << (48 + 6));
+    src[1] = (384ULL << (0 + 6)) | (639ULL << (16 + 6)) | (384ULL << (32 + 6)) | (894ULL << (48 + 6));
     uint32_t dst[2] = {0xffffffff, 0xffffffff};
     expect(skcms_Transform(&src, skcms_PixelFormat_BGRA_10101010_XR,
                            skcms_AlphaFormat_Unpremul, NULL, &dst,