Vulkan config in dm

tests/VkClearTests.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This is a GPU-backend specific test. It relies on static intializers to work
 
 #include "SkTypes.h"
@@ skipping 41 matching lines @@
     gpu->discard(NULL);
     SkAutoTMalloc<GrColor> buffer(25);
 
     GrSurfaceDesc surfDesc;
     surfDesc.fFlags = kRenderTarget_GrSurfaceFlag;
     surfDesc.fOrigin = kTopLeft_GrSurfaceOrigin;
     surfDesc.fWidth = 5;
     surfDesc.fHeight = 5;
     surfDesc.fConfig = config;
     surfDesc.fSampleCnt = 0;
-    GrTexture* tex = gpu->createTexture(surfDesc, SkBudgeted::kNo, nullptr, 0);
+    GrTexture* tex = gpu->createTexture(surfDesc, SkBudgeted::kNo);
     SkASSERT(tex);
     SkASSERT(tex->asRenderTarget());
     SkIRect rect = SkIRect::MakeWH(5, 5);
 
     gpu->clear(rect, GrColor_TRANSPARENT_BLACK, tex->asRenderTarget());
 
     gpu->readPixels(tex, 0, 0, 5, 5, config, (void*)buffer.get(), 0);
 
     REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
                                                                      GrColor_TRANSPARENT_BLACK,
@@ skipping 34 matching lines @@
     SkAutoTMalloc<GrColor> buffer(width * height);
     SkAutoTMalloc<GrColor> subBuffer(subWidth * subHeight);
 
     GrSurfaceDesc surfDesc;
     surfDesc.fFlags = kRenderTarget_GrSurfaceFlag;
     surfDesc.fOrigin = kTopLeft_GrSurfaceOrigin;
     surfDesc.fWidth = width;
     surfDesc.fHeight = height;
     surfDesc.fConfig = config;
     surfDesc.fSampleCnt = 0;
-    GrTexture* tex = gpu->createTexture(surfDesc, SkBudgeted::kNo, nullptr, 0);
+    GrTexture* tex = gpu->createTexture(surfDesc, SkBudgeted::kNo);
     SkASSERT(tex);
     SkASSERT(tex->asRenderTarget());
 
     SkIRect fullRect = SkIRect::MakeWH(10, 10);
     gpu->clear(fullRect, GrColor_TRANSPARENT_BLACK, tex->asRenderTarget());
 
     gpu->readPixels(tex, 0, 0, width, height, config, (void*)buffer.get(), 0);
 
     REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(buffer.get(),
                                                                      GrColor_TRANSPARENT_BLACK,
@@ skipping 61 matching lines @@
                                                                      subHeight));
     gpu->readPixels(tex, subWidth, subHeight, subWidth, subHeight,
                     config, (void*)subBuffer.get(), 0);
     REPORTER_ASSERT(reporter, does_full_buffer_contain_correct_color(subBuffer.get(),
                                                                      subColor4,
                                                                      config,
                                                                      subWidth,
                                                                      subHeight));
 }
 
-DEF_GPUTEST(VkClearTests, reporter, factory) {
-    GrContextOptions opts;
-    opts.fSuppressPrints = true;
-    GrContextFactory debugFactory(opts);
-    for (int type = 0; type < GrContextFactory::kContextTypeCnt; ++type) {
-        if (static_cast<GrContextFactory::ContextType>(type) !=
-            GrContextFactory::kNativeGL_ContextType) {
-            continue;
-        }
-        GrContext* context = debugFactory.get(static_cast<GrContextFactory::ContextType>(type));
-        if (context) {
-            basic_clear_test(reporter, context, kRGBA_8888_GrPixelConfig);
-            basic_clear_test(reporter, context, kBGRA_8888_GrPixelConfig);
-            sub_clear_test(reporter, context, kRGBA_8888_GrPixelConfig);
-            sub_clear_test(reporter, context, kBGRA_8888_GrPixelConfig);
-        }
-
-    }
+DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkClearTests, reporter, ctxInfo) {
+    basic_clear_test(reporter, ctxInfo.fGrContext, kRGBA_8888_GrPixelConfig);
+    basic_clear_test(reporter, ctxInfo.fGrContext, kBGRA_8888_GrPixelConfig);
+    sub_clear_test(reporter, ctxInfo.fGrContext, kRGBA_8888_GrPixelConfig);
+    sub_clear_test(reporter, ctxInfo.fGrContext, kBGRA_8888_GrPixelConfig);
 }
 
 #endif