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

Commit 095dd5ac authored by Jerome Gaillard's avatar Jerome Gaillard Committed by Android (Google) Code Review
Browse files

Merge "Set up a RenderState for the host version of RenderThread" into main

parents d68efd0b a0cb3621

libs/hwui/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -538,6 +538,7 @@ cc_defaults { 
        "pipeline/skia/RenderNodeDrawable.cpp",

        "pipeline/skia/ReorderBarrierDrawables.cpp",

        "pipeline/skia/TransformCanvas.cpp",

        "renderstate/RenderState.cpp",

        "renderthread/Frame.cpp",

        "renderthread/RenderTask.cpp",

        "renderthread/TimeLord.cpp",
@@ -615,7 +616,6 @@ cc_defaults { 
                "pipeline/skia/SkiaVulkanPipeline.cpp",

                "pipeline/skia/VkFunctorDrawable.cpp",

                "pipeline/skia/VkInteropFunctorDrawable.cpp",

                "renderstate/RenderState.cpp",

                "renderthread/CacheManager.cpp",

                "renderthread/CanvasContext.cpp",

                "renderthread/DrawFrameTask.cpp",

libs/hwui/platform/host/renderthread/RenderThread.cpp

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "renderthread/RenderThread.h"



#include "Readback.h"

#include "renderstate/RenderState.h"

#include "renderthread/VulkanManager.h"



namespace android {
@@ -66,6 +67,7 @@ RenderThread::RenderThread() 
RenderThread::~RenderThread() {}



void RenderThread::initThreadLocals() {

    mRenderState = new RenderState(*this);

    mCacheManager = new CacheManager(*this);

}

libs/hwui/renderstate/RenderState.h

+4 −2
Original line number Diff line number Diff line
@@ -16,11 +16,13 @@ 
#ifndef RENDERSTATE_H

#define RENDERSTATE_H



#include "utils/Macros.h"



#include <pthread.h>

#include <utils/RefBase.h>



#include <set>



#include "utils/Macros.h"



namespace android {

namespace uirenderer {