Use Windowing system-specific WindowContext factories.

tools/viewer/sk_app/VulkanWindowContext.h

 
 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef VulkanWindowContext_DEFINED
 #define VulkanWindowContext_DEFINED
 
 #include "SkTypes.h" // required to pull in any SkUserConfig defines
 
 #ifdef SK_VULKAN
 
 #include "vk/GrVkBackendContext.h"
 #include "WindowContext.h"
 
 class GrRenderTarget;
 
 namespace sk_app {
 
 class VulkanWindowContext : public WindowContext {
 public:
     ~VulkanWindowContext() override;
 
-    // each platform will have to implement these in its CPP file
-    static VkSurfaceKHR createVkSurface(VkInstance, void* platformData);
-    static bool canPresent(VkInstance, VkPhysicalDevice, uint32_t queueFamilyIndex,
-                           void* platformData);
-
-    static VulkanWindowContext* Create(void* platformData, const DisplayParams& params) {
-        VulkanWindowContext* ctx = new VulkanWindowContext(platformData, params);
-        if (!ctx->isValid()) {
-            delete ctx;
-            return nullptr;
-        }
-        return ctx;
-    }
-
     sk_sp<SkSurface> getBackbufferSurface() override;
     void swapBuffers() override;
 
     bool isValid() override { return SkToBool(fBackendContext.get()); }
 
     void resize(uint32_t w, uint32_t h) override {
         this->createSwapchain(w, h, fDisplayParams);
     }
 
     void setDisplayParams(const DisplayParams& params) override {
         this->createSwapchain(fWidth, fHeight, params);
     }
 
     GrBackendContext getBackendContext() override { 
         return (GrBackendContext) fBackendContext.get(); 
     }
 
+    /** Platform specific function that creates a VkSurfaceKHR for a window */
+    using CreateVkSurfaceFn = std::function<VkSurfaceKHR(VkInstance)>;
+    /** Platform specific function that determines whether presentation will succeed. */
+    using CanPresentFn = GrVkBackendContext::CanPresentFn;
+
+    VulkanWindowContext(const DisplayParams&, CreateVkSurfaceFn, CanPresentFn);
+
 private:
-    VulkanWindowContext(void*, const DisplayParams&);
-    void initializeContext(void*, const DisplayParams&);
     void destroyContext();
 
     struct BackbufferInfo {
         uint32_t        fImageIndex;          // image this is associated with
         VkSemaphore     fAcquireSemaphore;    // we signal on this for acquisition of image
         VkSemaphore     fRenderSemaphore;     // we wait on this for rendering to be done
         VkCommandBuffer fTransitionCmdBuffers[2]; // to transition layout between present and render
         VkFence         fUsageFences[2];      // used to ensure this data is no longer used on GPU
     };
 
@@ skipping 41 matching lines @@
     VkCommandPool          fCommandPool;
     BackbufferInfo*        fBackbuffers;
     uint32_t               fCurrentBackbufferIndex;
 };
 
 }   // namespace sk_app
 
 #endif // SK_VULKAN
 
 #endif