drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ceec31b7: Merge changes I5a218ca1,I853a76d9

Browse Source 
* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
  Refactoring: Rename SurfaceTextureClient to Surface
  clean-up following Surface split
This commit is contained in:
Mathias Agopian
2013-02-15 14:28:22 -08:00
committed by Android Git Automerger
parent df93fdb6c0 ceec31b7da
commit 76f56dd598
28 changed files with 299 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/jni/android_renderscript_RenderScript.cpp
View File

@ -43,7 +43,7 @@
#include <rsEnv.h>
#include <gui/Surface.h>
#include <gui/GLConsumer.h>
#include <gui/SurfaceTextureClient.h>
#include <gui/Surface.h>
#include <android_runtime/android_graphics_SurfaceTexture.h>
//#define LOG_API ALOGE
@ -247,7 +247,7 @@ nContextSetSurfaceTexture(JNIEnv *_env, jobject _this, RsContext con, jint width
} else {
st = SurfaceTexture_getSurfaceTexture(_env, sur);
window = new SurfaceTextureClient(st->getBufferQueue());
window = new Surface(st->getBufferQueue());
}
rsContextSetSurface(con, width, height, window.get());