Merge "Start seperating out RS compute implementation. Create hal layer to seperate from runtime." (1c14bcf7) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/RenderScript.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -457,20 +457,11 @@ public class RenderScript {
		rsnScriptSetVarObj(mContext, id, slot, val);
		}

		native void rsnScriptCBegin(int con);
		synchronized void nScriptCBegin() {
		native int rsnScriptCCreate(int con, String resName, String cacheDir,
		byte[] script, int length);
		synchronized int nScriptCCreate(String resName, String cacheDir, byte[] script, int length) {
		validate();
		rsnScriptCBegin(mContext);
		}
		native void rsnScriptCSetScript(int con, byte[] script, int offset, int length);
		synchronized void nScriptCSetScript(byte[] script, int offset, int length) {
		validate();
		rsnScriptCSetScript(mContext, script, offset, length);
		}
		native int rsnScriptCCreate(int con, String packageName, String resName, String cacheDir);
		synchronized int nScriptCCreate(String packageName, String resName, String cacheDir) {
		validate();
		return rsnScriptCCreate(mContext, packageName, resName, cacheDir);
		return rsnScriptCCreate(mContext, resName, cacheDir, script, length);
		}

		native void rsnSamplerBegin(int con);

graphics/java/android/renderscript/ScriptC.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -92,16 +92,13 @@ public class ScriptC extends Script {
		throw new Resources.NotFoundException();
		}

		rs.nScriptCBegin();
		rs.nScriptCSetScript(pgm, 0, pgmLength);

		// E.g, /system/apps/Fountain.apk
		String packageName = rs.getApplicationContext().getPackageResourcePath();
		//String packageName = rs.getApplicationContext().getPackageResourcePath();
		// For res/raw/fountain.bc, it wil be /com.android.fountain:raw/fountain
		String resName = resources.getResourceName(resourceID);
		String cacheDir = rs.getApplicationContext().getCacheDir().toString();

		Log.v(TAG, "Create script for resource = " + resName);
		return rs.nScriptCCreate(packageName, resName, cacheDir);
		return rs.nScriptCCreate(resName, cacheDir, pgm, pgmLength);
		}
		}

graphics/jni/android_renderscript_RenderScript.cpp

+19 −35

