drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb

Browse Source
This commit is contained in:
Stephen Hines
2011-01-20 18:27:43 -08:00
committed by Android (Google) Code Review
parent 924e352875 e9f5c1894b
commit 47171a7b65
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/11.xml
View File

@ -168625,7 +168625,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="v" type="android.renderscript.Int2">
<parameter name="v" type="android.renderscript.Long2">
</parameter>
</method>
<method name="addU32"
@ -168638,7 +168638,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="v" type="android.renderscript.Int3">
<parameter name="v" type="android.renderscript.Long3">
</parameter>
</method>
<method name="addU32"
@ -168651,7 +168651,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="v" type="android.renderscript.Int4">
<parameter name="v" type="android.renderscript.Long4">
</parameter>
</method>
<method name="addU64"

6
api/current.xml
View File

@ -168625,7 +168625,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="v" type="android.renderscript.Int2">
<parameter name="v" type="android.renderscript.Long2">
</parameter>
</method>
<method name="addU32"
@ -168638,7 +168638,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="v" type="android.renderscript.Int3">
<parameter name="v" type="android.renderscript.Long3">
</parameter>
</method>
<method name="addU32"
@ -168651,7 +168651,7 @@
deprecated="not deprecated"
visibility="public"
>
<parameter name="v" type="android.renderscript.Int4">
<parameter name="v" type="android.renderscript.Long4">
</parameter>
</method>
<method name="addU64"

6
graphics/java/android/renderscript/FieldPacker.java
View File

@ -233,16 +233,16 @@ public class FieldPacker {
addI32(v.w);
}
public void addU32(Int2 v) {
public void addU32(Long2 v) {
addU32(v.x);
addU32(v.y);
}
public void addU32(Int3 v) {
public void addU32(Long3 v) {
addU32(v.x);
addU32(v.y);
addU32(v.z);
}
public void addU32(Int4 v) {
public void addU32(Long4 v) {
addU32(v.x);
addU32(v.y);
addU32(v.z);