Revert of Add OpenGL context to Viewer.

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
 
 #ifdef SK_VULKAN
 
 #include "vk/GrVkBackendContext.h"
 #include "WindowContext.h"
 
-class GrRenderTarget;
+class SkSurface;
+class GrContext;
 
 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);
 
     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;
+    SkSurface* getBackbufferSurface() override;
     void swapBuffers() override;
 
+    bool makeCurrent() override { return true; }
+
     bool isValid() override { return SkToBool(fBackendContext.get()); }
 
     void resize(uint32_t w, uint32_t h) override {
         this->createSwapchain(w, h, fDisplayParams);
     }
 
+    const DisplayParams& getDisplayParams() override { return fDisplayParams; }
     void setDisplayParams(const DisplayParams& params) override {
         this->createSwapchain(fWidth, fHeight, params);
     }
 
     GrBackendContext getBackendContext() override { 
         return (GrBackendContext) fBackendContext.get(); 
     }
 
 private:
     VulkanWindowContext(void*, const DisplayParams&);
@@ skipping 32 matching lines @@
     VkPtr<PFN_vkGetPhysicalDeviceSurfaceFormatsKHR> fGetPhysicalDeviceSurfaceFormatsKHR;
     VkPtr<PFN_vkGetPhysicalDeviceSurfacePresentModesKHR> fGetPhysicalDeviceSurfacePresentModesKHR;
 
     VkPtr<PFN_vkCreateSwapchainKHR> fCreateSwapchainKHR;
     VkPtr<PFN_vkDestroySwapchainKHR> fDestroySwapchainKHR;
     VkPtr<PFN_vkGetSwapchainImagesKHR> fGetSwapchainImagesKHR;
     VkPtr<PFN_vkAcquireNextImageKHR> fAcquireNextImageKHR;
     VkPtr<PFN_vkQueuePresentKHR> fQueuePresentKHR;
     VkPtr<PFN_vkCreateSharedSwapchainsKHR> fCreateSharedSwapchainsKHR;
 
+    GrContext*        fContext;
     VkSurfaceKHR      fSurface;
     VkSwapchainKHR    fSwapchain;
     uint32_t          fPresentQueueIndex;
     VkQueue           fPresentQueue;
     int               fWidth;
     int               fHeight;
+    DisplayParams     fDisplayParams;
+    GrPixelConfig     fPixelConfig;
 
-    uint32_t               fImageCount;
-    VkImage*               fImages;         // images in the swapchain
-    VkImageLayout*         fImageLayouts;   // layouts of these images when not color attachment
-    sk_sp<GrRenderTarget>* fRenderTargets;  // wrapped rendertargets for those images
-    sk_sp<SkSurface>*      fSurfaces;       // surfaces client renders to (may not be based on rts)
-    VkCommandPool          fCommandPool;
-    BackbufferInfo*        fBackbuffers;
-    uint32_t               fCurrentBackbufferIndex;
+    uint32_t          fImageCount;
+    VkImage*          fImages;         // images in the swapchain
+    VkImageLayout*    fImageLayouts;   // layouts of these images when not color attachment
+    sk_sp<SkSurface>* fSurfaces;       // wrapped surface for those images
+    VkCommandPool     fCommandPool;
+    BackbufferInfo*   fBackbuffers;
+    uint32_t          fCurrentBackbufferIndex;
 };
 
 }   // namespace sk_app
 
 #endif // SK_VULKAN
 
 #endif