summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Sams <rjsams@android.com> 2011-02-08 14:57:35 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-08 14:57:35 -0800
commite2b2a02a91dc4101a9481b5bb6ba4c56c7a35dd7 (patch)
treec3593a092dce6c5661a3dc5a607c046b96d772af
parent81f4f8d0f9edf285ec371c58ec1053cc6e1ed856 (diff)
parent4fd70373ecafbf5a87a1c35852aec2818612e928 (diff)
am 4fd70373: Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
* commit '4fd70373ecafbf5a87a1c35852aec2818612e928': Fix bug 3421901 remove 2 functions from public headers in the SDK.
-rw-r--r--libs/rs/scriptc/rs_graphics.rsh8
-rw-r--r--libs/rs/scriptc/rs_math.rsh7
2 files changed, 0 insertions, 15 deletions
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh
index 142e21a4d42f..67ffc3d9e56b 100644
--- a/libs/rs/scriptc/rs_graphics.rsh
+++ b/libs/rs/scriptc/rs_graphics.rsh
@@ -248,13 +248,5 @@ rsgMeshComputeBoundingBox(rs_mesh mesh, float3 *bBoxMin, float3 *bBoxMax) {
bBoxMax->z = z2;
}
-
-/**
- * @hide
- * Deprecated, do not use.
- *
- */
-extern void __attribute__((overloadable)) color(float, float, float, float);
-
#endif
diff --git a/libs/rs/scriptc/rs_math.rsh b/libs/rs/scriptc/rs_math.rsh
index e2719e054f86..6e3cfdb77529 100644
--- a/libs/rs/scriptc/rs_math.rsh
+++ b/libs/rs/scriptc/rs_math.rsh
@@ -97,13 +97,6 @@ extern rs_allocation __attribute__((overloadable))
rsGetAllocation(const void *);
/**
- * Mark the contents of an allocation as dirty. This forces any other scripts
- * using the allocation to receive the updated
- */
-extern void __attribute__((overloadable))
- rsAllocationMarkDirty(rs_allocation);
-
-/**
* Query the dimension of an allocation.
*
* @return uint32_t The X dimension of the allocation.