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

graphics/java/android/renderscript/FieldPacker.java

@@ -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

@@ -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

@@ -58,3 +58,5 @@ typedef struct {
     float m[16];
 } rs_matrix4x4;
 
+#define RS_PACKED __attribute__((packed, aligned(4)))
+