Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43fe6fcd authored by Alec Mouri's avatar Alec Mouri
Browse files

[HWUI] Remove references to gui/Surface. 

ANativeWindow usage now has enough feature parity so that we can use
that instead.

Bug: 137012798
Test: builds
Test: Scroll through settings
Change-Id: I0054315058b28bcb5e779a6f71a3cfb164625a5f
parent 112dfb3f

core/jni/android_view_ThreadedRenderer.cpp

+37 −30
Original line number Diff line number Diff line
@@ -17,40 +17,36 @@ 
#define LOG_TAG "ThreadedRenderer"

#define ATRACE_TAG ATRACE_TAG_VIEW



#include <algorithm>

#include <atomic>

#include <inttypes.h>



#include "jni.h"

#include <nativehelper/JNIHelp.h>

#include "core_jni_helpers.h"

#include <FrameInfo.h>

#include <GraphicsJNI.h>



#include <Picture.h>

#include <Properties.h>

#include <RootRenderNode.h>

#include <dlfcn.h>

#include <gui/BufferItemConsumer.h>

#include <gui/BufferQueue.h>

#include <gui/Surface.h>



#include "android_graphics_HardwareRendererObserver.h"



#include <inttypes.h>

#include <nativehelper/JNIHelp.h>

#include <pipeline/skia/ShaderCache.h>

#include <private/EGL/cache.h>



#include <utils/RefBase.h>

#include <utils/StrongPointer.h>

#include <utils/Timers.h>

#include <utils/TraceUtils.h>

#include <android_runtime/android_view_Surface.h>

#include <system/window.h>



#include <FrameInfo.h>

#include <Picture.h>

#include <Properties.h>

#include <RootRenderNode.h>

#include <renderthread/CanvasContext.h>

#include <renderthread/RenderProxy.h>

#include <renderthread/RenderTask.h>

#include <renderthread/RenderThread.h>

#include <pipeline/skia/ShaderCache.h>

#include <system/window.h>

#include <utils/Color.h>

#include <utils/RefBase.h>

#include <utils/StrongPointer.h>

#include <utils/Timers.h>

#include <utils/TraceUtils.h>



#include <algorithm>

#include <atomic>



#include "android_graphics_HardwareRendererObserver.h"

#include "core_jni_helpers.h"

#include "jni.h"



namespace android {
@@ -78,6 +74,9 @@ static JNIEnv* getenv(JavaVM* vm) { 
    return env;

}



typedef ANativeWindow* (*ANW_fromSurface)(JNIEnv* env, jobject surface);

ANW_fromSurface fromSurface;



class JvmErrorReporter : public ErrorHandler {

public:

