diff options
author | Derek Sollenberger <djsollen@google.com> | 2016-07-22 12:13:32 -0400 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2016-07-26 13:05:13 -0400 |
commit | 56ad6ec42f814e9e61030ff819cac4e5d31def8b (patch) | |
tree | 610b7d16969d959520f57185b0845f47dddb303b /libs/hwui/renderthread/OpenGLPipeline.cpp | |
parent | e116bcf72a71f96c0c5bfcd79a329c7c77eabf34 (diff) |
Remove LayerRenderer.
There is only one caller each for the static functions here so this
CL moves the logic to the caller. Also by moving some of the code
into the pipeline it makes it easier for future changes to configure
how a pipeline handles a layer.
Change-Id: Ib735b5154325cbb658fd151f7a19dbf434ab44b7
Diffstat (limited to 'libs/hwui/renderthread/OpenGLPipeline.cpp')
-rw-r--r-- | libs/hwui/renderthread/OpenGLPipeline.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/hwui/renderthread/OpenGLPipeline.cpp b/libs/hwui/renderthread/OpenGLPipeline.cpp index 3a2b15584d50..36be387d3925 100644 --- a/libs/hwui/renderthread/OpenGLPipeline.cpp +++ b/libs/hwui/renderthread/OpenGLPipeline.cpp @@ -18,7 +18,6 @@ #include "DeferredLayerUpdater.h" #include "EglManager.h" -#include "LayerRenderer.h" #include "renderstate/RenderState.h" #include "Readback.h" @@ -120,9 +119,13 @@ bool OpenGLPipeline::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap == CopyResult::Success; } -Layer* OpenGLPipeline::createTextureLayer() { +DeferredLayerUpdater* OpenGLPipeline::createTextureLayer() { mEglManager.initialize(); - return LayerRenderer::createTextureLayer(mRenderThread.renderState()); + Layer* layer = new Layer(mRenderThread.renderState(), 0, 0); + Caches::getInstance().textureState().activateTexture(0); + layer->generateTexture(); + + return new DeferredLayerUpdater(layer); } void OpenGLPipeline::onStop() { |