diff options
| author | 2024-08-30 13:43:34 -0400 | |
|---|---|---|
| committer | 2024-08-30 13:54:14 -0400 | |
| commit | 572d801cca5d1b0289fe3d0038c875ebc8457352 (patch) | |
| tree | 5600aac8aa40dffff692954130fed0c7020c0485 /libs/hwui/AutoBackendTextureRelease.cpp | |
| parent | 1e45712b0a3a8b857e74fe77aaff37443f14933b (diff) | |
[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
Diffstat (limited to 'libs/hwui/AutoBackendTextureRelease.cpp')
| -rw-r--r-- | libs/hwui/AutoBackendTextureRelease.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libs/hwui/AutoBackendTextureRelease.cpp b/libs/hwui/AutoBackendTextureRelease.cpp index 5f5ffe97e953..27add3542c01 100644 --- a/libs/hwui/AutoBackendTextureRelease.cpp +++ b/libs/hwui/AutoBackendTextureRelease.cpp @@ -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" |