From 33c025cbfb642bd391db9ab83b84553286a0bf93 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 29 Feb 2016 15:49:41 -0800 Subject: Only copyLayer if valid rendertarget Bug: 27407637 Texture layers will set a GL_NONE rendertarget until they have managed to get the real rendertarget from SurfaceTexture. If, however, copyLayer is called prior to any calls to updateTexImage() (for example, if no frames have yet been produced), this will result in trying to use a Texture with a GL_NONE rendertarget which is bad. Change-Id: Ib7285d799cb94ebd44f07a89f2ef2075d79ef71f --- libs/hwui/LayerRenderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/LayerRenderer.cpp') diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp index e04b9a2b5fd7..5bce8ac83020 100644 --- a/libs/hwui/LayerRenderer.cpp +++ b/libs/hwui/LayerRenderer.cpp @@ -353,7 +353,7 @@ void LayerRenderer::flushLayer(RenderState& renderState, Layer* layer) { bool LayerRenderer::copyLayer(RenderState& renderState, Layer* layer, SkBitmap* bitmap) { Caches& caches = Caches::getInstance(); - if (layer + if (layer && layer->getRenderTarget() != GL_NONE && bitmap->width() <= caches.maxTextureSize && bitmap->height() <= caches.maxTextureSize) { -- cgit v1.2.3-59-g8ed1b