commit cbc9667025a963e5c39810339b8ab9ab98671295
author Robert Phillips <robertphillips@google.com> Tue Apr 28 15:03:34 2020 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Apr 30 18:31:37 2020 +0000
tree 9f6597856c2073f21db580b09c3cd3b82b223007
parent 84aa92e42833f2f5bdd590825b5239dd301d1069

Add some missed BGRA_1010102 testing tidbits

A follow up to:
https://skia-review.googlesource.com/c/skia/+/285356 (Add BGR_10A2 support to Ganesh)

Change-Id: If19e234bf80d4affd515d6168f1faeec13f4fcf8
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/285856
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>

src/gpu/gl/GrGLCaps.cpp

diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/gl/GrGLCaps.cpp
index 7fd197c..588e852 100644
--- a/src/gpu/gl/GrGLCaps.cpp
+++ b/src/gpu/gl/GrGLCaps.cpp
@@ -4462,6 +4462,8 @@
     if (GR_IS_GR_GL(fStandard)) {
         combos.push_back({ GrColorType::kBGRA_8888,
                            GrBackendFormat::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_2D) });
+        combos.push_back({ GrColorType::kBGRA_1010102,
+                           GrBackendFormat::MakeGL(GR_GL_RGB10_A2, GR_GL_TEXTURE_2D) });
     } else {
         SkASSERT(GR_IS_GR_GL_ES(fStandard) || GR_IS_GR_WEBGL(fStandard));
 

tests/ReadWriteAlphaTest.cpp

diff --git a/tests/ReadWriteAlphaTest.cpp b/tests/ReadWriteAlphaTest.cpp
index 3c7fac3..df18ab9 100644
--- a/tests/ReadWriteAlphaTest.cpp
+++ b/tests/ReadWriteAlphaTest.cpp
@@ -31,8 +31,9 @@
         for (int x = 0; x < w; ++x) {
             uint8_t a = actual[y * actualRowBytes + x];
             uint8_t e = expected[y * w + x];
-            if (GrColorType::kRGBA_1010102 == colorType) {
-                // This config only preserves two bits of alpha
+            if (GrColorType::kRGBA_1010102 == colorType ||
+                GrColorType::kBGRA_1010102 == colorType) {
+                // These configs only preserves two bits of alpha
                 a >>= 6;
                 e >>= 6;
             }