diff options
author | 2016-07-28 11:49:12 -0700 | |
---|---|---|
committer | 2016-07-28 11:49:12 -0700 | |
commit | 4484d6ac788d90fe937068bf429032914f17ba60 (patch) | |
tree | bd83a4d1c7d649f8cc4fd47d4ce1c9aa84d86f7e /tools/viewer | |
parent | a26efc9bad917015a685e07d7f1f35af113498c8 (diff) |
Remove unused render target members from GL and VK sk_app::WindowContext classes
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2191673002
Review-Url: https://codereview.chromium.org/2191673002
Diffstat (limited to 'tools/viewer')
-rw-r--r-- | tools/viewer/sk_app/GLWindowContext.cpp | 2 | ||||
-rw-r--r-- | tools/viewer/sk_app/GLWindowContext.h | 2 | ||||
-rw-r--r-- | tools/viewer/sk_app/VulkanWindowContext.cpp | 3 | ||||
-rw-r--r-- | tools/viewer/sk_app/VulkanWindowContext.h | 1 |
4 files changed, 0 insertions, 8 deletions
diff --git a/tools/viewer/sk_app/GLWindowContext.cpp b/tools/viewer/sk_app/GLWindowContext.cpp index 74454e9324..3c3164a372 100644 --- a/tools/viewer/sk_app/GLWindowContext.cpp +++ b/tools/viewer/sk_app/GLWindowContext.cpp @@ -24,7 +24,6 @@ namespace sk_app { GLWindowContext::GLWindowContext(const DisplayParams& params) : WindowContext() , fBackendContext(nullptr) - , fRenderTarget(nullptr) , fSurface(nullptr) { fDisplayParams = params; } @@ -51,7 +50,6 @@ void GLWindowContext::initializeContext() { void GLWindowContext::destroyContext() { fSurface.reset(nullptr); - fRenderTarget.reset(nullptr); if (fContext) { // in case we have outstanding refs to this guy (lua?) diff --git a/tools/viewer/sk_app/GLWindowContext.h b/tools/viewer/sk_app/GLWindowContext.h index 98a312fc33..2ebc39f4b7 100644 --- a/tools/viewer/sk_app/GLWindowContext.h +++ b/tools/viewer/sk_app/GLWindowContext.h @@ -12,7 +12,6 @@ #include "gl/GrGLInterface.h" #include "SkRefCnt.h" -#include "GrRenderTarget.h" #include "SkSurface.h" #include "WindowContext.h" @@ -52,7 +51,6 @@ protected: virtual void onSwapBuffers() = 0; SkAutoTUnref<const GrGLInterface> fBackendContext; - sk_sp<GrRenderTarget> fRenderTarget; sk_sp<SkSurface> fSurface; // parameters obtained from the native window diff --git a/tools/viewer/sk_app/VulkanWindowContext.cpp b/tools/viewer/sk_app/VulkanWindowContext.cpp index 7647bd8ccd..815e8c43f5 100644 --- a/tools/viewer/sk_app/VulkanWindowContext.cpp +++ b/tools/viewer/sk_app/VulkanWindowContext.cpp @@ -254,7 +254,6 @@ void VulkanWindowContext::createBuffers(VkFormat format) { // set up initial image layouts and create surfaces fImageLayouts = new VkImageLayout[fImageCount]; - fRenderTargets = new sk_sp<GrRenderTarget>[fImageCount]; fSurfaces = new sk_sp<SkSurface>[fImageCount]; for (uint32_t i = 0; i < fImageCount; ++i) { fImageLayouts[i] = VK_IMAGE_LAYOUT_UNDEFINED; @@ -367,8 +366,6 @@ void VulkanWindowContext::destroyBuffers() { // Does this actually free the surfaces? delete[] fSurfaces; fSurfaces = nullptr; - delete[] fRenderTargets; - fRenderTargets = nullptr; delete[] fImageLayouts; fImageLayouts = nullptr; delete[] fImages; diff --git a/tools/viewer/sk_app/VulkanWindowContext.h b/tools/viewer/sk_app/VulkanWindowContext.h index 1953d7505d..abb873045f 100644 --- a/tools/viewer/sk_app/VulkanWindowContext.h +++ b/tools/viewer/sk_app/VulkanWindowContext.h @@ -97,7 +97,6 @@ private: 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; |