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

Merge "Move allocateBuffers to RT" into pi-dev

Browse Source 
am: 2f8a3a4bb8

Change-Id: I6c8f84406a40fa324a4486f71fccf01f6acfe60a
This commit is contained in:
Jorim Jaggi
2018-07-18 15:06:29 -07:00
committed by android-build-merger
parent 08f22c1e2d 2f8a3a4bb8
commit c9756c9193
5 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/view/ThreadedRenderer.java
View File

@@ -961,6 +961,10 @@ public final class ThreadedRenderer {
nSetDebuggingEnabled(enable);
}
void allocateBuffers(Surface surface) {
nAllocateBuffers(mNativeProxy, surface);
}
@Override
protected void finalize() throws Throwable {
try {
@@ -1251,4 +1255,5 @@ public final class ThreadedRenderer {
private static native void nSetDebuggingEnabled(boolean enabled);
private static native void nSetIsolatedProcess(boolean enabled);
private static native void nSetContextPriority(int priority);
private static native void nAllocateBuffers(long nativeProxy, Surface window);
}

2
core/java/android/view/ViewRootImpl.java
View File

@@ -2103,7 +2103,7 @@ public final class ViewRootImpl implements ViewParent,
& View.PFLAG_REQUEST_TRANSPARENT_REGIONS) == 0) {
// Don't pre-allocate if transparent regions
// are requested as they may not be needed
mSurface.allocateBuffers();
mAttachInfo.mThreadedRenderer.allocateBuffers(mSurface);
}
} catch (OutOfResourcesException e) {
handleOutOfResourcesException(e);

8
core/jni/android_view_ThreadedRenderer.cpp
View File

@@ -1060,6 +1060,13 @@ static void android_view_ThreadedRenderer_setContextPriority(JNIEnv*, jclass,
Properties::contextPriority = contextPriority;
}
static void android_view_ThreadedRenderer_allocateBuffers(JNIEnv* env, jobject clazz,
jlong proxyPtr, jobject jsurface) {
RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);
sp<Surface> surface = android_view_Surface_getSurface(env, jsurface);
proxy->allocateBuffers(surface);
}
// ----------------------------------------------------------------------------
// FrameMetricsObserver
// ----------------------------------------------------------------------------
@@ -1173,6 +1180,7 @@ static const JNINativeMethod gMethods[] = {
{ "nSetDebuggingEnabled", "(Z)V", (void*)android_view_ThreadedRenderer_setDebuggingEnabled },
{ "nSetIsolatedProcess", "(Z)V", (void*)android_view_ThreadedRenderer_setIsolatedProcess },
{ "nSetContextPriority", "(I)V", (void*)android_view_ThreadedRenderer_setContextPriority },
{ "nAllocateBuffers", "(JLandroid/view/Surface;)V", (void*)android_view_ThreadedRenderer_allocateBuffers },
};
static JavaVM* mJvm = nullptr;

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

@@ -87,6 +87,11 @@ void RenderProxy::initialize(const sp<Surface>& surface) {
[ this, surf = surface ]() mutable { mContext->setSurface(std::move(surf)); });
}
void RenderProxy::allocateBuffers(const sp<Surface>& surface) {
mRenderThread.queue().post(
[ surf = surface ]() mutable { surf->allocateBuffers(); });
}
void RenderProxy::updateSurface(const sp<Surface>& surface) {
mRenderThread.queue().post(
[ this, surf = surface ]() mutable { mContext->setSurface(std::move(surf)); });

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

@@ -70,6 +70,7 @@ public:
ANDROID_API void setName(const char* name);
ANDROID_API void initialize(const sp<Surface>& surface);
ANDROID_API void allocateBuffers(const sp<Surface>& surface);
ANDROID_API void updateSurface(const sp<Surface>& surface);
ANDROID_API bool pauseSurface(const sp<Surface>& surface);
ANDROID_API void setStopped(bool stopped);