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

Commit 572d801c authored by Nolan Scobie's avatar Nolan Scobie
Browse files

[HWUI] 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: I5099e215a58915a5e6c7b3434f9855006dda8c60
parent 1e45712b

libs/hwui/AutoBackendTextureRelease.cpp

+4 −3
Original line number Diff line number Diff line
@@ -17,11 +17,12 @@ 
#include "AutoBackendTextureRelease.h"



#include <SkImage.h>

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

#include <include/gpu/GrDirectContext.h>

#include <include/gpu/GrBackendSurface.h>

#include <include/gpu/MutableTextureState.h>

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

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

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

#include <include/gpu/vk/VulkanMutableTextureState.h>



#include "renderthread/RenderThread.h"

#include "utils/Color.h"

#include "utils/PaintUtils.h"

libs/hwui/AutoBackendTextureRelease.h

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


#pragma once



#include <GrAHardwareBufferUtils.h>

#include <GrBackendSurface.h>

#include <SkImage.h>

#include <android/hardware_buffer.h>

#include <include/android/GrAHardwareBufferUtils.h>

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

#include <system/graphics.h>



namespace android {

libs/hwui/HardwareBitmapUploader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include <GLES2/gl2.h>

#include <GLES2/gl2ext.h>

#include <GLES3/gl3.h>

#include <GrDirectContext.h>

#include <GrTypes.h>

#include <SkBitmap.h>

#include <SkCanvas.h>

#include <SkImage.h>
@@ -30,6 +28,8 @@ 
#include <SkImageInfo.h>

#include <SkRefCnt.h>

#include <gui/TraceUtils.h>

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

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

#include <utils/GLUtils.h>

#include <utils/NdkUtils.h>

#include <utils/Trace.h>

libs/hwui/Mesh.h

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#ifndef MESH_H_

#define MESH_H_



#include <GrDirectContext.h>

#include <SkMesh.h>

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

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

#include <jni.h>

#include <log/log.h>

libs/hwui/RecordingCanvas.cpp

+4 −4
Original line number Diff line number Diff line
@@ -16,9 +16,12 @@ 


#include "RecordingCanvas.h"



#include <GrRecordingContext.h>

#include <SkMesh.h>

#include <hwui/Paint.h>

#include <include/gpu/GpuTypes.h>

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

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

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

#include <log/log.h>



#include <experimental/type_traits>
@@ -48,9 +51,6 @@ 
#include "Tonemapper.h"

#include "VectorDrawable.h"

#include "effects/GainmapRenderer.h"

#include "include/gpu/GpuTypes.h"  // from Skia

#include "include/gpu/GrDirectContext.h"

#include "include/gpu/ganesh/SkMeshGanesh.h"

#include "pipeline/skia/AnimatedDrawables.h"

#include "pipeline/skia/FunctorDrawable.h"

#ifdef __ANDROID__