Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix debug context."

Browse Source
This commit is contained in:
Tim Murray
2014-02-03 22:37:06 +00:00
committed by Gerrit Code Review
parent 0539b7b411 b75c27e870
commit 0cc37f4cde
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rs/jni/android_renderscript_RenderScript.cpp
View File

@@ -224,28 +224,28 @@ nDeviceCreate(JNIEnv *_env, jobject _this)
} }
static void static void
nDeviceDestroy(JNIEnv *_env, jobject _this, jint dev) nDeviceDestroy(JNIEnv *_env, jobject _this, jlong dev)
{ {
LOG_API("nDeviceDestroy"); LOG_API("nDeviceDestroy");
return rsDeviceDestroy((RsDevice)dev); return rsDeviceDestroy((RsDevice)dev);
} }
static void static void
nDeviceSetConfig(JNIEnv *_env, jobject _this, jint dev, jint p, jint value) nDeviceSetConfig(JNIEnv *_env, jobject _this, jlong dev, jint p, jint value)
{ {
LOG_API("nDeviceSetConfig dev(%p), param(%i), value(%i)", (void *)dev, p, value); LOG_API("nDeviceSetConfig dev(%p), param(%i), value(%i)", (void *)dev, p, value);
return rsDeviceSetConfig((RsDevice)dev, (RsDeviceParam)p, value); return rsDeviceSetConfig((RsDevice)dev, (RsDeviceParam)p, value);
} }
static jlong static jlong
nContextCreate(JNIEnv *_env, jobject _this, jint dev, jint ver, jint sdkVer, jint ct) nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct)
{ {
LOG_API("nContextCreate"); LOG_API("nContextCreate");
return (jint)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0); return (jint)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0);
} }
static jlong static jlong
nContextCreateGL(JNIEnv *_env, jobject _this, jint dev, jint ver, jint sdkVer, nContextCreateGL(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer,
int colorMin, int colorPref, int colorMin, int colorPref,
int alphaMin, int alphaPref, int alphaMin, int alphaPref,
int depthMin, int depthPref, int depthMin, int depthPref,