From 48f650cb24e5b028deaff01baddc1d154f78d91a Mon Sep 17 00:00:00 2001 From: Chris Craik Date: Tue, 10 Mar 2015 11:03:39 -0700 Subject: Track down unsupported texture target bug:19641517 Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f --- libs/hwui/GlopBuilder.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'libs/hwui/GlopBuilder.cpp') diff --git a/libs/hwui/GlopBuilder.cpp b/libs/hwui/GlopBuilder.cpp index a9ce7f4..0a46014 100644 --- a/libs/hwui/GlopBuilder.cpp +++ b/libs/hwui/GlopBuilder.cpp @@ -576,8 +576,12 @@ void verify(const ProgramDescription& description, const Glop& glop) { void GlopBuilder::build() { REQUIRE_STAGES(kAllStages); if (mOutGlop->mesh.vertices.attribFlags & VertexAttribFlags::kTextureCoord) { - mDescription.hasTexture = mOutGlop->fill.texture.target == GL_TEXTURE_2D; - mDescription.hasExternalTexture = mOutGlop->fill.texture.target == GL_TEXTURE_EXTERNAL_OES; + if (mOutGlop->fill.texture.target == GL_TEXTURE_2D) { + mDescription.hasTexture = true; + } else { + mDescription.hasExternalTexture = true; + } + } mDescription.hasColors = mOutGlop->mesh.vertices.attribFlags & VertexAttribFlags::kColor; mDescription.hasVertexAlpha = mOutGlop->mesh.vertices.attribFlags & VertexAttribFlags::kAlpha; -- cgit v1.1