diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-08-26 02:47:39 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2012-08-27 14:34:54 -0700 |
| commit | 64a55af0ac700baecb0877235eb42caac59a3560 (patch) | |
| tree | 0f3c36ce8204e6cf8eedf04ce9ae24373239ddd8 /graphics | |
| parent | 0b722fe9ce98d97dbcb6fefd170b85ab7037e528 (diff) | |
| download | frameworks_base-64a55af0ac700baecb0877235eb42caac59a3560.zip frameworks_base-64a55af0ac700baecb0877235eb42caac59a3560.tar.gz frameworks_base-64a55af0ac700baecb0877235eb42caac59a3560.tar.bz2 | |
Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.
Added JNI for all of the new surface flinger display API calls.
Enforced the requirement that all Surfaces created by
the window manager be named.
Updated the display manager service to use the new methods.
Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/jni/android_renderscript_RenderScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp index a073c1a..2109a01 100644 --- a/graphics/jni/android_renderscript_RenderScript.cpp +++ b/graphics/jni/android_renderscript_RenderScript.cpp @@ -230,7 +230,7 @@ nContextSetSurface(JNIEnv *_env, jobject _this, RsContext con, jint width, jint if (wnd == NULL) { } else { - window = android_Surface_getNativeWindow(_env, wnd).get(); + window = android_view_Surface_getNativeWindow(_env, wnd).get(); } rsContextSetSurface(con, width, height, window); @@ -494,7 +494,7 @@ nAllocationSetSurface(JNIEnv *_env, jobject _this, RsContext con, RsAllocation a sp<Surface> s; if (sur != 0) { - s = Surface_getSurface(_env, sur); + s = android_view_Surface_getSurface(_env, sur); } rsAllocationSetSurface(con, alloc, static_cast<ANativeWindow *>(s.get())); |