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

Commit 1863d94e authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Ensure SkiaPipeline always has a valid colorspace. 

Previously we didn't assign a colorspace to the pipeline until it
was provided a surface to render into.  This resulted in undefined
behavior if the application attempted to render an offscreen layer
before the OS provided the main window with its surface. Now instead
of deferring setting whether or not the application is wide gamut we
do initialize it to a default setting when the pipeline is created.

Bug: 148042673
Test: apct/device_boot_health_check_extra_postsubmit
Change-Id: I84d743511e949ac977486470bb14eec936de7f88
parent 929de647

core/jni/android_view_ThreadedRenderer.cpp

+5 −3
Original line number Diff line number Diff line
@@ -147,10 +147,12 @@ static jlong android_view_ThreadedRenderer_createRootRenderNode(JNIEnv* env, job 
}



static jlong android_view_ThreadedRenderer_createProxy(JNIEnv* env, jobject clazz,

        jboolean translucent, jlong rootRenderNodePtr) {

        jboolean translucent, jboolean isWideGamut, jlong rootRenderNodePtr) {

    RootRenderNode* rootRenderNode = reinterpret_cast<RootRenderNode*>(rootRenderNodePtr);

    ContextFactoryImpl factory(rootRenderNode);

    return (jlong) new RenderProxy(translucent, rootRenderNode, &factory);

    RenderProxy* proxy = new RenderProxy(translucent, rootRenderNode, &factory);

    proxy->setWideGamut(isWideGamut);

    return (jlong) proxy;

}



static void android_view_ThreadedRenderer_deleteProxy(JNIEnv* env, jobject clazz,
@@ -627,7 +629,7 @@ static const JNINativeMethod gMethods[] = { 
    { "nSetProcessStatsBuffer", "(I)V", (void*) android_view_ThreadedRenderer_setProcessStatsBuffer },

    { "nGetRenderThreadTid", "(J)I", (void*) android_view_ThreadedRenderer_getRenderThreadTid },

    { "nCreateRootRenderNode", "()J", (void*) android_view_ThreadedRenderer_createRootRenderNode },

    { "nCreateProxy", "(ZJ)J", (void*) android_view_ThreadedRenderer_createProxy },

    { "nCreateProxy", "(ZZJ)J", (void*) android_view_ThreadedRenderer_createProxy },

    { "nDeleteProxy", "(J)V", (void*) android_view_ThreadedRenderer_deleteProxy },

    { "nLoadSystemProperties", "(J)Z", (void*) android_view_ThreadedRenderer_loadSystemProperties },

    { "nSetName", "(JLjava/lang/String;)V", (void*) android_view_ThreadedRenderer_setName },

graphics/java/android/graphics/HardwareRenderer.java

+3 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ public class HardwareRenderer { 
    public HardwareRenderer() {

        mRootNode = RenderNode.adopt(nCreateRootRenderNode());

        mRootNode.setClipToBounds(false);

        mNativeProxy = nCreateProxy(!mOpaque, mRootNode.mNativeRenderNode);

        mNativeProxy = nCreateProxy(!mOpaque, mIsWideGamut, mRootNode.mNativeRenderNode);

        if (mNativeProxy == 0) {

            throw new OutOfMemoryError("Unable to create hardware renderer");

        }
@@ -1085,7 +1085,8 @@ public class HardwareRenderer { 


    private static native long nCreateRootRenderNode();



    private static native long nCreateProxy(boolean translucent, long rootRenderNode);

    private static native long nCreateProxy(boolean translucent, boolean isWideGamut,

            long rootRenderNode);



    private static native void nDeleteProxy(long nativeProxy);

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+2 −4
Original line number Diff line number Diff line
@@ -171,17 +171,15 @@ static void setBufferCount(ANativeWindow* window, uint32_t extraBuffers) { 
}



bool SkiaOpenGLPipeline::setSurface(ANativeWindow* surface, SwapBehavior swapBehavior,

                                    ColorMode colorMode, uint32_t extraBuffers) {

                                    uint32_t extraBuffers) {

    if (mEglSurface != EGL_NO_SURFACE) {

        mEglManager.destroySurface(mEglSurface);

        mEglSurface = EGL_NO_SURFACE;

    }



    setSurfaceColorProperties(colorMode);



    if (surface) {

        mRenderThread.requireGlContext();

        auto newSurface = mEglManager.createSurface(surface, colorMode, mSurfaceColorSpace);

        auto newSurface = mEglManager.createSurface(surface, mColorMode, mSurfaceColorSpace);

        if (!newSurface) {

            return false;

        }

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.h

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public: 
                     FrameInfo* currentFrameInfo, bool* requireSwap) override;

    DeferredLayerUpdater* createTextureLayer() override;

    bool setSurface(ANativeWindow* surface, renderthread::SwapBehavior swapBehavior,

                    renderthread::ColorMode colorMode, uint32_t extraBuffers) override;

                    uint32_t extraBuffers) override;

    void onStop() override;

    bool isSurfaceReady() override;

    bool isContextReady() override;

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ namespace uirenderer { 
namespace skiapipeline {



SkiaPipeline::SkiaPipeline(RenderThread& thread) : mRenderThread(thread) {

    setSurfaceColorProperties(mColorMode);

}



SkiaPipeline::~SkiaPipeline() {
@@ -584,6 +585,7 @@ void SkiaPipeline::dumpResourceCacheUsage() const { 
}



void SkiaPipeline::setSurfaceColorProperties(ColorMode colorMode) {

    mColorMode = colorMode;

    if (colorMode == ColorMode::SRGB) {

        mSurfaceColorType = SkColorType::kN32_SkColorType;

        mSurfaceColorSpace = SkColorSpace::MakeSRGB();