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

Commit 72d637e2 authored by Tim Murray's avatar Tim Murray Committed by Android Git Automerger
Browse files

am e22e268e: Merge changes If93a5d78,I1957f7ac 

* commit 'e22e268e':
  Convert Java/JNI to 64-bit, part 1.
  Add long/double read support.
parents bccee732 e22e268e

graphics/java/android/renderscript/Allocation.java

+4 −4
Original line number Diff line number Diff line
@@ -1262,7 +1262,7 @@ public class Allocation extends BaseObj { 
        Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo");

        validateIsInt8();

        mRS.validate();

        mRS.nAllocationRead(getID(mRS), d);

        mRS.nAllocationRead(getID(mRS), d, Element.DataType.SIGNED_8);

        Trace.traceEnd(RenderScript.TRACE_TAG);

    }
@@ -1277,7 +1277,7 @@ public class Allocation extends BaseObj { 
        Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo");

        validateIsInt16();

        mRS.validate();

        mRS.nAllocationRead(getID(mRS), d);

        mRS.nAllocationRead(getID(mRS), d, Element.DataType.SIGNED_16);

        Trace.traceEnd(RenderScript.TRACE_TAG);

    }
@@ -1292,7 +1292,7 @@ public class Allocation extends BaseObj { 
        Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo");

        validateIsInt32();

        mRS.validate();

        mRS.nAllocationRead(getID(mRS), d);

        mRS.nAllocationRead(getID(mRS), d, Element.DataType.SIGNED_32);

        Trace.traceEnd(RenderScript.TRACE_TAG);

    }
@@ -1307,7 +1307,7 @@ public class Allocation extends BaseObj { 
        Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo");

        validateIsFloat32();

        mRS.validate();

        mRS.nAllocationRead(getID(mRS), d);

        mRS.nAllocationRead(getID(mRS), d, Element.DataType.FLOAT_32);

        Trace.traceEnd(RenderScript.TRACE_TAG);

    }

graphics/java/android/renderscript/RenderScript.java

+129 −126

File changed.

Preview size limit exceeded, changes collapsed.

graphics/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_C_INCLUDES += \ 
	$(rs_generated_include_dir) \

	$(call include-path-for, corecg graphics)



LOCAL_CFLAGS +=

LOCAL_CFLAGS += -Wno-unused-parameter



LOCAL_LDLIBS := -lpthread

LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h)

graphics/jni/android_renderscript_RenderScript.cpp

+346 −354

File changed.

Preview size limit exceeded, changes collapsed.