commit a50e17a391bb57771feac8c1e78a2b1627f7b9e2
author jvanverth <jvanverth@google.com> Wed Aug 12 12:19:36 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 12 12:19:36 2015 -0700
tree 121f426f0d485a2c1f83b6dfa8bbe564443c4b8d
parent 082e329887a8f1efe4e1020f0a0a6ea09961712d

Add support for a new GPU interface

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

src/gpu/GrContextFactory.cpp

diff --git a/src/gpu/GrContextFactory.cpp b/src/gpu/GrContextFactory.cpp
index 6ed2c25..1f37130 100755
--- a/src/gpu/GrContextFactory.cpp
+++ b/src/gpu/GrContextFactory.cpp
@@ -76,7 +76,11 @@
 
     glCtx->makeCurrent();
     GrBackendContext p3dctx = reinterpret_cast<GrBackendContext>(glInterface.get());
+#ifdef SK_VULKAN
+    grCtx.reset(GrContext::Create(kVulkan_GrBackend, p3dctx, fGlobalOptions));
+#else
     grCtx.reset(GrContext::Create(kOpenGL_GrBackend, p3dctx, fGlobalOptions));
+#endif
     if (!grCtx.get()) {
         return NULL;
     }

src/gpu/GrGpuFactory.cpp

diff --git a/src/gpu/GrGpuFactory.cpp b/src/gpu/GrGpuFactory.cpp
index 3001a0d..854e484 100644
--- a/src/gpu/GrGpuFactory.cpp
+++ b/src/gpu/GrGpuFactory.cpp
@@ -13,8 +13,13 @@
 #include "gl/GrGLConfig.h"
 #include "gl/GrGLGpu.h"
 
-static const int kMaxNumBackends = 4;
-static CreateGpuProc gGpuFactories[kMaxNumBackends] = {GrGLGpu::Create, NULL, NULL, NULL};
+static CreateGpuProc gGpuFactories[kBackendCount] = { GrGLGpu::Create, NULL };
+
+#ifdef SK_VULKAN
+extern GrGpu* vk_gpu_create(GrBackendContext backendContext, const GrContextOptions& options,
+                            GrContext* context);
+GrGpuFactoryRegistrar gVkGpuFactoryProc(kVulkan_GrBackend, vk_gpu_create);
+#endif
 
 GrGpuFactoryRegistrar::GrGpuFactoryRegistrar(int i, CreateGpuProc proc) {
     gGpuFactories[i] = proc;
@@ -24,7 +29,7 @@
                      GrBackendContext backendContext,
                      const GrContextOptions& options,
                      GrContext* context) {
-    SkASSERT((int)backend < kMaxNumBackends);
+    SkASSERT((int)backend < kBackendCount);
     if (!gGpuFactories[backend]) {
         return NULL;
     }