commit f2956459f707de596dcb2c79a7ee1fa62d599c0d
author Brian Osman <brianosman@google.com> Mon Jan 09 15:32:57 2017 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 10 16:20:03 2017 +0000
tree 4c558c871bd88d8d599162b63864ce7083f58f0e
parent e98234f231d66848e149db683c11b6388e10b233

Add Gray8 pixel config

This is still just linear (non-sRGB), but adding sRGB will
be the next step. I've verified that this is really making
R8 textures when uploading Gray8 bitmaps. Tests pass, and
the all_bitmap_configs GM still renders correctly (unlike
when we just mapped Gray8 to Alpha8).

This adds another pixel config, which could grow our cache
footprint, but the benefits of not using 4bpp for 1bpp data
should outweigh that?

BUG=skia:6110

Change-Id: I4fc4c2479fc25f1d278e174a9bb5b542a0cb184c
Reviewed-on: https://skia-review.googlesource.com/6817
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrContext.cpp

diff --git a/src/gpu/GrContext.cpp b/src/gpu/GrContext.cpp
index 30f596f..fd8aba0 100644
--- a/src/gpu/GrContext.cpp
+++ b/src/gpu/GrContext.cpp
@@ -680,6 +680,7 @@
     static const GrPixelConfig kFallback[] = {
         kUnknown_GrPixelConfig,        // kUnknown_GrPixelConfig
         kRGBA_8888_GrPixelConfig,      // kAlpha_8_GrPixelConfig
+        kUnknown_GrPixelConfig,        // kGray_8_GrPixelConfig
         kUnknown_GrPixelConfig,        // kIndex_8_GrPixelConfig
         kRGBA_8888_GrPixelConfig,      // kRGB_565_GrPixelConfig
         kRGBA_8888_GrPixelConfig,      // kRGBA_4444_GrPixelConfig
@@ -700,21 +701,22 @@
 
     GR_STATIC_ASSERT(0  == kUnknown_GrPixelConfig);
     GR_STATIC_ASSERT(1  == kAlpha_8_GrPixelConfig);
-    GR_STATIC_ASSERT(2  == kIndex_8_GrPixelConfig);
-    GR_STATIC_ASSERT(3  == kRGB_565_GrPixelConfig);
-    GR_STATIC_ASSERT(4  == kRGBA_4444_GrPixelConfig);
-    GR_STATIC_ASSERT(5  == kRGBA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(6  == kBGRA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(7  == kSRGBA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(8  == kSBGRA_8888_GrPixelConfig);
-    GR_STATIC_ASSERT(9  == kRGBA_8888_sint_GrPixelConfig);
-    GR_STATIC_ASSERT(10 == kETC1_GrPixelConfig);
-    GR_STATIC_ASSERT(11 == kLATC_GrPixelConfig);
-    GR_STATIC_ASSERT(12 == kR11_EAC_GrPixelConfig);
-    GR_STATIC_ASSERT(13 == kASTC_12x12_GrPixelConfig);
-    GR_STATIC_ASSERT(14 == kRGBA_float_GrPixelConfig);
-    GR_STATIC_ASSERT(15 == kAlpha_half_GrPixelConfig);
-    GR_STATIC_ASSERT(16 == kRGBA_half_GrPixelConfig);
+    GR_STATIC_ASSERT(2  == kGray_8_GrPixelConfig);
+    GR_STATIC_ASSERT(3  == kIndex_8_GrPixelConfig);
+    GR_STATIC_ASSERT(4  == kRGB_565_GrPixelConfig);
+    GR_STATIC_ASSERT(5  == kRGBA_4444_GrPixelConfig);
+    GR_STATIC_ASSERT(6  == kRGBA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(7  == kBGRA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(8  == kSRGBA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(9  == kSBGRA_8888_GrPixelConfig);
+    GR_STATIC_ASSERT(10 == kRGBA_8888_sint_GrPixelConfig);
+    GR_STATIC_ASSERT(11 == kETC1_GrPixelConfig);
+    GR_STATIC_ASSERT(12 == kLATC_GrPixelConfig);
+    GR_STATIC_ASSERT(13 == kR11_EAC_GrPixelConfig);
+    GR_STATIC_ASSERT(14 == kASTC_12x12_GrPixelConfig);
+    GR_STATIC_ASSERT(15 == kRGBA_float_GrPixelConfig);
+    GR_STATIC_ASSERT(16 == kAlpha_half_GrPixelConfig);
+    GR_STATIC_ASSERT(17 == kRGBA_half_GrPixelConfig);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kFallback) == kGrPixelConfigCnt);
 }