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

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

Merge "Add const to matrix by vector multiply routines. Cleanup ifdef for rsForEach."

parents ccb722d5 4575a8e4

libs/rs/scriptc/rs_core.rsh

+20 −0
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ rsMatrixLoadFrustum(rs_matrix4x4 *m, float left, float right, float bottom, floa 
extern void __attribute__((overloadable))

rsMatrixLoadPerspective(rs_matrix4x4* m, float fovy, float aspect, float near, float far);



#if !defined(RS_VERSION) || (RS_VERSION < 14)

_RS_RUNTIME float4 __attribute__((overloadable))

rsMatrixMultiply(rs_matrix4x4 *m, float4 in);
@@ -286,6 +287,25 @@ rsMatrixMultiply(rs_matrix3x3 *m, float2 in); 


_RS_RUNTIME float2 __attribute__((overloadable))

rsMatrixMultiply(rs_matrix2x2 *m, float2 in);

#else

_RS_RUNTIME float4 __attribute__((overloadable))

rsMatrixMultiply(const rs_matrix4x4 *m, float4 in);



_RS_RUNTIME float4 __attribute__((overloadable))

rsMatrixMultiply(const rs_matrix4x4 *m, float3 in);



_RS_RUNTIME float4 __attribute__((overloadable))

rsMatrixMultiply(const rs_matrix4x4 *m, float2 in);



_RS_RUNTIME float3 __attribute__((overloadable))

rsMatrixMultiply(const rs_matrix3x3 *m, float3 in);



_RS_RUNTIME float3 __attribute__((overloadable))

rsMatrixMultiply(const rs_matrix3x3 *m, float2 in);



_RS_RUNTIME float2 __attribute__((overloadable))

rsMatrixMultiply(const rs_matrix2x2 *m, float2 in);

#endif



// Returns true if the matrix was successfully inversed

extern bool __attribute__((overloadable)) rsMatrixInverse(rs_matrix4x4 *m);

libs/rs/scriptc/rs_math.rsh

+10 −11
Original line number Diff line number Diff line
@@ -249,7 +249,16 @@ typedef struct rs_script_call { 
    uint32_t arrayEnd;

} rs_script_call_t;



#if 1//(RS_VERSION >= 14)

#if !defined(RS_VERSION) || (RS_VERSION < 14)

extern void __attribute__((overloadable))

    rsForEach(rs_script script, rs_allocation input,

              rs_allocation output, const void * usrData,

              const rs_script_call_t *);



extern void __attribute__((overloadable))

    rsForEach(rs_script script, rs_allocation input,

              rs_allocation output, const void * usrData);

#else

extern void __attribute__((overloadable))

    rsForEach(rs_script script, rs_allocation input, rs_allocation output);
@@ -260,18 +269,8 @@ extern void __attribute__((overloadable)) 
extern void __attribute__((overloadable))

    rsForEach(rs_script script, rs_allocation input, rs_allocation output,

              const void * usrData, size_t usrDataLen, const rs_script_call_t *);

#else

extern void __attribute__((overloadable))

    rsForEach(rs_script script, rs_allocation input,

              rs_allocation output, const void * usrData,

              const rs_script_call_t *);

#endif



// Move me once dependant changes are in.

extern void __attribute__((overloadable))

    rsForEach(rs_script script, rs_allocation input,

              rs_allocation output, const void * usrData);





/**

 * Atomic add one to the value at addr.