Merge "Update renderscript to use stable graphics APIs" (00ef0f3a) · Commits · e / os / android_frameworks_base

rs/java/android/renderscript/RenderScript.java

+11 −22

Original line number	Diff line number	Diff line
		@@ -447,44 +447,33 @@ public class RenderScript {
		validate();
		return rsnAllocationCreateTyped(mContext, type, mip, usage, pointer);
		}
		native long rsnAllocationCreateFromBitmap(long con, long type, int mip, long bitmapHandle,

		native long rsnAllocationCreateFromBitmap(long con, long type, int mip, Bitmap bmp,
		int usage);
		synchronized long nAllocationCreateFromBitmap(long type, int mip, Bitmap bmp, int usage) {
		validate();
		return rsnAllocationCreateFromBitmap(mContext, type, mip, bmp.getNativeInstance(), usage);
		return rsnAllocationCreateFromBitmap(mContext, type, mip, bmp, usage);
		}

		native long rsnAllocationCreateBitmapBackedAllocation(long con, long type, int mip, long bitmapHandle,
		native long rsnAllocationCreateBitmapBackedAllocation(long con, long type, int mip, Bitmap bmp,
		int usage);
		synchronized long nAllocationCreateBitmapBackedAllocation(long type, int mip, Bitmap bmp,
		int usage) {
		validate();
		return rsnAllocationCreateBitmapBackedAllocation(mContext, type, mip, bmp.getNativeInstance(),
		usage);
		return rsnAllocationCreateBitmapBackedAllocation(mContext, type, mip, bmp, usage);
		}

		native long rsnAllocationCubeCreateFromBitmap(long con, long type, int mip, long bitmapHandle,
		native long rsnAllocationCubeCreateFromBitmap(long con, long type, int mip, Bitmap bmp,
		int usage);
		synchronized long nAllocationCubeCreateFromBitmap(long type, int mip, Bitmap bmp, int usage) {
		validate();
		return rsnAllocationCubeCreateFromBitmap(mContext, type, mip, bmp.getNativeInstance(),
		usage);
		}
		native long rsnAllocationCreateBitmapRef(long con, long type, long bitmapHandle);
		synchronized long nAllocationCreateBitmapRef(long type, Bitmap bmp) {
		validate();
		return rsnAllocationCreateBitmapRef(mContext, type, bmp.getNativeInstance());
		}
		native long rsnAllocationCreateFromAssetStream(long con, int mips, int assetStream, int usage);
		synchronized long nAllocationCreateFromAssetStream(int mips, int assetStream, int usage) {
		validate();
		return rsnAllocationCreateFromAssetStream(mContext, mips, assetStream, usage);
		return rsnAllocationCubeCreateFromBitmap(mContext, type, mip, bmp, usage);
		}

		native void rsnAllocationCopyToBitmap(long con, long alloc, long bitmapHandle);
		native void rsnAllocationCopyToBitmap(long con, long alloc, Bitmap bmp);
		synchronized void nAllocationCopyToBitmap(long alloc, Bitmap bmp) {
		validate();
		rsnAllocationCopyToBitmap(mContext, alloc, bmp.getNativeInstance());
		rsnAllocationCopyToBitmap(mContext, alloc, bmp);
		}

		native void rsnAllocationSyncAll(long con, long alloc, int src);
		@@ -537,10 +526,10 @@ public class RenderScript {
		validate();
		rsnAllocationGenerateMipmaps(mContext, alloc);
		}
		native void rsnAllocationCopyFromBitmap(long con, long alloc, long bitmapHandle);
		native void rsnAllocationCopyFromBitmap(long con, long alloc, Bitmap bmp);
		synchronized void nAllocationCopyFromBitmap(long alloc, Bitmap bmp) {
		validate();
		rsnAllocationCopyFromBitmap(mContext, alloc, bmp.getNativeInstance());
		rsnAllocationCopyFromBitmap(mContext, alloc, bmp);
		}

rs/jni/Android.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -12,7 +12,6 @@ LOCAL_SHARED_LIBRARIES := \
		libRS \
		libcutils \
		liblog \
		libhwui \
		libutils \
		libui \
		libgui \

rs/jni/android_renderscript_RenderScript.cpp

+27 −31

Original line number	Diff line number	Diff line
		@@ -32,10 +32,10 @@

		#include "jni.h"
		#include <nativehelper/JNIHelp.h>
		#include <android/graphics/bitmap.h>
		#include "android_runtime/AndroidRuntime.h"
		#include "android_runtime/android_view_Surface.h"
		#include "android_runtime/android_util_AssetManager.h"
		#include "android/graphics/GraphicsJNI.h"
		#include "android/native_window.h"
		#include "android/native_window_jni.h"

		@@ -1319,27 +1319,28 @@ nAllocationGenerateMipmaps(JNIEnv *_env, jobject _this, jlong con, jlong alloc)
		rsAllocationGenerateMipmaps((RsContext)con, (RsAllocation)alloc);
		}

		static size_t computeByteSize(const android::graphics::Bitmap& bitmap) {
		AndroidBitmapInfo info = bitmap.getInfo();
		return info.height * info.stride;
		}

		static jlong
		nAllocationCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip,
		jlong bitmapPtr, jint usage)
		jobject jbitmap, jint usage)
		{
		SkBitmap bitmap;
		bitmap::toBitmap(bitmapPtr).getSkBitmap(&bitmap);

		android::graphics::Bitmap bitmap(_env, jbitmap);
		const void* ptr = bitmap.getPixels();
		jlong id = (jlong)(uintptr_t)rsAllocationCreateFromBitmap((RsContext)con,
		(RsType)type, (RsAllocationMipmapControl)mip,
		ptr, bitmap.computeByteSize(), usage);
		ptr, computeByteSize(bitmap), usage);
		return id;
		}

		static jlong
		nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con, jlong type,
		jint mip, jlong bitmapPtr, jint usage)
		jint mip, jobject jbitmap, jint usage)
		{
		SkBitmap bitmap;
		bitmap::toBitmap(bitmapPtr).getSkBitmap(&bitmap);

		android::graphics::Bitmap bitmap(_env, jbitmap);
		const void* ptr = bitmap.getPixels();
		jlong id = (jlong)(uintptr_t)rsAllocationCreateTyped((RsContext)con,
		(RsType)type, (RsAllocationMipmapControl)mip,
		@@ -1349,40 +1350,35 @@ nAllocationCreateBitmapBackedAllocation(JNIEnv *_env, jobject _this, jlong con,

		static jlong
		nAllocationCubeCreateFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong type, jint mip,
		jlong bitmapPtr, jint usage)
		jobject jbitmap, jint usage)
		{
		SkBitmap bitmap;
		bitmap::toBitmap(bitmapPtr).getSkBitmap(&bitmap);

		android::graphics::Bitmap bitmap(_env, jbitmap);
		const void* ptr = bitmap.getPixels();
		jlong id = (jlong)(uintptr_t)rsAllocationCubeCreateFromBitmap((RsContext)con,
		(RsType)type, (RsAllocationMipmapControl)mip,
		ptr, bitmap.computeByteSize(), usage);
		ptr, computeByteSize(bitmap), usage);
		return id;
		}

		static void
		nAllocationCopyFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jlong bitmapPtr)
		nAllocationCopyFromBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject jbitmap)
		{
		SkBitmap bitmap;
		bitmap::toBitmap(bitmapPtr).getSkBitmap(&bitmap);
		int w = bitmap.width();
		int h = bitmap.height();
		android::graphics::Bitmap bitmap(_env, jbitmap);
		int w = bitmap.getInfo().width;
		int h = bitmap.getInfo().height;

		const void* ptr = bitmap.getPixels();
		rsAllocation2DData((RsContext)con, (RsAllocation)alloc, 0, 0,
		0, RS_ALLOCATION_CUBEMAP_FACE_POSITIVE_X,
		w, h, ptr, bitmap.computeByteSize(), 0);
		w, h, ptr, computeByteSize(bitmap), 0);
		}

		static void
		nAllocationCopyToBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jlong bitmapPtr)
		nAllocationCopyToBitmap(JNIEnv *_env, jobject _this, jlong con, jlong alloc, jobject jbitmap)
		{
		SkBitmap bitmap;
		bitmap::toBitmap(bitmapPtr).getSkBitmap(&bitmap);

		android::graphics::Bitmap bitmap(_env, jbitmap);
		void* ptr = bitmap.getPixels();
		rsAllocationCopyToBitmap((RsContext)con, (RsAllocation)alloc, ptr, bitmap.computeByteSize());
		rsAllocationCopyToBitmap((RsContext)con, (RsAllocation)alloc, ptr, computeByteSize(bitmap));
		bitmap.notifyPixelsChanged();
		}

		@@ -2867,12 +2863,12 @@ static const JNINativeMethod methods[] = {
		{"rsnTypeGetNativeData", "(JJ[J)V", (void*)nTypeGetNativeData },

		{"rsnAllocationCreateTyped", "(JJIIJ)J", (void*)nAllocationCreateTyped },
		{"rsnAllocationCreateFromBitmap", "(JJIJI)J", (void*)nAllocationCreateFromBitmap },
		{"rsnAllocationCreateBitmapBackedAllocation", "(JJIJI)J", (void*)nAllocationCreateBitmapBackedAllocation },
		{"rsnAllocationCubeCreateFromBitmap","(JJIJI)J", (void*)nAllocationCubeCreateFromBitmap },
		{"rsnAllocationCreateFromBitmap", "(JJILandroid/graphics/Bitmap;I)J", (void*)nAllocationCreateFromBitmap },
		{"rsnAllocationCreateBitmapBackedAllocation", "(JJILandroid/graphics/Bitmap;I)J", (void*)nAllocationCreateBitmapBackedAllocation },
		{"rsnAllocationCubeCreateFromBitmap","(JJILandroid/graphics/Bitmap;I)J", (void*)nAllocationCubeCreateFromBitmap },

		{"rsnAllocationCopyFromBitmap", "(JJJ)V", (void*)nAllocationCopyFromBitmap },
		{"rsnAllocationCopyToBitmap", "(JJJ)V", (void*)nAllocationCopyToBitmap },
		{"rsnAllocationCopyFromBitmap", "(JJLandroid/graphics/Bitmap;)V", (void*)nAllocationCopyFromBitmap },
		{"rsnAllocationCopyToBitmap", "(JJLandroid/graphics/Bitmap;)V", (void*)nAllocationCopyToBitmap },

		{"rsnAllocationSyncAll", "(JJI)V", (void*)nAllocationSyncAll },
		{"rsnAllocationSetupBufferQueue", "(JJI)V", (void*)nAllocationSetupBufferQueue },