Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47171a7b authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

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

parents 924e3528 e9f5c189

api/11.xml

+3 −3
Original line number Diff line number Diff line
@@ -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"

api/current.xml

+3 −3
Original line number Diff line number Diff line
@@ -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"

graphics/java/android/renderscript/FieldPacker.java

+3 −3
Original line number Diff line number Diff line
@@ -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);