From 2a38c42e921451abebb4ee5f5ecd738f1b6b04ed Mon Sep 17 00:00:00 2001 From: sergeyv Date: Tue, 25 Oct 2016 15:21:50 -0700 Subject: Add target to texture Test: refactoring cl. bug:32413624 Change-Id: I94b1c31cd4e0712dfcfd7777a0012424c1bf0dca --- libs/hwui/Layer.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libs/hwui/Layer.cpp') diff --git a/libs/hwui/Layer.cpp b/libs/hwui/Layer.cpp index 4e12bcef8a4f..88817efa80ac 100644 --- a/libs/hwui/Layer.cpp +++ b/libs/hwui/Layer.cpp @@ -41,7 +41,6 @@ Layer::Layer(RenderState& renderState, uint32_t layerWidth, uint32_t layerHeight // TODO: This is a violation of Android's typical ref counting, but it // preserves the old inc/dec ref locations. This should be changed... incStrong(nullptr); - renderTarget = GL_NONE; // see DeferredLayerUpdater::updateLayer() texture.mWidth = layerWidth; texture.mHeight = layerHeight; renderState.registerLayer(this); @@ -66,7 +65,7 @@ void Layer::setColorFilter(SkColorFilter* filter) { void Layer::bindTexture() const { if (texture.mId) { - caches.textureState().bindTexture(renderTarget, texture.mId); + caches.textureState().bindTexture(texture.target(), texture.mId); } } -- cgit v1.2.3-59-g8ed1b