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

Merge "fix race condition between HWUI cache and renderThread"

Browse Source
This commit is contained in:
John Reck
2016-01-19 18:29:30 +00:00
committed by Gerrit Code Review
parent dbf8c17bd2 c0a0e1a66d
commit 2c2b5e8514
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/android_view_DisplayListCanvas.cpp
View File

@ -102,10 +102,16 @@ static void android_view_DisplayListCanvas_callDrawGLFunction(JNIEnv* env, jobje
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
static jint android_view_DisplayListCanvas_getMaxTextureWidth(JNIEnv* env, jobject clazz) { static jint android_view_DisplayListCanvas_getMaxTextureWidth(JNIEnv* env, jobject clazz) {
if (!Caches::hasInstance()) {
android::uirenderer::renderthread::RenderProxy::staticFence();
}
return Caches::getInstance().maxTextureSize; return Caches::getInstance().maxTextureSize;
} }
static jint android_view_DisplayListCanvas_getMaxTextureHeight(JNIEnv* env, jobject clazz) { static jint android_view_DisplayListCanvas_getMaxTextureHeight(JNIEnv* env, jobject clazz) {
if (!Caches::hasInstance()) {
android::uirenderer::renderthread::RenderProxy::staticFence();
}
return Caches::getInstance().maxTextureSize; return Caches::getInstance().maxTextureSize;
} }

6
libs/hwui/renderthread/RenderProxy.cpp
View File

@ -385,6 +385,12 @@ void RenderProxy::fence() {
postAndWait(task); postAndWait(task);
} }
void RenderProxy::staticFence() {
SETUP_TASK(fence);
UNUSED(args);
staticPostAndWait(task);
}
CREATE_BRIDGE1(stopDrawing, CanvasContext* context) { CREATE_BRIDGE1(stopDrawing, CanvasContext* context) {
args->context->stopDrawing(); args->context->stopDrawing();
return nullptr; return nullptr;

1
libs/hwui/renderthread/RenderProxy.h
View File

@ -94,6 +94,7 @@ public:
ANDROID_API static void overrideProperty(const char* name, const char* value); ANDROID_API static void overrideProperty(const char* name, const char* value);
ANDROID_API void fence(); ANDROID_API void fence();
ANDROID_API static void staticFence();
ANDROID_API void stopDrawing(); ANDROID_API void stopDrawing();
ANDROID_API void notifyFramePending(); ANDROID_API void notifyFramePending();