diff options
| -rw-r--r-- | libs/rs/Android.mk | 4 | ||||
| -rw-r--r-- | libs/rs/rsVertexArray.cpp | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk index 88521f6..98464a0 100644 --- a/libs/rs/Android.mk +++ b/libs/rs/Android.mk @@ -110,5 +110,9 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) +# include the java examples +include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\ + java \ + )) endif #simulator 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); } |