commit bdf12ad8d50a724849f022d7cf7838fd62845906
author Greg Daniel <egdaniel@google.com> Fri Oct 12 09:31:11 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 12 14:01:58 2018 +0000
tree 9c1b33753c0b598195d883a4d42de951dcdb21a1
parent 0a0304c426c44c15897c74dcffb2dcbae544b948

Move GrBackend enum to enum class.

Bug: skia:
Change-Id: I8add2470313549723be6720b543091c444d2eb4f
Reviewed-on: https://skia-review.googlesource.com/c/161680
Commit-Queue: Greg Daniel <egdaniel@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/GrAHardwareBufferImageGenerator.cpp

diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/GrAHardwareBufferImageGenerator.cpp
index afde089..76918de 100644
--- a/src/gpu/GrAHardwareBufferImageGenerator.cpp
+++ b/src/gpu/GrAHardwareBufferImageGenerator.cpp
@@ -55,7 +55,7 @@
 }
 
 static bool can_import_protected_content(GrContext* context) {
-    if (kOpenGL_GrBackend == context->contextPriv().getBackend()) {
+    if (GrBackendApi::kOpenGL == context->contextPriv().getBackend()) {
         // Only compute whether the extension is present once the first time this
         // function is called.
         static bool hasIt = can_import_protected_content_eglimpl();
@@ -156,7 +156,7 @@
         GrAHardwareBufferImageGenerator::DeleteImageCtx* deleteCtx,
         bool isProtectedContent,
         const GrBackendFormat& backendFormat) {
-    SkASSERT(context->contextPriv().getBackend() == kVulkan_GrBackend);
+    SkASSERT(context->contextPriv().getBackend() == GrBackendApi::kVulkan);
     GrVkGpu* gpu = static_cast<GrVkGpu*>(context->contextPriv().getGpu());
 
     VkPhysicalDevice physicalDevice = gpu->physicalDevice();
@@ -422,11 +422,11 @@
     }
     bool createProtectedImage = isProtectedContent && can_import_protected_content(context);
 
-    if (kOpenGL_GrBackend == context->contextPriv().getBackend()) {
+    if (GrBackendApi::kOpenGL == context->contextPriv().getBackend()) {
         return make_gl_backend_texture(context, hardwareBuffer, width, height, config, deleteProc,
                                        deleteCtx, createProtectedImage, backendFormat);
     } else {
-        SkASSERT(kVulkan_GrBackend == context->contextPriv().getBackend());
+        SkASSERT(GrBackendApi::kVulkan == context->contextPriv().getBackend());
 #ifdef SK_VULKAN
         // Currently we don't support protected images on vulkan
         SkASSERT(!createProtectedImage);
@@ -438,8 +438,8 @@
     }
 }
 
-GrBackendFormat get_backend_format(GrBackend backend, uint32_t bufferFormat) {
-    if (backend == kOpenGL_GrBackend) {
+GrBackendFormat get_backend_format(GrBackendApi backend, uint32_t bufferFormat) {
+    if (backend == GrBackendApi::kOpenGL) {
         switch (bufferFormat) {
             //TODO: find out if we can detect, which graphic buffers support GR_GL_TEXTURE_2D
             case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
@@ -456,7 +456,7 @@
             default:
                 return GrBackendFormat::MakeGL(GR_GL_RGBA8, GR_GL_TEXTURE_EXTERNAL);
         }
-    } else if (backend == kVulkan_GrBackend) {
+    } else if (backend == GrBackendApi::kVulkan) {
         switch (bufferFormat) {
             //TODO: find out if we can detect, which graphic buffers support GR_GL_TEXTURE_2D
             case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
@@ -500,7 +500,7 @@
     desc.fConfig = pixelConfig;
 
     GrTextureType textureType = GrTextureType::k2D;
-    if (context->contextPriv().getBackend() == kOpenGL_GrBackend) {
+    if (context->contextPriv().getBackend() == GrBackendApi::kOpenGL) {
         textureType = GrTextureType::kExternal;
     }
 
@@ -582,8 +582,8 @@
     if (nullptr == context) {
         return false; //CPU backend is not supported, because hardware buffer can be swizzled
     }
-    return kOpenGL_GrBackend == context->contextPriv().getBackend() ||
-           kVulkan_GrBackend == context->contextPriv().getBackend();
+    return GrBackendApi::kOpenGL == context->contextPriv().getBackend() ||
+           GrBackendApi::kVulkan == context->contextPriv().getBackend();
 }
 
 #endif //SK_BUILD_FOR_ANDROID_FRAMEWORK