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

Commit bc3f3609 authored by Nolan Scobie's avatar Nolan Scobie
Browse files

[RenderEngine] Update Ganesh includes to specify new location 

Upstream Skia changes I7269acfae5c26518c2a61930a8af9584682751cd and
Ibc927d0ae66a05546957300090a651614e720fad are moving Ganesh headers into
Skia's include/gpu/ganesh/ directory. Android's current includes are
relying on temporary shims which will soon be removed.

Note: I also sorted some includes to try and calm the chaos a tiny bit,
but didn't go out of my way to update all non-Ganesh Skia includes.

clang-format decided to further re-arrange things, so I'm hoping this
doesn't make future merge conflicts too painful.

Bug: 40044159
Test: builds after locally deleting Skia's temporary shims
Flag: EXEMPT refactor
Change-Id: Ie46234df6e5873ff814280a0a2f1f9bb6f95184b
parent 1e9887ee

libs/renderengine/skia/AutoBackendTexture.h

+1 −1
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


#pragma once



#include <GrDirectContext.h>

#include <SkImage.h>

#include <SkSurface.h>

#include <include/gpu/ganesh/GrDirectContext.h>

#include <sys/types.h>

#include <ui/GraphicTypes.h>

libs/renderengine/skia/SkiaGLRenderEngine.cpp

+5 −6
Original line number Diff line number Diff line
@@ -21,16 +21,15 @@ 


#include "SkiaGLRenderEngine.h"



#include "compat/SkiaGpuContext.h"



#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GrContextOptions.h>

#include <GrTypes.h>

#include <android-base/stringprintf.h>

#include <common/trace.h>

#include <gl/GrGLInterface.h>

#include <include/gpu/ganesh/GrContextOptions.h>

#include <include/gpu/ganesh/GrTypes.h>

#include <include/gpu/ganesh/gl/GrGLDirectContext.h>

#include <include/gpu/ganesh/gl/GrGLInterface.h>

#include <log/log_main.h>

#include <sync/sync.h>

#include <ui/DebugUtils.h>
@@ -40,7 +39,7 @@ 
#include <numeric>



#include "GLExtensions.h"

#include "log/log_main.h"

#include "compat/SkiaGpuContext.h"



namespace android {

namespace renderengine {

libs/renderengine/skia/SkiaGLRenderEngine.h

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,10 @@ 
#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <GLES2/gl2.h>

#include <GrDirectContext.h>

#include <SkSurface.h>

#include <android-base/thread_annotations.h>

#include <include/gpu/ganesh/GrContextOptions.h>

#include <include/gpu/ganesh/GrDirectContext.h>

#include <renderengine/ExternalTexture.h>

#include <renderengine/RenderEngine.h>

#include <sys/types.h>
@@ -32,7 +33,6 @@ 


#include "AutoBackendTexture.h"

#include "EGL/egl.h"

#include "GrContextOptions.h"

#include "SkImageInfo.h"

#include "SkiaRenderEngine.h"

#include "android-base/macros.h"

libs/renderengine/skia/SkiaRenderEngine.cpp

+3 −3
Original line number Diff line number Diff line
@@ -20,9 +20,6 @@ 


#include "SkiaRenderEngine.h"



#include <GrBackendSemaphore.h>

#include <GrContextOptions.h>

#include <GrTypes.h>

#include <SkBlendMode.h>

#include <SkCanvas.h>

#include <SkColor.h>
@@ -56,6 +53,9 @@ 
#include <common/FlagManager.h>

#include <common/trace.h>

#include <gui/FenceMonitor.h>

#include <include/gpu/ganesh/GrBackendSemaphore.h>

#include <include/gpu/ganesh/GrContextOptions.h>

#include <include/gpu/ganesh/GrTypes.h>

#include <include/gpu/ganesh/SkSurfaceGanesh.h>

#include <pthread.h>

#include <src/core/SkTraceEventCommon.h>

libs/renderengine/skia/SkiaRenderEngine.h

+4 −5
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ 
#define SF_SKIARENDERENGINE_H_



#include <renderengine/RenderEngine.h>

#include <sys/types.h>



#include <GrBackendSemaphore.h>

#include <SkSurface.h>

#include <android-base/thread_annotations.h>

#include <include/core/SkImageInfo.h>

#include <include/core/SkSurface.h>

#include <include/gpu/ganesh/GrBackendSemaphore.h>

#include <include/gpu/ganesh/GrContextOptions.h>

#include <renderengine/ExternalTexture.h>

#include <renderengine/RenderEngine.h>

#include <sys/types.h>
@@ -32,8 +33,6 @@ 
#include <unordered_map>



#include "AutoBackendTexture.h"

#include "GrContextOptions.h"

#include "SkImageInfo.h"

#include "android-base/macros.h"

#include "compat/SkiaGpuContext.h"

#include "debug/SkiaCapture.h"