diff options
| author | Jason Sams <rjsams@android.com> | 2009-08-25 11:34:49 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-08-25 11:44:30 -0700 |
| commit | b13ada5071f55c96054c47bbd88d8801cd2c0f15 (patch) | |
| tree | 652b6ca78a53aafaa7c6c3ceb7229a3d6aab43db /graphics | |
| parent | dbade9d6a075b1d5b8ebe10ee8961a5de296c93b (diff) | |
| download | frameworks_base-b13ada5071f55c96054c47bbd88d8801cd2c0f15.zip frameworks_base-b13ada5071f55c96054c47bbd88d8801cd2c0f15.tar.gz frameworks_base-b13ada5071f55c96054c47bbd88d8801cd2c0f15.tar.bz2 | |
Add support for selecting the color bit depth and if the application used a depth buffer.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/RSSurfaceView.java | 7 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 6 | ||||
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 6 |
3 files changed, 8 insertions, 11 deletions
diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/graphics/java/android/renderscript/RSSurfaceView.java index a4be171..792b98d 100644 --- a/graphics/java/android/renderscript/RSSurfaceView.java +++ b/graphics/java/android/renderscript/RSSurfaceView.java @@ -141,15 +141,12 @@ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback // ---------------------------------------------------------------------- - public RenderScript createRenderScript() { - Log.v(RenderScript.LOG_TAG, "createRenderScript 1"); + public RenderScript createRenderScript(boolean useDepth) { Surface sur = null; while ((sur == null) || (mSurfaceHolder == null)) { sur = getHolder().getSurface(); } - Log.v(RenderScript.LOG_TAG, "createRenderScript 2"); - RenderScript rs = new RenderScript(sur); - Log.v(RenderScript.LOG_TAG, "createRenderScript 3 rs"); + RenderScript rs = new RenderScript(sur, useDepth); return rs; } diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 1bdabe7..01926e9 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -60,7 +60,7 @@ public class RenderScript { native int nDeviceCreate(); native void nDeviceDestroy(int dev); - native int nContextCreate(int dev, Surface sur, int ver); + native int nContextCreate(int dev, Surface sur, int ver, boolean useDepth); native void nContextDestroy(int con); //void rsContextBindSampler (uint32_t slot, RsSampler sampler); @@ -194,10 +194,10 @@ public class RenderScript { /////////////////////////////////////////////////////////////////////////////////// // - public RenderScript(Surface sur) { + public RenderScript(Surface sur, boolean useDepth) { mSurface = sur; mDev = nDeviceCreate(); - mContext = nContextCreate(mDev, mSurface, 0); + mContext = nContextCreate(mDev, mSurface, 0, useDepth); // TODO: This should be protected by a lock if(!mElementsInitialized) { diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index fede0e5..2393f74 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -126,7 +126,7 @@ nDeviceDestroy(JNIEnv *_env, jobject _this, jint dev) } static jint -nContextCreate(JNIEnv *_env, jobject _this, jint dev, jobject wnd, jint ver) +nContextCreate(JNIEnv *_env, jobject _this, jint dev, jobject wnd, jint ver, jboolean useDepth) { LOG_API("nContextCreate"); @@ -142,7 +142,7 @@ nContextCreate(JNIEnv *_env, jobject _this, jint dev, jobject wnd, jint ver) if (window == NULL) goto not_valid_surface; - return (jint)rsContextCreate((RsDevice)dev, window, ver); + return (jint)rsContextCreate((RsDevice)dev, window, ver, useDepth); } static void @@ -1206,7 +1206,7 @@ static JNINativeMethod methods[] = { {"_nInit", "()V", (void*)_nInit }, {"nDeviceCreate", "()I", (void*)nDeviceCreate }, {"nDeviceDestroy", "(I)V", (void*)nDeviceDestroy }, -{"nContextCreate", "(ILandroid/view/Surface;I)I", (void*)nContextCreate }, +{"nContextCreate", "(ILandroid/view/Surface;IZ)I", (void*)nContextCreate }, {"nContextDestroy", "(I)V", (void*)nContextDestroy }, {"nAssignName", "(I[B)V", (void*)nAssignName }, {"nObjDestroy", "(I)V", (void*)nObjDestroy }, |