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

Commit 3ac60ada authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Add slot number to forEach hal."

parents 67d464f4 92b0eab0

libs/rs/driver/rsdBcc.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -269,6 +269,7 @@ static void wc_x(void *usr, uint32_t idx) { 




void rsdScriptInvokeForEach(const Context *rsc,

void rsdScriptInvokeForEach(const Context *rsc,

                            Script *s,

                            Script *s,

                            uint32_t slot,

                            const Allocation * ain,

                            const Allocation * ain,

                            Allocation * aout,

                            Allocation * aout,

                            const void * usr,

                            const void * usr,

libs/rs/driver/rsdBcc.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ void rsdScriptInvokeFunction(const android::renderscript::Context *dc, 




void rsdScriptInvokeForEach(const android::renderscript::Context *rsc,

void rsdScriptInvokeForEach(const android::renderscript::Context *rsc,

                            android::renderscript::Script *s,

                            android::renderscript::Script *s,

                            uint32_t slot,

                            const android::renderscript::Allocation * ain,

                            const android::renderscript::Allocation * ain,

                            android::renderscript::Allocation * aout,

                            android::renderscript::Allocation * aout,

                            const void * usr,

                            const void * usr,

libs/rs/rsScriptC.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ void ScriptC::runForEach(Context *rsc, 




    setupGLState(rsc);

    setupGLState(rsc);

    setupScript(rsc);

    setupScript(rsc);

    rsc->mHal.funcs.script.invokeForEach(rsc, this, ain, aout, usr, usrBytes, sc);

    rsc->mHal.funcs.script.invokeForEach(rsc, this, 0, ain, aout, usr, usrBytes, sc);

}

}





void ScriptC::Invoke(Context *rsc, uint32_t slot, const void *data, size_t len) {

void ScriptC::Invoke(Context *rsc, uint32_t slot, const void *data, size_t len) {

libs/rs/rs_hal.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ typedef struct { 
        int (*invokeRoot)(const Context *rsc, Script *s);

        int (*invokeRoot)(const Context *rsc, Script *s);

        void (*invokeForEach)(const Context *rsc,

        void (*invokeForEach)(const Context *rsc,

                              Script *s,

                              Script *s,

                              uint32_t slot,

                              const Allocation * ain,

                              const Allocation * ain,

                              Allocation * aout,

                              Allocation * aout,

                              const void * usr,

                              const void * usr,