Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 47171a7b: Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb

Browse Source 
* commit '47171a7b65d841ed27940bb961f7934770c69440':
  Properly use Long2 for "UInt2" for FieldPacker.
This commit is contained in:
Stephen Hines
2011-01-20 18:31:39 -08:00
committed by Android Git Automerger
parent 0cf6d22a67 47171a7b65
commit 536f525ddb
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" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="v" type="android.renderscript.Int2"> <parameter name="v" type="android.renderscript.Long2">
</parameter> </parameter>
</method> </method>
<method name="addU32" <method name="addU32"
@@ -168638,7 +168638,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="v" type="android.renderscript.Int3"> <parameter name="v" type="android.renderscript.Long3">
</parameter> </parameter>
</method> </method>
<method name="addU32" <method name="addU32"
@@ -168651,7 +168651,7 @@
deprecated="not deprecated" deprecated="not deprecated"
visibility="public" visibility="public"
> >
<parameter name="v" type="android.renderscript.Int4"> <parameter name="v" type="android.renderscript.Long4">
</parameter> </parameter>
</method> </method>
<method name="addU64" <method name="addU64"

6
api/current.xml
View File

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

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

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