commit 41e4384ea0208631ab7847266c3369b17ed7fbf3
author bsalomon <bsalomon@google.com> Fri Jan 08 09:12:44 2016 -0800
committer Commit bot <commit-bot@chromium.org> Fri Jan 08 09:12:44 2016 -0800
tree 7f5781115d34a45ab035340648a514e0db571c00
parent 91b4dfbb2fe995db8404fe881a99d4d3d36fee71

Move config texturability/renderability to config table.

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1563443002

Committed: https://skia.googlesource.com/skia/+/32a3cd2f2860b15a842a6aa49e4e6a3bed04f949

Review URL: https://codereview.chromium.org/1563443002

src/gpu/GrCaps.cpp

diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp
index 7003cc5..101d5f4 100644
--- a/src/gpu/GrCaps.cpp
+++ b/src/gpu/GrCaps.cpp
@@ -106,9 +106,6 @@
     fMaxTextureSize = 1;
     fMaxSampleCount = 0;
 
-    memset(fConfigRenderSupport, 0, sizeof(fConfigRenderSupport));
-    memset(fConfigTextureSupport, 0, sizeof(fConfigTextureSupport));
-
     fSuppressPrints = options.fSuppressPrints;
     fImmediateFlush = options.fImmediateMode;
     fDrawPathMasksToCompressedTextureSupport = options.fDrawPathToCompressedTexture;
@@ -229,22 +226,24 @@
     GR_STATIC_ASSERT(14 == kRGBA_half_GrPixelConfig);
     GR_STATIC_ASSERT(SK_ARRAY_COUNT(kConfigNames) == kGrPixelConfigCnt);
 
-    SkASSERT(!fConfigRenderSupport[kUnknown_GrPixelConfig][0]);
-    SkASSERT(!fConfigRenderSupport[kUnknown_GrPixelConfig][1]);
+    SkASSERT(!this->isConfigRenderable(kUnknown_GrPixelConfig, false));
+    SkASSERT(!this->isConfigRenderable(kUnknown_GrPixelConfig, true));
 
     for (size_t i = 1; i < SK_ARRAY_COUNT(kConfigNames); ++i)  {
+        GrPixelConfig config = static_cast<GrPixelConfig>(i);
         r.appendf("%s is renderable: %s, with MSAA: %s\n",
                   kConfigNames[i],
-                  gNY[fConfigRenderSupport[i][0]],
-                  gNY[fConfigRenderSupport[i][1]]);
+                  gNY[this->isConfigRenderable(config, false)],
+                  gNY[this->isConfigRenderable(config, true)]);
     }
 
-    SkASSERT(!fConfigTextureSupport[kUnknown_GrPixelConfig]);
+    SkASSERT(!this->isConfigTexturable(kUnknown_GrPixelConfig));
 
     for (size_t i = 1; i < SK_ARRAY_COUNT(kConfigNames); ++i)  {
+        GrPixelConfig config = static_cast<GrPixelConfig>(i);
         r.appendf("%s is uploadable to a texture: %s\n",
                   kConfigNames[i],
-                  gNY[fConfigTextureSupport[i]]);
+                  gNY[this->isConfigTexturable(config)]);
     }
 
     return r;