    JvmErrorReporter(JNIEnv* env) {
@@ -178,9 +177,9 @@ static void android_view_ThreadedRenderer_setName(JNIEnv* env, jobject clazz, 
static void android_view_ThreadedRenderer_setSurface(JNIEnv* env, jobject clazz,

        jlong proxyPtr, jobject jsurface, jboolean discardBuffer) {

    RenderProxy* proxy = reinterpret_cast<RenderProxy*>(proxyPtr);

    sp<Surface> surface;

    ANativeWindow* window = nullptr;

    if (jsurface) {

        surface = android_view_Surface_getSurface(env, jsurface);

        window = fromSurface(env, jsurface);

    }

    bool enableTimeout = true;

    if (discardBuffer) {
@@ -188,7 +187,7 @@ static void android_view_ThreadedRenderer_setSurface(JNIEnv* env, jobject clazz, 
        enableTimeout = false;

        proxy->setSwapBehavior(SwapBehavior::kSwap_discardBuffer);

    }

    proxy->setSurface(surface, enableTimeout);

    proxy->setSurface(window, enableTimeout);

}



static jboolean android_view_ThreadedRenderer_pause(JNIEnv* env, jobject clazz,
@@ -458,8 +457,10 @@ static jint android_view_ThreadedRenderer_copySurfaceInto(JNIEnv* env, 
        jint right, jint bottom, jlong bitmapPtr) {

    SkBitmap bitmap;

    bitmap::toBitmap(bitmapPtr).getSkBitmap(&bitmap);

    sp<Surface> surface = android_view_Surface_getSurface(env, jsurface);

    return RenderProxy::copySurfaceInto(surface, left, top, right, bottom, &bitmap);

    ANativeWindow* window = fromSurface(env, jsurface);

    jint result = RenderProxy::copySurfaceInto(window, left, top, right, bottom, &bitmap);

    ANativeWindow_release(window);

    return result;

}



class ContextFactory : public IContextFactory {
@@ -480,6 +481,7 @@ static jobject android_view_ThreadedRenderer_createHardwareBitmapFromRenderNode( 
    uint32_t width = jwidth;

    uint32_t height = jheight;



    // TODO: should this be generated from an AImageReader?

    // Create a Surface wired up to a BufferItemConsumer

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> rawConsumer;
@@ -496,7 +498,7 @@ static jobject android_view_ThreadedRenderer_createHardwareBitmapFromRenderNode( 
        ContextFactory factory;

        RenderProxy proxy{true, renderNode, &factory};

        proxy.setSwapBehavior(SwapBehavior::kSwap_discardBuffer);

        proxy.setSurface(surface);

        proxy.setSurface(surface.get());

        // Shadows can't be used via this interface, so just set the light source

        // to all 0s.

        proxy.setLightAlpha(0, 0);
@@ -722,6 +724,11 @@ int register_android_view_ThreadedRenderer(JNIEnv* env) { 
    gFrameCompleteCallback.onFrameComplete = GetMethodIDOrDie(env, frameCompleteClass,

            "onFrameComplete", "(J)V");



    void* handle_ = dlopen("libandroid.so", RTLD_NOW | RTLD_NODELETE);

    fromSurface = (ANW_fromSurface)dlsym(handle_, "ANativeWindow_fromSurface");

    LOG_ALWAYS_FATAL_IF(fromSurface == nullptr,

                        "Failed to find required symbol ANativeWindow_fromSurface!");



    return RegisterMethodsOrDie(env, kClassPathName, gMethods, NELEM(gMethods));

}

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h

+3 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ 


#pragma once



#include "SkiaPipeline.h"

#include <EGL/egl.h>

#include <system/window.h>



#include "SkiaPipeline.h"

#include "renderstate/RenderState.h"



namespace android {

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+7 −6
Original line number Diff line number Diff line
@@ -24,18 +24,19 @@ 
#include <SkOverdrawColorFilter.h>

#include <SkPicture.h>

#include <SkPictureRecorder.h>

#include <SkTypeface.h>

#include <SkSerialProcs.h>

#include <SkTypeface.h>

#include <android-base/properties.h>

#include <unistd.h>



#include <sstream>



#include "LightingInfo.h"

#include "VectorDrawable.h"

#include "thread/CommonPool.h"

#include "tools/SkSharingProc.h"

#include "utils/TraceUtils.h"

#include "utils/String8.h"



#include <unistd.h>



#include <android-base/properties.h>

#include "utils/TraceUtils.h"



using namespace android::uirenderer::renderthread;

libs/hwui/renderthread/CanvasContext.cpp

+5 −5
Original line number Diff line number Diff line
@@ -139,15 +139,15 @@ void CanvasContext::destroy() { 
    mAnimationContext->destroy();

}



void CanvasContext::setSurface(sp<Surface>&& surface, bool enableTimeout) {

void CanvasContext::setSurface(ANativeWindow* window, bool enableTimeout) {

    ATRACE_CALL();



    if (surface) {

        mNativeSurface = std::make_unique<ReliableSurface>(std::move(surface));

    if (window) {

        mNativeSurface = std::make_unique<ReliableSurface>(window);

        mNativeSurface->init();

        if (enableTimeout) {

            // TODO: Fix error handling & re-shorten timeout

            ANativeWindow_setDequeueTimeout(mNativeSurface->getNativeWindow(), 4000_ms);

            ANativeWindow_setDequeueTimeout(window, 4000_ms);

        }

    } else {

        mNativeSurface = nullptr;
@@ -167,7 +167,7 @@ void CanvasContext::setSurface(sp<Surface>&& surface, bool enableTimeout) { 


    mFrameNumber = -1;



    if (hasSurface) {

    if (window != nullptr && hasSurface) {

        mHaveNewSurface = true;

        mSwapHistory.clear();

        // Enable frame stats after the surface has been bound to the appropriate graphics API.

libs/hwui/renderthread/CanvasContext.h

+1 −2
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <SkRect.h>

#include <SkSize.h>

#include <cutils/compiler.h>

#include <gui/Surface.h>

#include <utils/Functor.h>



#include <functional>
@@ -111,7 +110,7 @@ public: 
    // Won't take effect until next EGLSurface creation

    void setSwapBehavior(SwapBehavior swapBehavior);



    void setSurface(sp<Surface>&& surface, bool enableTimeout = true);

    void setSurface(ANativeWindow* window, bool enableTimeout = true);

    bool pauseSurface();

    void setStopped(bool stopped);

    bool hasSurface() const { return mNativeSurface.get(); }