summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2010-06-17 15:56:08 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-06-17 15:56:08 -0700
commitaba8d302256da893e3f6d1a323d883e42111dc0b (patch)
treebf6c2f5269c0998c45d2fe523c115c6749f564f2 /libs
parentf3b0d6177bebb2a2701d51c0a3826f9ca8961aba (diff)
parent020bb7b5ac26a6e2d2f6852952a84bb246445fcf (diff)
Merge "Add skip to field packer. remove hsb functions from env headers. add RS_PACKED define for packed structures."
Diffstat (limited to 'libs')
-rw-r--r--libs/rs/scriptc/rs_graphics.rsh3
-rw-r--r--libs/rs/scriptc/rs_types.rsh2
2 files changed, 2 insertions, 3 deletions
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh
index fe2c54997bad..6df2a565852b 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 a8e139a48769..465a4a51f855 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)))
+