Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bec3aa2 authored by Jason Sams's avatar Jason Sams
Browse files

Fix fountain and put the demos back in the optional build.

parent 0066b084

libs/rs/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

libs/rs/rsVertexArray.cpp

+3 −0
Original line number Diff line number Diff line
@@ -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);

        }