diff options
| author | Jason Sams <rjsams@android.com> | 2011-02-08 12:07:49 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-02-08 12:07:49 -0800 |
| commit | 4fd70373ecafbf5a87a1c35852aec2818612e928 (patch) | |
| tree | 01a5e8062e2265e526ba2b06e5242775a788331f /libs/rs | |
| parent | 50b7d70fb425daf6b2ead747df6634040d1bbf1b (diff) | |
| parent | e56d643e47530109097b09ea9012365611ab0b87 (diff) | |
| download | frameworks_base-4fd70373ecafbf5a87a1c35852aec2818612e928.zip frameworks_base-4fd70373ecafbf5a87a1c35852aec2818612e928.tar.gz frameworks_base-4fd70373ecafbf5a87a1c35852aec2818612e928.tar.bz2 | |
Merge "Fix bug 3421901 remove 2 functions from public headers in the SDK." into honeycomb
Diffstat (limited to 'libs/rs')
| -rw-r--r-- | libs/rs/scriptc/rs_graphics.rsh | 8 | ||||
| -rw-r--r-- | libs/rs/scriptc/rs_math.rsh | 7 |
2 files changed, 0 insertions, 15 deletions
diff --git a/libs/rs/scriptc/rs_graphics.rsh b/libs/rs/scriptc/rs_graphics.rsh index 142e21a..67ffc3d 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 e2719e0..6e3cfdb 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. |