Add sRGB mode toggle 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 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, int msaaSampleCount) {
-        VulkanWindowContext* ctx = new VulkanWindowContext(platformData, msaaSampleCount);
+    static VulkanWindowContext* Create(void* platformData, int msaaSampleCount, bool srgb) {
+        VulkanWindowContext* ctx = new VulkanWindowContext(platformData, msaaSampleCount, srgb);
         if (!ctx->isValid()) {
             delete ctx;
             return nullptr;
         }
         return ctx;
     }
 
     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);
+        this->createSwapchain(w, h, fSRGB);
+    }
+
+    bool getSRGB() override { return fSRGB; }
+    void setSRGB(bool srgb) override {
+        this->createSwapchain(fWidth, fHeight, srgb);
     }
 
     GrBackendContext getBackendContext() override { 
         return (GrBackendContext) fBackendContext.get(); 
     }
 
 private:
-    VulkanWindowContext();
-    VulkanWindowContext(void*, int msaaSampleCount);
-    void initializeContext(void*);
+    VulkanWindowContext(void*, int msaaSampleCount, bool srgb);
+    void initializeContext(void*, bool srgb);
     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
     };
 
     BackbufferInfo* getAvailableBackbuffer();
-    bool createSwapchain(uint32_t width, uint32_t height);
+    bool createSwapchain(uint32_t width, uint32_t height, bool srgb);

[bsalomon, 2016/05/06 18:30:15]

Should we take a config here or something more general? Just trying to think
ahead for 10bit, ...

[Brian Osman, 2016/05/06 18:42:06]

Did you mean GrPixelConfig? That would invert some of the internal logic, and
doesn't give us any way to request 10-bit. The only option I came up with was to
make a params struct to pass along sRGB/DeepColor/etc... That would be cleaner,
and I guess we could still have the get() return a const& to the underlying
stored copy for the calling code to query?

[bsalomon, 2016/05/06 18:48:32]

What about (SkColorType, SkProfileType)?

I think we're going to wind up with 10bit as a GrPixelConfig/SkColorType
eventually anyway even if for a while the only way to create one is to wrap a
external swap buffer.

     void createBuffers(VkFormat format);
     void destroyBuffers();
 
     SkAutoTUnref<const GrVkBackendContext> fBackendContext;
 
     // simple wrapper class that exists only to initialize a pointer to NULL
     template <typename FNPTR_TYPE> class VkPtr {
     public:
         VkPtr() : fPtr(NULL) {}
         VkPtr operator=(FNPTR_TYPE ptr) { fPtr = ptr; return *this; }
@@ skipping 16 matching lines @@
     VkPtr<PFN_vkQueuePresentKHR> fQueuePresentKHR;
     VkPtr<PFN_vkCreateSharedSwapchainsKHR> fCreateSharedSwapchainsKHR;
 
     GrContext*        fContext;
     VkSurfaceKHR      fSurface;
     VkSwapchainKHR    fSwapchain;
     uint32_t          fPresentQueueIndex;
     VkQueue           fPresentQueue;
     int               fWidth;
     int               fHeight;
+    bool              fSRGB;
     GrPixelConfig     fPixelConfig;
 
     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