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

Commit 666e756f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make buffer age work in Vulkan"

parents 0d0bbd01 cd55852f

libs/hwui/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ hwui_src_files := \ 
    renderthread/RenderTask.cpp \

    renderthread/RenderThread.cpp \

    renderthread/TimeLord.cpp \

    renderthread/Frame.cpp \

    thread/TaskManager.cpp \

    utils/Blur.cpp \

    utils/GLUtils.cpp \

libs/hwui/hwui/Bitmap.cpp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include "Bitmap.h"



#include "Caches.h"

#include "renderthread/EglManager.h"

#include "renderthread/RenderThread.h"

#include "renderthread/RenderProxy.h"

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "DeferredLayerUpdater.h"

#include "LayerDrawable.h"

#include "renderthread/EglManager.h"

#include "renderthread/Frame.h"

#include "renderstate/RenderState.h"

#include "SkiaPipeline.h"

#include "SkiaProfileRenderer.h"

libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp

+2 −3
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "SkiaVulkanPipeline.h"



#include "DeferredLayerUpdater.h"

#include "renderthread/EglManager.h" // needed for Frame

#include "renderthread/Frame.h"

#include "Readback.h"

#include "renderstate/RenderState.h"

#include "SkiaPipeline.h"
@@ -58,8 +58,7 @@ Frame SkiaVulkanPipeline::getFrame() { 
        return Frame(-1, -1, 0);

    }



    // TODO: support buffer age if Vulkan API can do it

    Frame frame(backBuffer->width(), backBuffer->height(), 0);

    Frame frame(backBuffer->width(), backBuffer->height(), mVkManager.getAge(mVkSurface));

    return frame;

}

libs/hwui/renderthread/CanvasContext.cpp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include "AnimationContext.h"

#include "Caches.h"

#include "EglManager.h"

#include "Frame.h"

#include "LayerUpdateQueue.h"

#include "Properties.h"

#include "RenderThread.h"