Commit edf3e1fa authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger

Merge "Move allocateBuffers to RT" into pi-dev am: 2f8a3a4b

am: c9756c91

Change-Id: Ieed40312fe16a54c3e1974621b53e29b23ddcdbc
parents 101dc018 c9756c91
......@@ -955,6 +955,10 @@ public final class ThreadedRenderer {
nSetDebuggingEnabled(enable);
}
void allocateBuffers(Surface surface) {
nAllocateBuffers(mNativeProxy, surface);
}
@Override
protected void finalize() throws Throwable {
try {
......@@ -1243,4 +1247,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);
}
......@@ -2101,7 +2101,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);
......
......@@ -1054,6 +1054,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
// ----------------------------------------------------------------------------
......@@ -1166,6 +1173,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;
......
......@@ -85,6 +85,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)); });
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment