From 020bb7b5ac26a6e2d2f6852952a84bb246445fcf Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Thu, 17 Jun 2010 15:55:00 -0700
Subject: [PATCH] Add skip to field packer. remove hsb functions from env
 headers. add RS_PACKED define for packed structures.

Change-Id: Idc661edff85c0047baa201f43e0839ac82c74593
---
 graphics/java/android/renderscript/FieldPacker.java | 4 ++++
 libs/rs/scriptc/rs_graphics.rsh                     | 3 ---
 libs/rs/scriptc/rs_types.rsh                        | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java
index 6d55c7e573103..81a4288155f40 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 fe2c54997bad2..6df2a565852bf 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 a8e139a487699..465a4a51f8550 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)))
+