diff options
| author | Jason Sams <rjsams@android.com> | 2010-02-08 16:31:39 -0800 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-02-08 16:32:29 -0800 |
| commit | 5bec3aa2c6bcde7f81ca77b0887296bf05a745c8 (patch) | |
| tree | d67e8e7222d091bdbeb8e41e0306273ec48f1a89 /libs/rs/rsVertexArray.cpp | |
| parent | 0066b084b9ac10842769b3cbf755482560d21cd8 (diff) | |
| download | frameworks_base-5bec3aa2c6bcde7f81ca77b0887296bf05a745c8.zip frameworks_base-5bec3aa2c6bcde7f81ca77b0887296bf05a745c8.tar.gz frameworks_base-5bec3aa2c6bcde7f81ca77b0887296bf05a745c8.tar.bz2 | |
Fix fountain and put the demos back in the optional build.
Diffstat (limited to 'libs/rs/rsVertexArray.cpp')
| -rw-r--r-- | libs/rs/rsVertexArray.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/rs/rsVertexArray.cpp b/libs/rs/rsVertexArray.cpp index d0c0414..6c2002d 100644 --- a/libs/rs/rsVertexArray.cpp +++ b/libs/rs/rsVertexArray.cpp @@ -191,6 +191,9 @@ void VertexArray::setupGL2(const Context *rsc, class VertexArrayState *state, Sh if (sc->isUserVertexProgram()) { slot = sc->vtxAttribSlot(ct); } else { + if (mAttribs[ct].kind == RS_KIND_USER) { + continue; + } slot = sc->vtxAttribSlot(mAttribs[ct].kind); } |