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

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

Merge "Add skip to field packer. remove hsb functions from env headers. add... 

Merge "Add skip to field packer. remove hsb functions from env headers. add RS_PACKED define for packed structures."
parents f3b0d617 020bb7b5

graphics/java/android/renderscript/FieldPacker.java

+4 −0
Original line number Diff line number Diff line
@@ -40,6 +40,10 @@ public class FieldPacker { 
        mPos = i;

    }



    public void skip(int i) {

        mPos += i;

    }



    public void addI8(byte v) {

        mData[mPos++] = v;

    }

libs/rs/scriptc/rs_graphics.rsh

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ extern void rsgClearDepth(float); 
///////////////////////////////////////////////////////

// misc

extern void color(float, float, float, float);

extern void hsb(float, float, float, float);

extern void hsbToRgb(float, float, float, float*);

extern int hsbToAbgr(float, float, float, float);



#endif

libs/rs/scriptc/rs_types.rsh

+2 −0
Original line number Diff line number Diff line
@@ -58,3 +58,5 @@ typedef struct { 
    float m[16];

} rs_matrix4x4;



#define RS_PACKED __attribute__((packed, aligned(4)))