Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(908)

Unified Diff: tools/viewer/sk_app/VulkanWindowContext.h

Issue 1978573003: Add OpenGL context to Viewer. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Fix Android stuff Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/viewer/sk_app/VulkanWindowContext.h
diff --git a/tools/viewer/sk_app/VulkanWindowContext.h b/tools/viewer/sk_app/VulkanWindowContext.h
index ec80a3251d2f080c17b6d8dd7c1acf34b922b740..0d65714bc3927a943a4d9144811d14440803b7a5 100644
--- a/tools/viewer/sk_app/VulkanWindowContext.h
+++ b/tools/viewer/sk_app/VulkanWindowContext.h
@@ -13,9 +13,6 @@
#include "vk/GrVkBackendContext.h"
#include "WindowContext.h"
-class SkSurface;
-class GrContext;
-
namespace sk_app {
class VulkanWindowContext : public WindowContext {
@@ -35,11 +32,9 @@ public:
return ctx;
}
- SkSurface* getBackbufferSurface() override;
+ sk_sp<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 {
@@ -99,15 +94,12 @@ private:
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

Powered by Google App Engine
This is Rietveld 408576698