diff options
| author |  bsalomon <bsalomon@google.com> | 2016-04-05 11:06:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-05 11:06:27 -0700 |
| commit | 85b4b53e78dcdeae2a51935ca5e214b0f1a06492 (patch) | |
| tree | 909cb8ef0862154b2e6bc6c66e0e40cd5d018bae /tests/VkUploadPixelsTests.cpp | |
| parent | 3a15fd4a9a019dc781368c26499ff899c2f03e3f (diff) | |
Rename enums in GrContextFactory to remove "GL"
Also, remove kNative as a separate context type and instead make it an alias for kGL or kGLES based on OS.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1845923004
Committed: https://skia.googlesource.com/skia/+/2d9c6f81353597aebf5934547e5cba7a872196fb
Review URL: https://codereview.chromium.org/1845923004
Diffstat (limited to 'tests/VkUploadPixelsTests.cpp')
| -rw-r--r-- | tests/VkUploadPixelsTests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/VkUploadPixelsTests.cpp b/tests/VkUploadPixelsTests.cpp index a509978eda..e5f72dd635 100644 --- a/tests/VkUploadPixelsTests.cpp +++ b/tests/VkUploadPixelsTests.cpp @@ -137,12 +137,12 @@ DEF_GPUTEST(VkUploadPixelsTests, reporter, factory) { GrContextOptions opts; opts.fSuppressPrints = true; GrContextFactory debugFactory(opts); - for (int type = 0; type < GrContextFactory::kLastGLContextType; ++type) { - if (static_cast<GrContextFactory::GLContextType>(type) != - GrContextFactory::kNative_GLContextType) { + 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::GLContextType>(type)); + GrContext* context = debugFactory.get(static_cast<GrContextFactory::ContextType>(type)); if (context) { basic_texture_test(reporter, context, kRGBA_8888_GrPixelConfig, false, false); basic_texture_test(reporter, context, kRGBA_8888_GrPixelConfig, true, false); |