summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--graphics/java/android/renderscript/FieldPacker.java4
-rw-r--r--libs/rs/scriptc/rs_graphics.rsh3
-rw-r--r--libs/rs/scriptc/rs_types.rsh2
3 files changed, 6 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java
index 6d55c7e..81a4288 100644
--- a/graphics/java/android/renderscript/FieldPacker.java
+++ b/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;
}
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh
index fe2c549..6df2a56 100644
--- a/libs/rs/scriptc/rs_graphics.rsh
+++ b/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
diff --git a/libs/rs/scriptc/rs_types.rsh b/libs/rs/scriptc/rs_types.rsh
index a8e139a..465a4a5 100644
--- a/libs/rs/scriptc/rs_types.rsh
+++ b/libs/rs/scriptc/rs_types.rsh
@@ -58,3 +58,5 @@ typedef struct {
float m[16];
} rs_matrix4x4;
+#define RS_PACKED __attribute__((packed, aligned(4)))
+