diff options
| author | Chris Craik <ccraik@google.com> | 2015-03-10 11:03:39 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2015-03-10 14:02:06 -0700 |
| commit | 48f650cb24e5b028deaff01baddc1d154f78d91a (patch) | |
| tree | 108dbf6fba2ceed0dd04235b2bbb9406e0484ff7 /libs/hwui/GlopBuilder.cpp | |
| parent | edacf22ca132ac48207a68aa30998f5b43d893b8 (diff) | |
| download | frameworks_base-48f650cb24e5b028deaff01baddc1d154f78d91a.zip frameworks_base-48f650cb24e5b028deaff01baddc1d154f78d91a.tar.gz frameworks_base-48f650cb24e5b028deaff01baddc1d154f78d91a.tar.bz2 | |
Track down unsupported texture target
bug:19641517
Change-Id: Idc2e413abef5bb1438ffb3f52efb001504d3e89f
Diffstat (limited to 'libs/hwui/GlopBuilder.cpp')
| -rw-r--r-- | libs/hwui/GlopBuilder.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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; |