diff options
author | John Reck <jreck@google.com> | 2017-05-17 00:23:44 +0000 |
---|---|---|
committer | John Reck <jreck@google.com> | 2017-05-17 00:23:44 +0000 |
commit | 59069e00a8965cb67350e95f32d62c31d6bf010e (patch) | |
tree | 3c64b4f2e58f1f962753ff55633a892b59b4f372 /libs/hwui/renderthread/RenderThread.cpp | |
parent | b33013fb3c570e0a3ced8729dced9f0d294761a6 (diff) |
Revert "Fix recent apps in system UI for Skia pipeline"
This reverts commit b33013fb3c570e0a3ced8729dced9f0d294761a6.
Reason for revert: Caused a memory leak, b/38330767
Bug: 38136140
Bug: 38330767
Test: manual, verified memory isn't leaking doing the steps in b/38330767
Change-Id: I98b2dfd750be57a15785808e2d5723616e2ce20a
Diffstat (limited to 'libs/hwui/renderthread/RenderThread.cpp')
-rw-r--r-- | libs/hwui/renderthread/RenderThread.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp index d62b55633e2d..1450ec98dabf 100644 --- a/libs/hwui/renderthread/RenderThread.cpp +++ b/libs/hwui/renderthread/RenderThread.cpp @@ -17,7 +17,6 @@ #include "RenderThread.h" #include "../renderstate/RenderState.h" -#include "../pipeline/skia/SkiaOpenGLPipeline.h" #include "../pipeline/skia/SkiaOpenGLReadback.h" #include "CanvasContext.h" #include "EglManager.h" @@ -434,24 +433,6 @@ RenderTask* RenderThread::nextTask(nsecs_t* nextWakeup) { return next; } -sk_sp<SkImage> RenderThread::makeTextureImage(Bitmap* bitmap) { - auto renderType = Properties::getRenderPipelineType(); - sk_sp<SkImage> hardwareImage; - switch (renderType) { - case RenderPipelineType::SkiaGL: - hardwareImage = skiapipeline::SkiaOpenGLPipeline::makeTextureImage(*this, bitmap); - break; - case RenderPipelineType::SkiaVulkan: - //TODO: add Vulkan support - break; - default: - LOG_ALWAYS_FATAL("makeTextureImage: canvas context type %d not supported", - (int32_t) renderType); - break; - } - return hardwareImage; -} - } /* namespace renderthread */ } /* namespace uirenderer */ } /* namespace android */ |