Original line number	Diff line number	Diff line
		@@ -848,65 +848,51 @@ nScriptInvokeV(JNIEnv *_env, jobject _this, RsContext con, jint script, jint slo

		// -----------------------------------

		static void
		nScriptCBegin(JNIEnv *_env, jobject _this, RsContext con)
		static jint
		nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con,
		jstring resName, jstring cacheDir,
		jbyteArray scriptRef, jint length)
		{
		LOG_API("nScriptCBegin, con(%p)", con);
		rsScriptCBegin(con);
		}
		LOG_API("nScriptCCreate, con(%p)", con);

		AutoJavaStringToUTF8 resNameUTF(_env, resName);
		AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir);
		jint ret = 0;

		static void
		nScriptCSetScript(JNIEnv *_env, jobject _this, RsContext con, jbyteArray scriptRef,
		jint offset, jint length)
		{
		LOG_API("!!! nScriptCSetScript, con(%p)", con);
		jint _exception = 0;
		jint remaining;
		jbyte* script_base = 0;
		jbyte* script_ptr;
		if (!scriptRef) {
		_exception = 1;
		//_env->ThrowNew(IAEClass, "script == null");
		goto exit;
		}
		if (offset < 0) {
		_exception = 1;
		//_env->ThrowNew(IAEClass, "offset < 0");
		goto exit;
		}
		if (length < 0) {
		_exception = 1;
		//_env->ThrowNew(IAEClass, "length < 0");
		goto exit;
		}
		remaining = _env->GetArrayLength(scriptRef) - offset;
		remaining = _env->GetArrayLength(scriptRef);
		if (remaining < length) {
		_exception = 1;
		//_env->ThrowNew(IAEClass, "length > script.length - offset");
		goto exit;
		}
		script_base = (jbyte *)
		script_ptr = (jbyte *)
		_env->GetPrimitiveArrayCritical(scriptRef, (jboolean *)0);
		script_ptr = script_base + offset;

		rsScriptCSetText(con, (const char *)script_ptr, length);
		//rsScriptCSetText(con, (const char *)script_ptr, length);

		ret = (jint)rsScriptCCreate(con, resNameUTF.c_str(), cacheDirUTF.c_str(),
		(const char *)script_ptr, length);

		exit:
		if (script_base) {
		_env->ReleasePrimitiveArrayCritical(scriptRef, script_base,
		if (script_ptr) {
		_env->ReleasePrimitiveArrayCritical(scriptRef, script_ptr,
		_exception ? JNI_ABORT: 0);
		}
		}

		static jint
		nScriptCCreate(JNIEnv *_env, jobject _this, RsContext con, jstring packageName, jstring resName, jstring cacheDir)
		{
		LOG_API("nScriptCCreate, con(%p)", con);
		AutoJavaStringToUTF8 packageNameUTF(_env, packageName);
		AutoJavaStringToUTF8 resNameUTF(_env, resName);
		AutoJavaStringToUTF8 cacheDirUTF(_env, cacheDir);
		jint i = (jint)rsScriptCCreate(con, packageNameUTF.c_str(), resNameUTF.c_str(), cacheDirUTF.c_str());
		return i;
		return ret;
		}

		// ---------------------------------------------------------------------------
		@@ -1282,9 +1268,7 @@ static JNINativeMethod methods[] = {
		{"rsnScriptSetVarV", "(III[B)V", (void*)nScriptSetVarV },
		{"rsnScriptSetVarObj", "(IIII)V", (void*)nScriptSetVarObj },

		{"rsnScriptCBegin", "(I)V", (void*)nScriptCBegin },
		{"rsnScriptCSetScript", "(I[BII)V", (void*)nScriptCSetScript },
		{"rsnScriptCCreate", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)I", (void*)nScriptCCreate },
		{"rsnScriptCCreate", "(ILjava/lang/String;Ljava/lang/String;[BI)I", (void*)nScriptCCreate },

		{"rsnProgramStoreBegin", "(III)V", (void*)nProgramStoreBegin },
		{"rsnProgramStoreDepthFunc", "(II)V", (void*)nProgramStoreDepthFunc },

libs/rs/Android.mk

+3 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,9 @@ LOCAL_SRC_FILES:= \
		rsStream.cpp \
		rsThreadIO.cpp \
		rsType.cpp \
		rsVertexArray.cpp
		rsVertexArray.cpp \
		driver/rsdBcc.cpp \
		driver/rsdCore.cpp


		LOCAL_SHARED_LIBRARIES += libz libcutils libutils libEGL libGLESv1_CM libGLESv2 libui libbcc

libs/rs/RenderScript.h

+2 −293

Original line number	Diff line number	Diff line
		@@ -24,52 +24,7 @@
		extern "C" {
		#endif

		//////////////////////////////////////////////////////
		//

		typedef void * RsAsyncVoidPtr;

		typedef void * RsAdapter1D;
		typedef void * RsAdapter2D;
		typedef void * RsAllocation;
		typedef void * RsAnimation;
		typedef void * RsContext;
		typedef void * RsDevice;
		typedef void * RsElement;
		typedef void * RsFile;
		typedef void * RsFont;
		typedef void * RsSampler;
		typedef void * RsScript;
		typedef void * RsMesh;
		typedef void * RsType;
		typedef void * RsObjectBase;

		typedef void * RsProgram;
		typedef void * RsProgramVertex;
		typedef void * RsProgramFragment;
		typedef void * RsProgramStore;
		typedef void * RsProgramRaster;

		typedef void (* RsBitmapCallback_t)(void *);

		enum RsDeviceParam {
		RS_DEVICE_PARAM_FORCE_SOFTWARE_GL,
		RS_DEVICE_PARAM_COUNT
		};

		typedef struct {
		uint32_t colorMin;
		uint32_t colorPref;
		uint32_t alphaMin;
		uint32_t alphaPref;
		uint32_t depthMin;
		uint32_t depthPref;
		uint32_t stencilMin;
		uint32_t stencilPref;
		uint32_t samplesMin;
		uint32_t samplesPref;
		float samplesQ;
		} RsSurfaceConfig;
		#include "RenderScriptDefines.h"

		RsDevice rsDeviceCreate();
		void rsDeviceDestroy(RsDevice);
		@@ -80,258 +35,12 @@ RsContext rsContextCreateGL(RsDevice, uint32_t version,
		RsSurfaceConfig sc, uint32_t dpi);
		void rsContextDestroy(RsContext);

		enum RsMessageToClientType {
		RS_MESSAGE_TO_CLIENT_NONE = 0,
		RS_MESSAGE_TO_CLIENT_EXCEPTION = 1,
		RS_MESSAGE_TO_CLIENT_RESIZE = 2,
		RS_MESSAGE_TO_CLIENT_ERROR = 3,
		RS_MESSAGE_TO_CLIENT_USER = 4
		};

		RsMessageToClientType rsContextGetMessage(RsContext vrsc, void data, size_t receiveLen, uint32_t *subID, size_t bufferLen, bool wait);
		RsMessageToClientType rsContextPeekMessage(RsContext vrsc, size_t receiveLen, uint32_t subID, bool wait);
		void rsContextInitToClient(RsContext);
		void rsContextDeinitToClient(RsContext);

		#define RS_MAX_TEXTURE 2
		#define RS_MAX_ATTRIBS 16


		enum RsAllocationUsageType {
		RS_ALLOCATION_USAGE_SCRIPT = 0x0001,
		RS_ALLOCATION_USAGE_GRAPHICS_TEXTURE = 0x0002,
		RS_ALLOCATION_USAGE_GRAPHICS_VERTEX = 0x0004,
		RS_ALLOCATION_USAGE_GRAPHICS_CONSTANTS = 0x0008,

		RS_ALLOCATION_USAGE_ALL = 0x000F
		};

		enum RsAllocationMipmapControl {
		RS_ALLOCATION_MIPMAP_NONE = 0,
		RS_ALLOCATION_MIPMAP_FULL = 1,
		RS_ALLOCATION_MIPMAP_ON_SYNC_TO_TEXTURE = 2
		};

		enum RsAllocationCubemapFace {
		RS_ALLOCATION_CUBMAP_FACE_POSITVE_X = 0,
		RS_ALLOCATION_CUBMAP_FACE_NEGATIVE_X = 1,
		RS_ALLOCATION_CUBMAP_FACE_POSITVE_Y = 2,
		RS_ALLOCATION_CUBMAP_FACE_NEGATIVE_Y = 3,
		RS_ALLOCATION_CUBMAP_FACE_POSITVE_Z = 4,
		RS_ALLOCATION_CUBMAP_FACE_NEGATIVE_Z = 5
		};

		enum RsDataType {
		RS_TYPE_NONE,
		RS_TYPE_FLOAT_16,
		RS_TYPE_FLOAT_32,
		RS_TYPE_FLOAT_64,
		RS_TYPE_SIGNED_8,
		RS_TYPE_SIGNED_16,
		RS_TYPE_SIGNED_32,
		RS_TYPE_SIGNED_64,
		RS_TYPE_UNSIGNED_8,
		RS_TYPE_UNSIGNED_16,
		RS_TYPE_UNSIGNED_32,
		RS_TYPE_UNSIGNED_64,

		RS_TYPE_BOOLEAN,

		RS_TYPE_UNSIGNED_5_6_5,
		RS_TYPE_UNSIGNED_5_5_5_1,
		RS_TYPE_UNSIGNED_4_4_4_4,

		RS_TYPE_MATRIX_4X4,
		RS_TYPE_MATRIX_3X3,
		RS_TYPE_MATRIX_2X2,

		RS_TYPE_ELEMENT = 1000,
		RS_TYPE_TYPE,
		RS_TYPE_ALLOCATION,
		RS_TYPE_SAMPLER,
		RS_TYPE_SCRIPT,
		RS_TYPE_MESH,
		RS_TYPE_PROGRAM_FRAGMENT,
		RS_TYPE_PROGRAM_VERTEX,
		RS_TYPE_PROGRAM_RASTER,
		RS_TYPE_PROGRAM_STORE,
		};

		enum RsDataKind {
		RS_KIND_USER,

		RS_KIND_PIXEL_L = 7,
		RS_KIND_PIXEL_A,
		RS_KIND_PIXEL_LA,
		RS_KIND_PIXEL_RGB,
		RS_KIND_PIXEL_RGBA,
		};

		enum RsSamplerParam {
		RS_SAMPLER_MIN_FILTER,
		RS_SAMPLER_MAG_FILTER,
		RS_SAMPLER_WRAP_S,
		RS_SAMPLER_WRAP_T,
		RS_SAMPLER_WRAP_R,
		RS_SAMPLER_ANISO
		};

		enum RsSamplerValue {
		RS_SAMPLER_NEAREST,
		RS_SAMPLER_LINEAR,
		RS_SAMPLER_LINEAR_MIP_LINEAR,
		RS_SAMPLER_WRAP,
		RS_SAMPLER_CLAMP,
		RS_SAMPLER_LINEAR_MIP_NEAREST,
		};

		enum RsTextureTarget {
		RS_TEXTURE_2D,
		RS_TEXTURE_CUBE
		};

		enum RsDimension {
		RS_DIMENSION_X,
		RS_DIMENSION_Y,
		RS_DIMENSION_Z,
		RS_DIMENSION_LOD,
		RS_DIMENSION_FACE,

		RS_DIMENSION_ARRAY_0 = 100,
		RS_DIMENSION_ARRAY_1,
		RS_DIMENSION_ARRAY_2,
		RS_DIMENSION_ARRAY_3,
		RS_DIMENSION_MAX = RS_DIMENSION_ARRAY_3
		};

		enum RsDepthFunc {
		RS_DEPTH_FUNC_ALWAYS,
		RS_DEPTH_FUNC_LESS,
		RS_DEPTH_FUNC_LEQUAL,
		RS_DEPTH_FUNC_GREATER,
		RS_DEPTH_FUNC_GEQUAL,
		RS_DEPTH_FUNC_EQUAL,
		RS_DEPTH_FUNC_NOTEQUAL
		};

		enum RsBlendSrcFunc {
		RS_BLEND_SRC_ZERO, // 0
		RS_BLEND_SRC_ONE, // 1
		RS_BLEND_SRC_DST_COLOR, // 2
		RS_BLEND_SRC_ONE_MINUS_DST_COLOR, // 3
		RS_BLEND_SRC_SRC_ALPHA, // 4
		RS_BLEND_SRC_ONE_MINUS_SRC_ALPHA, // 5
		RS_BLEND_SRC_DST_ALPHA, // 6
		RS_BLEND_SRC_ONE_MINUS_DST_ALPHA, // 7
		RS_BLEND_SRC_SRC_ALPHA_SATURATE // 8
		};

		enum RsBlendDstFunc {
		RS_BLEND_DST_ZERO, // 0
		RS_BLEND_DST_ONE, // 1
		RS_BLEND_DST_SRC_COLOR, // 2
		RS_BLEND_DST_ONE_MINUS_SRC_COLOR, // 3
		RS_BLEND_DST_SRC_ALPHA, // 4
		RS_BLEND_DST_ONE_MINUS_SRC_ALPHA, // 5
		RS_BLEND_DST_DST_ALPHA, // 6
		RS_BLEND_DST_ONE_MINUS_DST_ALPHA // 7
		};

		enum RsTexEnvMode {
		RS_TEX_ENV_MODE_NONE,
		RS_TEX_ENV_MODE_REPLACE,
		RS_TEX_ENV_MODE_MODULATE,
		RS_TEX_ENV_MODE_DECAL
		};

		enum RsProgramParam {
		RS_PROGRAM_PARAM_INPUT,
		RS_PROGRAM_PARAM_OUTPUT,
		RS_PROGRAM_PARAM_CONSTANT,
		RS_PROGRAM_PARAM_TEXTURE_TYPE,
		};

		enum RsPrimitive {
		RS_PRIMITIVE_POINT,
		RS_PRIMITIVE_LINE,
		RS_PRIMITIVE_LINE_STRIP,
		RS_PRIMITIVE_TRIANGLE,
		RS_PRIMITIVE_TRIANGLE_STRIP,
		RS_PRIMITIVE_TRIANGLE_FAN
		};

		enum RsError {
		RS_ERROR_NONE = 0,
		RS_ERROR_BAD_SHADER = 1,
		RS_ERROR_BAD_SCRIPT = 2,
		RS_ERROR_BAD_VALUE = 3,
		RS_ERROR_OUT_OF_MEMORY = 4,
		RS_ERROR_DRIVER = 5,

		RS_ERROR_FATAL_UNKNOWN = 0x1000,
		RS_ERROR_FATAL_DRIVER = 0x1001,
		RS_ERROR_FATAL_PROGRAM_LINK = 0x1002
		};

		enum RsAnimationInterpolation {
		RS_ANIMATION_INTERPOLATION_STEP,
		RS_ANIMATION_INTERPOLATION_LINEAR,
		RS_ANIMATION_INTERPOLATION_BEZIER,
		RS_ANIMATION_INTERPOLATION_CARDINAL,
		RS_ANIMATION_INTERPOLATION_HERMITE,
		RS_ANIMATION_INTERPOLATION_BSPLINE
		};

		enum RsAnimationEdge {
		RS_ANIMATION_EDGE_UNDEFINED,
		RS_ANIMATION_EDGE_CONSTANT,
		RS_ANIMATION_EDGE_GRADIENT,
		RS_ANIMATION_EDGE_CYCLE,
		RS_ANIMATION_EDGE_OSCILLATE,
		RS_ANIMATION_EDGE_CYLE_RELATIVE
		};

		enum RsA3DClassID {
		RS_A3D_CLASS_ID_UNKNOWN,
		RS_A3D_CLASS_ID_MESH,
		RS_A3D_CLASS_ID_TYPE,
		RS_A3D_CLASS_ID_ELEMENT,
		RS_A3D_CLASS_ID_ALLOCATION,
		RS_A3D_CLASS_ID_PROGRAM_VERTEX,
		RS_A3D_CLASS_ID_PROGRAM_RASTER,
		RS_A3D_CLASS_ID_PROGRAM_FRAGMENT,
		RS_A3D_CLASS_ID_PROGRAM_STORE,
		RS_A3D_CLASS_ID_SAMPLER,
		RS_A3D_CLASS_ID_ANIMATION,
		RS_A3D_CLASS_ID_ADAPTER_1D,
		RS_A3D_CLASS_ID_ADAPTER_2D,
		RS_A3D_CLASS_ID_SCRIPT_C
		};

		enum RsCullMode {
		RS_CULL_BACK,
		RS_CULL_FRONT,
		RS_CULL_NONE
		};

		typedef struct {
		RsA3DClassID classID;
		const char* objectName;
		} RsFileIndexEntry;

		// Script to Script
		typedef struct {
		uint32_t xStart;
		uint32_t xEnd;
		uint32_t yStart;
		uint32_t yEnd;
		uint32_t zStart;
		uint32_t zEnd;
		uint32_t arrayStart;
		uint32_t arrayEnd;

		} RsScriptCall;

		//
		// A3D loading and object update code.
		// Should only be called at object creation, not thread safe
		RsObjectBase rsaFileA3DGetEntryByIndex(RsContext, uint32_t idx, RsFile);