AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move Ganesh specific headers into include/private/gpu/ganesh

Browse Source 
Change-Id: Ia799cdff5288efe5d5d53e8d8f77cf32f3343371
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/529131
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
This commit is contained in:
Robert Phillips 2022-04-12 09:59:38 -04:00 committed by SkCQ
parent 2a1f2641f1
commit 59ba27bc6a
165 changed files with 374 additions and 378 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bench/GrMemoryPoolBench.cpp
View File

@ -6,7 +6,6 @@
*/
#include "bench/Benchmark.h"
#include "include/private/GrTypesPriv.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/ganesh/GrMemoryPool.h"

2
fuzz/FuzzCreateDDL.cpp
View File

@ -12,7 +12,7 @@
#include "include/core/SkSurface.h"
#include "include/core/SkSurfaceCharacterization.h"
#include "include/gpu/GrDirectContext.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrShaderCaps.h"
#include "tools/gpu/GrContextFactory.h"

28
gm/BUILD.bazel
View File

@ -518,7 +518,7 @@ generated_cc_atom(
"//include/core:SkScalar_hdr",
"//include/core:SkSize_hdr",
"//include/core:SkString_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
"//src/gpu/ganesh:GrPaint_hdr",
@ -1062,8 +1062,8 @@ generated_cc_atom(
"//include/core:SkString_hdr",
"//include/core:SkTypes_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkColorData_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//include/utils:SkRandom_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/core:SkGeometry_hdr",
@ -1194,7 +1194,7 @@ generated_cc_atom(
"//include/core:SkSize_hdr",
"//include/core:SkString_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/gpu/ganesh:GrCaps_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
@ -2037,8 +2037,8 @@ generated_cc_atom(
"//include/core:SkTypes_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkColorData_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/gpu:KeyBuilder_hdr",
"//src/gpu/ganesh:GrBuffer_hdr",
@ -2619,8 +2619,8 @@ generated_cc_atom(
"//include/core:SkTypes_hdr",
"//include/effects:SkGradientShader_hdr",
"//include/gpu:GrConfig_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkColorData_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/core:SkMatrixProvider_hdr",
"//src/gpu/ganesh:GrColor_hdr",
@ -2723,7 +2723,7 @@ generated_cc_atom(
"//include/core:SkScalar_hdr",
"//include/core:SkSize_hdr",
"//include/core:SkString_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
"//src/gpu/ganesh:GrPaint_hdr",
@ -3733,7 +3733,7 @@ generated_cc_atom(
"//include/core:SkTypes_hdr",
"//include/effects:SkGradientShader_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/core:SkMatrixProvider_hdr",
"//src/gpu/ganesh:GrPaint_hdr",
@ -4320,7 +4320,7 @@ generated_cc_atom(
"//include/core:SkTypeface_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/gpu:GrDirectContext_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrDirectContextPriv_hdr",
"//tools:ToolUtils_hdr",
],
@ -4380,8 +4380,8 @@ generated_cc_atom(
"//include/gpu:GrContextOptions_hdr",
"//include/gpu:GrDirectContext_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkTemplates_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrDirectContextPriv_hdr",
"//tools:ToolUtils_hdr",
],
@ -4497,7 +4497,7 @@ generated_cc_atom(
"//include/core:SkRefCnt_hdr",
"//include/core:SkString_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/gpu/ganesh:GrBuffer_hdr",
"//src/gpu/ganesh:GrCaps_hdr",
@ -5064,7 +5064,7 @@ generated_cc_atom(
"//include/gpu:GrDirectContext_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrRecordingContextPriv_hdr",
"//src/gpu/ganesh:GrSamplerState_hdr",
"//src/gpu/ganesh:GrTextureProxy_hdr",
@ -6789,8 +6789,8 @@ generated_cc_atom(
"//include/core:SkSize_hdr",
"//include/core:SkString_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkTArray_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -7525,7 +7525,7 @@ generated_cc_atom(
"//include/core:SkString_hdr",
"//include/core:SkTypes_hdr",
"//include/effects:SkGradientShader_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCanvasPriv_hdr",
"//src/gpu/ganesh:GrCaps_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
@ -9408,12 +9408,12 @@ generated_cc_atom(
"//include/gpu:GrDirectContext_hdr",
"//include/gpu:GrRecordingContext_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkHalf_hdr",
"//include/private:SkTArray_hdr",
"//include/private:SkTDArray_hdr",
"//include/private:SkTPin_hdr",
"//include/private:SkTemplates_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//include/utils:SkTextUtils_hdr",
"//src/core:SkAutoPixmapStorage_hdr",
"//src/core:SkConvertPixels_hdr",

2
gm/aarecteffect.cpp
View File

@ -16,7 +16,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"

2
gm/beziereffects.cpp
View File

@ -21,8 +21,8 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkRandom.h"
#include "src/core/SkCanvasPriv.h"
#include "src/core/SkGeometry.h"

2
gm/bigrrectaaeffect.cpp
View File

@ -17,7 +17,7 @@
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"

2
gm/clockwise.cpp
View File

@ -18,8 +18,8 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/KeyBuilder.h"
#include "src/gpu/ganesh/GrBuffer.h"

2
gm/constcolorprocessor.cpp
View File

@ -26,8 +26,8 @@
#include "include/core/SkTypes.h"
#include "include/effects/SkGradientShader.h"
#include "include/gpu/GrConfig.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/core/SkMatrixProvider.h"
#include "src/gpu/ganesh/GrColor.h"

2
gm/convexpolyeffect.cpp
View File

@ -18,7 +18,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrPaint.h"

2
gm/drawquadset.cpp
View File

@ -23,7 +23,7 @@
#include "include/core/SkTypes.h"
#include "include/effects/SkGradientShader.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/core/SkMatrixProvider.h"
#include "src/gpu/ganesh/GrPaint.h"

2
gm/fontcache.cpp
View File

@ -22,7 +22,7 @@
#include "include/core/SkTypeface.h"
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrDirectContext.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "tools/ToolUtils.h"

2
gm/fontregen.cpp
View File

@ -31,8 +31,8 @@
#include "include/gpu/GrContextOptions.h"
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTemplates.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrDirectContextPriv.h"
#include "tools/ToolUtils.h"

2
gm/fwidth_squircle.cpp
View File

@ -15,7 +15,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrBuffer.h"
#include "src/gpu/ganesh/GrCaps.h"

2
gm/image_pict.cpp
View File

@ -28,7 +28,7 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrRecordingContextPriv.h"
#include "src/gpu/ganesh/GrSamplerState.h"
#include "src/gpu/ganesh/GrTextureProxy.h"

2
gm/pathmaskcache.cpp
View File

@ -15,8 +15,8 @@
#include "include/core/SkSize.h"
#include "include/core/SkString.h"
#include "include/gpu/GrContextOptions.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
/** This tests the GPU backend's caching of path coverage masks */
class PathMaskCache : public skiagm::GM {

2
gm/rrects.cpp
View File

@ -18,7 +18,7 @@
#include "include/core/SkString.h"
#include "include/core/SkTypes.h"
#include "include/effects/SkGradientShader.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCanvasPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"

2
gm/wacky_yuv_formats.cpp
View File

@ -36,12 +36,12 @@
#include "include/gpu/GrDirectContext.h"
#include "include/gpu/GrRecordingContext.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkHalf.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTDArray.h"
#include "include/private/SkTPin.h"
#include "include/private/SkTemplates.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "include/utils/SkTextUtils.h"
#include "src/core/SkConvertPixels.h"
#include "src/core/SkYUVMath.h"

18
gn/gpu.gni
View File

@ -22,12 +22,12 @@ skia_gpu_sources = [
"$_include/gpu/GrYUVABackendTextures.h",
# Private includes
"$_include/private/GrContext_Base.h",
"$_include/private/GrGLTypesPriv.h",
"$_include/private/GrImageContext.h",
"$_include/private/GrMtlTypesPriv.h",
"$_include/private/GrTypesPriv.h",
"$_include/private/chromium/GrSlug.h",
"$_include/private/gpu/ganesh/GrContext_Base.h",
"$_include/private/gpu/ganesh/GrGLTypesPriv.h",
"$_include/private/gpu/ganesh/GrImageContext.h",
"$_include/private/gpu/ganesh/GrMtlTypesPriv.h",
"$_include/private/gpu/ganesh/GrTypesPriv.h",
"$_src/gpu/GrAHardwareBufferUtils.h",
"$_src/gpu/GrRectanizer.h",
"$_src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp",
@ -372,7 +372,7 @@ skia_gpu_sources = [
# Mock
"$_include/gpu/mock/GrMockTypes.h",
"$_include/private/GrMockTypesPriv.h",
"$_include/private/gpu/ganesh/GrMockTypesPriv.h",
"$_src/gpu/ganesh/mock/GrMockAttachment.h",
"$_src/gpu/ganesh/mock/GrMockBuffer.h",
"$_src/gpu/ganesh/mock/GrMockCaps.cpp",
@ -582,7 +582,7 @@ skia_vk_sources = [
"$_include/gpu/vk/GrVkMemoryAllocator.h",
"$_include/gpu/vk/GrVkTypes.h",
"$_include/gpu/vk/GrVkVulkan.h",
"$_include/private/GrVkTypesPriv.h",
"$_include/private/gpu/ganesh/GrVkTypesPriv.h",
"$_src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.cpp",
"$_src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.h",
"$_src/gpu/ganesh/vk/GrVkBuffer.cpp",
@ -658,7 +658,7 @@ skia_vk_sources = [
skia_direct3d_sources = [
"$_include/gpu/d3d/GrD3DBackendContext.h",
"$_include/gpu/d3d/GrD3DTypes.h",
"$_include/private/GrD3DTypesMinimal.h",
"$_include/private/gpu/ganesh/GrD3DTypesMinimal.h",
"$_src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp",
"$_src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h",
"$_src/gpu/ganesh/d3d/GrD3DAttachment.cpp",
@ -712,7 +712,7 @@ skia_direct3d_sources = [
skia_dawn_sources = [
"$_include/gpu/dawn/GrDawnTypes.h",
"$_include/private/GrDawnTypesPriv.h",
"$_include/private/gpu/ganesh/GrDawnTypesPriv.h",
"$_src/gpu/ganesh/dawn/GrDawnAttachment.cpp",
"$_src/gpu/ganesh/dawn/GrDawnAttachment.h",
"$_src/gpu/ganesh/dawn/GrDawnBuffer.cpp",

26
include/gpu/BUILD.bazel
View File

@ -19,7 +19,7 @@ generated_cc_atom(
"//include/gpu/gl:GrGLTypes_hdr",
"//include/gpu/mtl:GrMtlTypes_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
"//include/private:GrD3DTypesMinimal_hdr",
"//include/private/gpu/ganesh:GrD3DTypesMinimal_hdr",
],
)
@ -29,7 +29,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":GrTypes_hdr",
"//include/private:GrVkTypesPriv_hdr",
"//include/private/gpu/ganesh:GrVkTypesPriv_hdr",
],
)
@ -46,9 +46,9 @@ generated_cc_atom(
"//include/gpu/mock:GrMockTypes_hdr",
"//include/gpu/mtl:GrMtlTypes_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
"//include/private:GrD3DTypesMinimal_hdr",
"//include/private:GrGLTypesPriv_hdr",
"//include/private:GrVkTypesPriv_hdr",
"//include/private/gpu/ganesh:GrD3DTypesMinimal_hdr",
"//include/private/gpu/ganesh:GrGLTypesPriv_hdr",
"//include/private/gpu/ganesh:GrVkTypesPriv_hdr",
"//third_party:dawn",
],
)
@ -71,7 +71,7 @@ generated_cc_atom(
"//include/core:SkData_hdr",
"//include/core:SkString_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -120,8 +120,8 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/private:GrImageContext_hdr",
"//include/private:SkTArray_hdr",
"//include/private/gpu/ganesh:GrImageContext_hdr",
],
)
@ -131,12 +131,12 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":GrTypes_hdr",
"//include/private:GrD3DTypesMinimal_hdr",
"//include/private:GrDawnTypesPriv_hdr",
"//include/private:GrGLTypesPriv_hdr",
"//include/private:GrMockTypesPriv_hdr",
"//include/private:GrMtlTypesPriv_hdr",
"//include/private:GrVkTypesPriv_hdr",
"//include/private/gpu/ganesh:GrD3DTypesMinimal_hdr",
"//include/private/gpu/ganesh:GrDawnTypesPriv_hdr",
"//include/private/gpu/ganesh:GrGLTypesPriv_hdr",
"//include/private/gpu/ganesh:GrMockTypesPriv_hdr",
"//include/private/gpu/ganesh:GrMtlTypesPriv_hdr",
"//include/private/gpu/ganesh:GrVkTypesPriv_hdr",
],
)

2
include/gpu/GrBackendSemaphore.h
View File

@ -21,7 +21,7 @@
#endif
#ifdef SK_DIRECT3D
#include "include/private/GrD3DTypesMinimal.h"
#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
#endif
/**

7
include/gpu/GrBackendSurface.h
View File

@ -13,12 +13,12 @@
#include "include/gpu/GrTypes.h"
#ifdef SK_GL
#include "include/gpu/gl/GrGLTypes.h"
#include "include/private/GrGLTypesPriv.h"
#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
#endif
#include "include/gpu/mock/GrMockTypes.h"
#ifdef SK_VULKAN
#include "include/gpu/vk/GrVkTypes.h"
#include "include/private/GrVkTypesPriv.h"
#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
#endif
#ifdef SK_DAWN
@ -39,7 +39,7 @@ class GrColorFormatDesc;
#endif
#ifdef SK_DIRECT3D
#include "include/private/GrD3DTypesMinimal.h"
#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
class GrD3DResourceState;
#endif
@ -642,4 +642,3 @@ private:
#endif
#endif

2
include/gpu/GrBackendSurfaceMutableState.h
View File

@ -11,7 +11,7 @@
#include "include/gpu/GrTypes.h"
#ifdef SK_VULKAN
#include "include/private/GrVkTypesPriv.h"
#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
#endif
/**

2
include/gpu/GrContextOptions.h
View File

@ -14,7 +14,7 @@
#include "include/gpu/GrDriverBugWorkarounds.h"
#include "include/gpu/GrTypes.h"
#include "include/gpu/ShaderErrorHandler.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include <vector>

2
include/gpu/GrRecordingContext.h
View File

@ -9,8 +9,8 @@
#define GrRecordingContext_DEFINED
#include "include/core/SkRefCnt.h"
#include "include/private/GrImageContext.h"
#include "include/private/SkTArray.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#if GR_GPU_STATS && GR_TEST_UTILS
#include <map>

12
include/gpu/GrSurfaceInfo.h
View File

@ -11,22 +11,22 @@
#include "include/gpu/GrTypes.h"
#ifdef SK_GL
#include "include/private/GrGLTypesPriv.h"
#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
#endif
#ifdef SK_VULKAN
#include "include/private/GrVkTypesPriv.h"
#include "include/private/gpu/ganesh/GrVkTypesPriv.h"
#endif
#ifdef SK_DIRECT3D
#include "include/private/GrD3DTypesMinimal.h"
#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
struct GrD3DSurfaceInfo;
#endif
#ifdef SK_METAL
#include "include/private/GrMtlTypesPriv.h"
#include "include/private/gpu/ganesh/GrMtlTypesPriv.h"
#endif
#ifdef SK_DAWN
#include "include/private/GrDawnTypesPriv.h"
#include "include/private/gpu/ganesh/GrDawnTypesPriv.h"
#endif
#include "include/private/GrMockTypesPriv.h"
#include "include/private/gpu/ganesh/GrMockTypesPriv.h"
class GrSurfaceInfo {
public:

2
include/gpu/mock/BUILD.bazel
View File

@ -6,6 +6,6 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)

2
include/gpu/mock/GrMockTypes.h
View File

@ -9,7 +9,7 @@
#define GrMockOptions_DEFINED
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrBackendFormat;

91
include/private/BUILD.bazel
View File

@ -1,96 +1,5 @@
load("//bazel:macros.bzl", "generated_cc_atom")
generated_cc_atom(
name = "GrContext_Base_hdr",
hdrs = ["GrContext_Base.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrD3DTypesMinimal_hdr",
hdrs = ["GrD3DTypesMinimal.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrDawnTypesPriv_hdr",
hdrs = ["GrDawnTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/gpu/dawn:GrDawnTypes_hdr"],
)
generated_cc_atom(
name = "GrGLTypesPriv_hdr",
hdrs = ["GrGLTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu/gl:GrGLTypes_hdr",
],
)
generated_cc_atom(
name = "GrImageContext_hdr",
hdrs = ["GrImageContext.h"],
visibility = ["//:__subpackages__"],
deps = [
":GrContext_Base_hdr",
":SingleOwner_hdr",
],
)
generated_cc_atom(
name = "GrMockTypesPriv_hdr",
hdrs = ["GrMockTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/gpu/mock:GrMockTypes_hdr"],
)
generated_cc_atom(
name = "GrMtlTypesPriv_hdr",
hdrs = ["GrMtlTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/gpu/mtl:GrMtlTypes_hdr",
],
)
generated_cc_atom(
name = "GrTypesPriv_hdr",
hdrs = ["GrTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkImageInfoPriv_hdr",
":SkMacros_hdr",
"//include/core:SkImageInfo_hdr",
"//include/core:SkImage_hdr",
"//include/core:SkPath_hdr",
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrVkTypesPriv_hdr",
hdrs = ["GrVkTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
],
)
generated_cc_atom(
name = "SkBitmaskEnum_hdr",
hdrs = ["SkBitmaskEnum.h"],

92
include/private/gpu/ganesh/BUILD.bazel Normal file
View File

@ -0,0 +1,92 @@
load("//bazel:macros.bzl", "generated_cc_atom")
generated_cc_atom(
name = "GrContext_Base_hdr",
hdrs = ["GrContext_Base.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrD3DTypesMinimal_hdr",
hdrs = ["GrD3DTypesMinimal.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrDawnTypesPriv_hdr",
hdrs = ["GrDawnTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/gpu/dawn:GrDawnTypes_hdr"],
)
generated_cc_atom(
name = "GrGLTypesPriv_hdr",
hdrs = ["GrGLTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu/gl:GrGLTypes_hdr",
],
)
generated_cc_atom(
name = "GrImageContext_hdr",
hdrs = ["GrImageContext.h"],
visibility = ["//:__subpackages__"],
deps = [
":GrContext_Base_hdr",
"//include/private:SingleOwner_hdr",
],
)
generated_cc_atom(
name = "GrMockTypesPriv_hdr",
hdrs = ["GrMockTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/gpu/mock:GrMockTypes_hdr"],
)
generated_cc_atom(
name = "GrMtlTypesPriv_hdr",
hdrs = ["GrMtlTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/gpu/mtl:GrMtlTypes_hdr",
],
)
generated_cc_atom(
name = "GrTypesPriv_hdr",
hdrs = ["GrTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkImageInfo_hdr",
"//include/core:SkImage_hdr",
"//include/core:SkPath_hdr",
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:SkImageInfoPriv_hdr",
"//include/private:SkMacros_hdr",
],
)
generated_cc_atom(
name = "GrVkTypesPriv_hdr",
hdrs = ["GrVkTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
],
)

0
include/private/GrContext_Base.h → include/private/gpu/ganesh/GrContext_Base.h
View File

0
include/private/GrD3DTypesMinimal.h → include/private/gpu/ganesh/GrD3DTypesMinimal.h
View File

0
include/private/GrDawnTypesPriv.h → include/private/gpu/ganesh/GrDawnTypesPriv.h
View File

0
include/private/GrGLTypesPriv.h → include/private/gpu/ganesh/GrGLTypesPriv.h
View File

2
include/private/GrImageContext.h → include/private/gpu/ganesh/GrImageContext.h
View File

@ -8,8 +8,8 @@
#ifndef GrImageContext_DEFINED
#define GrImageContext_DEFINED
#include "include/private/GrContext_Base.h"
#include "include/private/SingleOwner.h"
#include "include/private/gpu/ganesh/GrContext_Base.h"
class GrImageContextPriv;

0
include/private/GrMockTypesPriv.h → include/private/gpu/ganesh/GrMockTypesPriv.h
View File

0
include/private/GrMtlTypesPriv.h → include/private/gpu/ganesh/GrMtlTypesPriv.h
View File

0
include/private/GrTypesPriv.h → include/private/gpu/ganesh/GrTypesPriv.h
View File

0
include/private/GrVkTypesPriv.h → include/private/gpu/ganesh/GrVkTypesPriv.h
View File

12
src/core/BUILD.bazel
View File

@ -2238,7 +2238,7 @@ generated_cc_atom(
deps = [
"//include/core:SkRefCnt_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -2682,8 +2682,8 @@ generated_cc_atom(
"//include/core:SkMaskFilter_hdr",
"//include/core:SkPaint_hdr",
"//include/core:SkStrokeRec_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkNoncopyable_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -4517,7 +4517,7 @@ generated_cc_atom(
"//include/core:SkRefCnt_hdr",
"//include/core:SkSamplingOptions_hdr",
"//include/core:SkSurfaceProps_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrSurfaceProxyView_hdr",
],
)
@ -4556,7 +4556,7 @@ generated_cc_atom(
"//include/core:SkImageInfo_hdr",
"//include/core:SkRefCnt_hdr",
"//include/core:SkSurfaceProps_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -5472,8 +5472,8 @@ generated_cc_atom(
":SkConvertPixels_hdr",
":SkYUVAInfoLocation_hdr",
"//include/core:SkYUVAPixmaps_hdr",
"//include/private:GrImageContext_hdr",
"//include/private:SkImageInfoPriv_hdr",
"//include/private/gpu/ganesh:GrImageContext_hdr",
],
)
@ -5562,7 +5562,7 @@ generated_cc_atom(
deps = [
":SkSLTypeShared_hdr",
"//include/core:SkCustomMesh_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)

2
src/core/SkCustomMeshPriv.h
View File

@ -11,7 +11,7 @@
#include "include/core/SkCustomMesh.h"
#ifdef SK_ENABLE_SKSL
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkSLTypeShared.h"
struct SkCustomMeshSpecificationPriv {

2
src/core/SkGpuBlurUtils.h
View File

@ -12,7 +12,7 @@
#if SK_SUPPORT_GPU
#include "include/core/SkRefCnt.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrRecordingContext;
namespace skgpu { namespace v1 { class SurfaceDrawContext; }}

2
src/core/SkMaskFilterBase.h
View File

@ -17,7 +17,7 @@
#include "src/core/SkMask.h"
#if SK_SUPPORT_GPU
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#endif
class GrClip;

2
src/core/SkSpecialImage.h
View File

@ -15,7 +15,7 @@
#include "src/core/SkNextID.h"
#if SK_SUPPORT_GPU
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
#endif

2
src/core/SkSpecialSurface.h
View File

@ -13,7 +13,7 @@
#include "include/core/SkSurfaceProps.h"
#if SK_SUPPORT_GPU
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#endif
class GrBackendFormat;

2
src/core/SkYUVAPixmaps.cpp
View File

@ -12,7 +12,7 @@
#include "src/core/SkYUVAInfoLocation.h"
#if SK_SUPPORT_GPU
#include "include/private/GrImageContext.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#endif

62
src/gpu/ganesh/BUILD.bazel
View File

@ -384,7 +384,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkImage_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkDevice_hdr",
],
)
@ -411,7 +411,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkImageGenerator_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -571,7 +571,7 @@ generated_cc_atom(
"//include/gpu/dawn:GrDawnTypes_hdr",
"//include/gpu/mtl:GrMtlTypes_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh/d3d:GrD3DResourceState_hdr",
"//src/gpu/ganesh/d3d:GrD3DUtil_hdr",
"//src/gpu/ganesh/dawn:GrDawnUtil_hdr",
@ -652,7 +652,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrContextOptions_hdr",
"//include/private:GrContext_Base_hdr",
"//include/private/gpu/ganesh:GrContext_Base_hdr",
],
)
@ -660,7 +660,7 @@ generated_cc_atom(
name = "GrBlurUtils_hdr",
hdrs = ["GrBlurUtils.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/private:GrTypesPriv_hdr"],
deps = ["//include/private/gpu/ganesh:GrTypesPriv_hdr"],
)
generated_cc_atom(
@ -704,10 +704,10 @@ generated_cc_atom(
":GrDrawIndirectCommand_hdr",
":GrNonAtomicRef_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkNoncopyable_hdr",
"//include/private:SkTArray_hdr",
"//include/private:SkTDArray_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -750,7 +750,7 @@ generated_cc_atom(
"//include/core:SkRefCnt_hdr",
"//include/core:SkString_hdr",
"//include/gpu:GrDriverBugWorkarounds_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkCompressedDataUtils_hdr",
"//src/gpu:Blend_hdr",
"//src/gpu:Swizzle_hdr",
@ -771,7 +771,7 @@ generated_cc_atom(
":GrWindowRectangles_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/utils:SkJSONWriter_hdr",
],
)
@ -814,7 +814,7 @@ generated_cc_atom(
":GrColorSpaceXform_hdr",
"//include/core:SkAlphaType_hdr",
"//include/core:SkRefCnt_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -882,7 +882,7 @@ generated_cc_atom(
deps = [
":GrCaps_hdr",
"//include/gpu:GrContextThreadSafeProxy_hdr",
"//include/private:GrContext_Base_hdr",
"//include/private/gpu/ganesh:GrContext_Base_hdr",
"//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr",
],
)
@ -914,7 +914,7 @@ generated_cc_atom(
":GrCaps_hdr",
":GrContextThreadSafeProxyPriv_hdr",
"//include/gpu:ShaderErrorHandler_hdr",
"//include/private:GrContext_Base_hdr",
"//include/private/gpu/ganesh:GrContext_Base_hdr",
"//src/gpu/ganesh/effects:GrSkSLFP_hdr",
],
)
@ -994,8 +994,8 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkColor_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkTArray_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -1069,7 +1069,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -1244,7 +1244,7 @@ generated_cc_atom(
":GrDrawOpTest_hdr",
":GrUserStencilSettings_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrContext_Base_hdr",
"//include/private/gpu/ganesh:GrContext_Base_hdr",
"//include/utils:SkRandom_hdr",
],
)
@ -1328,7 +1328,7 @@ generated_cc_atom(
deps = [
":GrSurfaceProxyView_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -1394,7 +1394,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -1502,7 +1502,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":GrDrawOpAtlas_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkGlyph_hdr",
"//src/core:SkMask_hdr",
],
@ -1551,8 +1551,8 @@ generated_cc_atom(
hdrs = ["GrGpuResource.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/private:GrTypesPriv_hdr",
"//include/private:SkNoncopyable_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu:ResourceKey_hdr",
],
)
@ -1645,7 +1645,7 @@ generated_cc_atom(
deps = [
":GrBaseContextPriv_hdr",
"//include/gpu:GrContextThreadSafeProxy_hdr",
"//include/private:GrImageContext_hdr",
"//include/private/gpu/ganesh:GrImageContext_hdr",
],
)
@ -1658,7 +1658,7 @@ generated_cc_atom(
":GrContextThreadSafeProxyPriv_hdr",
":GrImageContextPriv_hdr",
":GrProxyProvider_hdr",
"//include/private:GrImageContext_hdr",
"//include/private/gpu/ganesh:GrImageContext_hdr",
"//src/gpu/ganesh/effects:GrSkSLFP_hdr",
],
)
@ -1672,7 +1672,7 @@ generated_cc_atom(
"//include/core:SkAlphaType_hdr",
"//include/core:SkRefCnt_hdr",
"//include/core:SkSize_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -1867,8 +1867,8 @@ generated_cc_atom(
":GrSurfaceProxyView_hdr",
"//include/core:SkMatrix_hdr",
"//include/core:SkRect_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkColorData_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -1905,7 +1905,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkData_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/sksl/ir:SkSLProgram_hdr",
],
)
@ -2078,9 +2078,9 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkString_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkTArray_hdr",
"//include/private:SkTo_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -2163,9 +2163,9 @@ generated_cc_atom(
"//include/core:SkImage_hdr",
"//include/gpu:GrDirectContext_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
"//include/private:GrImageContext_hdr",
"//include/private:SingleOwner_hdr",
"//include/private:SkImageInfoPriv_hdr",
"//include/private/gpu/ganesh:GrImageContext_hdr",
"//src/core:SkAutoPixmapStorage_hdr",
"//src/core:SkCompressedDataUtils_hdr",
"//src/core:SkImagePriv_hdr",
@ -2302,7 +2302,7 @@ generated_cc_atom(
":GrNativeRect_hdr",
":GrSubRunAllocator_hdr",
":GrSurfaceProxy_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkArenaAlloc_hdr",
"//src/gpu:Swizzle_hdr",
],
@ -2592,7 +2592,7 @@ generated_cc_atom(
"//include/core:SkMatrix_hdr",
"//include/core:SkRegion_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkAutoPixmapStorage_hdr",
"//src/core:SkDraw_hdr",
"//src/core:SkRasterClip_hdr",
@ -2673,7 +2673,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkString_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkSLTypeShared_hdr",
],
)
@ -3046,7 +3046,7 @@ generated_cc_atom(
"//include/core:SkPoint_hdr",
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)
@ -3154,8 +3154,8 @@ generated_cc_atom(
hdrs = ["GrUniformDataManager.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/private:GrTypesPriv_hdr",
"//include/private:SkTArray_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkAutoMalloc_hdr",
"//src/core:SkSLTypeShared_hdr",
"//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr",
@ -3187,7 +3187,7 @@ generated_cc_atom(
deps = [
"//include/core:SkScalar_hdr",
"//include/core:SkTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkSLTypeShared_hdr",
],
)

2
src/gpu/ganesh/BaseDevice.h
View File

@ -9,7 +9,7 @@
#define BaseDevice_DEFINED
#include "include/core/SkImage.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkDevice.h"
class GrRenderTargetProxy;

2
src/gpu/ganesh/GrAHardwareBufferImageGenerator.h
View File

@ -9,7 +9,7 @@
#include "include/core/SkImageGenerator.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrGpuResource;
class GrSurfaceProxyView;

2
src/gpu/ganesh/GrBackendSurface.cpp
View File

@ -7,7 +7,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h"
#include "src/gpu/ganesh/gl/GrGLUtil.h"

2
src/gpu/ganesh/GrBaseContextPriv.h
View File

@ -9,7 +9,7 @@
#define GrBaseContextPriv_DEFINED
#include "include/gpu/GrContextOptions.h"
#include "include/private/GrContext_Base.h"
#include "include/private/gpu/ganesh/GrContext_Base.h"
/** Class that exposes methods on GrContext_Base that are only intended for use internal to Skia.
This class is purely a privileged window into GrContext_Base. It should never have

2
src/gpu/ganesh/GrBlurUtils.h
View File

@ -8,7 +8,7 @@
#ifndef GrBlurUtils_DEFINED
#define GrBlurUtils_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrClip;
class GrPaint;

2
src/gpu/ganesh/GrBufferAllocPool.h
View File

@ -9,10 +9,10 @@
#define GrBufferAllocPool_DEFINED
#include "include/core/SkTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkNoncopyable.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTDArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrCpuBuffer.h"
#include "src/gpu/ganesh/GrDrawIndirectCommand.h"
#include "src/gpu/ganesh/GrNonAtomicRef.h"

2
src/gpu/ganesh/GrCaps.cpp
View File

@ -9,7 +9,7 @@
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/GrContextOptions.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrBackendUtils.h"
#include "src/gpu/ganesh/GrRenderTargetProxy.h"
#include "src/gpu/ganesh/GrSurface.h"

2
src/gpu/ganesh/GrCaps.h
View File

@ -12,7 +12,7 @@
#include "include/core/SkRefCnt.h"
#include "include/core/SkString.h"
#include "include/gpu/GrDriverBugWorkarounds.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkCompressedDataUtils.h"
#include "src/gpu/Blend.h"
#include "src/gpu/Swizzle.h"

2
src/gpu/ganesh/GrColorInfo.h
View File

@ -10,7 +10,7 @@
#include "include/core/SkAlphaType.h"
#include "include/core/SkRefCnt.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrColorSpaceXform.h"
class SkColorInfo;

2
src/gpu/ganesh/GrContextThreadSafeProxyPriv.h
View File

@ -9,7 +9,7 @@
#define GrContextThreadSafeProxyPriv_DEFINED
#include "include/gpu/GrContextThreadSafeProxy.h"
#include "include/private/GrContext_Base.h"
#include "include/private/gpu/ganesh/GrContext_Base.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h"

2
src/gpu/ganesh/GrContext_Base.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "include/private/GrContext_Base.h"
#include "include/private/gpu/ganesh/GrContext_Base.h"
#include "include/gpu/ShaderErrorHandler.h"
#include "src/gpu/ganesh/GrBaseContextPriv.h"

2
src/gpu/ganesh/GrDataUtils.h
View File

@ -9,8 +9,8 @@
#define GrDataUtils_DEFINED
#include "include/core/SkColor.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrImageInfo;
class GrCPixmap;

2
src/gpu/ganesh/GrDeferredUpload.h
View File

@ -10,7 +10,7 @@
#include <functional>
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrTextureProxy;

2
src/gpu/ganesh/GrDrawOpTest.cpp
View File

@ -8,7 +8,7 @@
#include "src/gpu/ganesh/GrDrawOpTest.h"
#include "include/core/SkTypes.h"
#include "include/private/GrContext_Base.h"
#include "include/private/gpu/ganesh/GrContext_Base.h"
#include "include/utils/SkRandom.h"
#include "src/gpu/ganesh/GrBaseContextPriv.h"
#include "src/gpu/ganesh/GrCaps.h"

2
src/gpu/ganesh/GrDstProxyView.h
View File

@ -9,7 +9,7 @@
#define GrDstProxyView_DEFINED
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
/**

2
src/gpu/ganesh/GrFinishCallbacks.h
View File

@ -9,7 +9,7 @@
#define GrFinishCallbacks_DEFINED
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include <list>

2
src/gpu/ganesh/GrGeometryProcessor.h
View File

@ -531,7 +531,7 @@ const GrGeometryProcessor::TextureSampler& GrGeometryProcessor::IthTextureSample
/**
* Returns the size of the attrib type in bytes.
* This was moved from include/private/GrTypesPriv.h in service of Skia dependents that build
* This was moved from include/private/gpu/ganesh/GrTypesPriv.h in service of Skia dependents that build
* with C++11.
*/
static constexpr inline size_t GrVertexAttribTypeSize(GrVertexAttribType type) {

2
src/gpu/ganesh/GrGlyph.h
View File

@ -8,7 +8,7 @@
#ifndef GrGlyph_DEFINED
#define GrGlyph_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkGlyph.h"
#include "src/core/SkMask.h"
#include "src/gpu/ganesh/GrDrawOpAtlas.h"

2
src/gpu/ganesh/GrGpuResource.h
View File

@ -8,8 +8,8 @@
#ifndef GrGpuResource_DEFINED
#define GrGpuResource_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/SkNoncopyable.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ResourceKey.h"
class GrGpu;

2
src/gpu/ganesh/GrImageContext.cpp
View File

@ -7,7 +7,7 @@
#include <memory>
#include "include/private/GrImageContext.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h"

2
src/gpu/ganesh/GrImageContextPriv.h
View File

@ -8,7 +8,7 @@
#ifndef GrImageContextPriv_DEFINED
#define GrImageContextPriv_DEFINED
#include "include/private/GrImageContext.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#include "include/gpu/GrContextThreadSafeProxy.h"
#include "src/gpu/ganesh/GrBaseContextPriv.h"

2
src/gpu/ganesh/GrImageInfo.h
View File

@ -11,7 +11,7 @@
#include "include/core/SkAlphaType.h"
#include "include/core/SkRefCnt.h"
#include "include/core/SkSize.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrColorInfo.h"
#include <stddef.h>

2
src/gpu/ganesh/GrOpsTypes.h
View File

@ -10,8 +10,8 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkRect.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkColorData.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSurfaceProxyView.h"
/** Used by SDC::drawQuadSet and FillRectOp */

2
src/gpu/ganesh/GrPersistentCacheUtils.h
View File

@ -9,7 +9,7 @@
#define GrPersistentCacheEntry_DEFINED
#include "include/core/SkData.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/sksl/ir/SkSLProgram.h"
class SkReadBuffer;

2
src/gpu/ganesh/GrProgramDesc.h
View File

@ -9,9 +9,9 @@
#define GrProgramDesc_DEFINED
#include "include/core/SkString.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTo.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include <limits.h>

2
src/gpu/ganesh/GrProxyProvider.cpp
View File

@ -10,9 +10,9 @@
#include "include/core/SkBitmap.h"
#include "include/core/SkImage.h"
#include "include/gpu/GrDirectContext.h"
#include "include/private/GrImageContext.h"
#include "include/private/SingleOwner.h"
#include "include/private/SkImageInfoPriv.h"
#include "include/private/gpu/ganesh/GrImageContext.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkCompressedDataUtils.h"
#include "src/core/SkImagePriv.h"

2
src/gpu/ganesh/GrRenderTargetProxy.h
View File

@ -8,7 +8,7 @@
#ifndef GrRenderTargetProxy_DEFINED
#define GrRenderTargetProxy_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkArenaAlloc.h"
#include "src/gpu/Swizzle.h"
#include "src/gpu/ganesh/GrCaps.h"

2
src/gpu/ganesh/GrSWMaskHelper.h
View File

@ -11,7 +11,7 @@
#include "include/core/SkMatrix.h"
#include "include/core/SkRegion.h"
#include "include/core/SkTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkAutoPixmapStorage.h"
#include "src/core/SkDraw.h"
#include "src/core/SkRasterClip.h"

2
src/gpu/ganesh/GrShaderVar.h
View File

@ -9,7 +9,7 @@
#define GrShaderVar_DEFINED
#include "include/core/SkString.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkSLTypeShared.h"
struct GrShaderCaps;

2
src/gpu/ganesh/GrTexture.h
View File

@ -13,7 +13,7 @@
#include "include/core/SkPoint.h"
#include "include/core/SkRefCnt.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSurface.h"
class GrTexture : virtual public GrSurface {

2
src/gpu/ganesh/GrUniformDataManager.h
View File

@ -10,8 +10,8 @@
#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkTArray.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkAutoMalloc.h"
#include "src/core/SkSLTypeShared.h"

2
src/gpu/ganesh/GrUtil.h
View File

@ -9,7 +9,7 @@
#include "include/core/SkScalar.h"
#include "include/core/SkTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkSLTypeShared.h"
class GrStyle;

10
src/gpu/ganesh/d3d/BUILD.bazel
View File

@ -256,7 +256,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrOpsRenderPass_hdr",
],
)
@ -499,7 +499,7 @@ generated_cc_atom(
deps = [
"//include/gpu:GrBackendSemaphore_hdr",
"//include/gpu/d3d:GrD3DTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrSemaphore_hdr",
],
)
@ -545,7 +545,7 @@ generated_cc_atom(
"//include/core:SkTypes_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu/d3d:GrD3DTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrManagedResource_hdr",
],
)
@ -596,7 +596,7 @@ generated_cc_atom(
":GrD3DResourceState_hdr",
":GrD3DTypesPriv_hdr",
"//include/gpu/d3d:GrD3DTypes_hdr",
"//include/private:GrD3DTypesMinimal_hdr",
"//include/private/gpu/ganesh:GrD3DTypesMinimal_hdr",
],
)
@ -622,7 +622,7 @@ generated_cc_atom(
"//include/core:SkImage_hdr",
"//include/gpu:GrTypes_hdr",
"//include/gpu/d3d:GrD3DTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)

2
src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h
View File

@ -11,7 +11,7 @@
#include "src/gpu/ganesh/GrOpsRenderPass.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
class GrD3DGpu;
class GrD3DPipelineState;

2
src/gpu/ganesh/d3d/GrD3DSemaphore.h
View File

@ -10,7 +10,7 @@
#include "include/gpu/GrBackendSemaphore.h"
#include "include/gpu/d3d/GrD3DTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSemaphore.h"
class GrD3DGpu;

2
src/gpu/ganesh/d3d/GrD3DTextureResource.h
View File

@ -11,7 +11,7 @@
#include "include/core/SkTypes.h"
#include "include/gpu/GrBackendSurface.h"
#include "include/gpu/d3d/GrD3DTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrManagedResource.h"
#include "src/gpu/ganesh/d3d/GrD3DResourceState.h"

3
src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "include/private/GrD3DTypesMinimal.h"
#include "include/private/gpu/ganesh/GrD3DTypesMinimal.h"
#include "include/gpu/d3d/GrD3DTypes.h"
#include "src/gpu/ganesh/d3d/GrD3DResourceState.h"
@ -81,4 +81,3 @@ void GrD3DTextureResourceSpecHolder::cleanup() {
delete fSpec;
fSpec = nullptr;
}

2
src/gpu/ganesh/d3d/GrD3DUtil.h
View File

@ -11,7 +11,7 @@
#include "include/core/SkImage.h"
#include "include/gpu/GrTypes.h"
#include "include/gpu/d3d/GrD3DTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#define GR_D3D_CALL_ERRCHECK(X) \
do { \

4
src/gpu/ganesh/dawn/BUILD.bazel
View File

@ -293,7 +293,7 @@ generated_cc_atom(
name = "GrDawnTypesPriv_src",
srcs = ["GrDawnTypesPriv.cpp"],
visibility = ["//:__subpackages__"],
deps = ["//include/private:GrDawnTypesPriv_hdr"],
deps = ["//include/private/gpu/ganesh:GrDawnTypesPriv_hdr"],
)
generated_cc_atom(
@ -301,7 +301,7 @@ generated_cc_atom(
hdrs = ["GrDawnUtil.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//third_party:dawn",
],
)

2
src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp
View File

@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
#include "include/private/GrDawnTypesPriv.h"
#include "include/private/gpu/ganesh/GrDawnTypesPriv.h"
GrDawnSurfaceInfo GrDawnTextureSpecToSurfaceInfo(const GrDawnTextureSpec& dawnSpec,
uint32_t sampleCount,

2
src/gpu/ganesh/dawn/GrDawnUtil.h
View File

@ -8,7 +8,7 @@
#ifndef GrDawnUtil_DEFINED
#define GrDawnUtil_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "webgpu/webgpu_cpp.h"
size_t GrDawnBytesPerBlock(wgpu::TextureFormat format);

10
src/gpu/ganesh/effects/BUILD.bazel
View File

@ -18,7 +18,7 @@ generated_cc_atom(
hdrs = ["GrBezierEffect.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkArenaAlloc_hdr",
"//src/gpu/ganesh:GrCaps_hdr",
"//src/gpu/ganesh:GrGeometryProcessor_hdr",
@ -126,7 +126,7 @@ generated_cc_atom(
hdrs = ["GrConvexPolyEffect.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrCaps_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
"//src/gpu/ganesh:GrProcessor_hdr",
@ -371,7 +371,7 @@ generated_cc_atom(
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
],
)
@ -429,7 +429,7 @@ generated_cc_atom(
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrFragmentProcessor_hdr",
],
)
@ -500,8 +500,8 @@ generated_cc_atom(
":GrSkSLFP_hdr",
"//include/effects:SkOverdrawColorFilter_hdr",
"//include/effects:SkRuntimeEffect_hdr",
"//include/private:GrContext_Base_hdr",
"//include/private:SkSLString_hdr",
"//include/private/gpu/ganesh:GrContext_Base_hdr",
"//src/core:SkColorFilterBase_hdr",
"//src/core:SkColorSpacePriv_hdr",
"//src/core:SkRuntimeEffectPriv_hdr",

2
src/gpu/ganesh/effects/GrBezierEffect.h
View File

@ -8,7 +8,7 @@
#ifndef GrBezierEffect_DEFINED
#define GrBezierEffect_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkArenaAlloc.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrGeometryProcessor.h"

2
src/gpu/ganesh/effects/GrConvexPolyEffect.h
View File

@ -8,7 +8,7 @@
#ifndef GrConvexPolyEffect_DEFINED
#define GrConvexPolyEffect_DEFINED
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
#include "src/gpu/ganesh/GrProcessor.h"

2
src/gpu/ganesh/effects/GrOvalEffect.h
View File

@ -10,7 +10,7 @@
#include "include/core/SkRefCnt.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
struct GrShaderCaps;

2
src/gpu/ganesh/effects/GrRRectEffect.h
View File

@ -10,7 +10,7 @@
#include "include/core/SkRefCnt.h"
#include "include/gpu/GrTypes.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrFragmentProcessor.h"
struct GrShaderCaps;

2
src/gpu/ganesh/effects/GrSkSLFP.cpp
View File

@ -8,8 +8,8 @@
#include "src/gpu/ganesh/effects/GrSkSLFP.h"
#include "include/effects/SkRuntimeEffect.h"
#include "include/private/GrContext_Base.h"
#include "include/private/SkSLString.h"
#include "include/private/gpu/ganesh/GrContext_Base.h"
#include "src/core/SkColorSpacePriv.h"
#include "src/core/SkRuntimeEffectPriv.h"
#include "src/core/SkVM.h"

4
src/gpu/ganesh/geometry/BUILD.bazel
View File

@ -111,8 +111,8 @@ generated_cc_atom(
":GrQuadUtils_hdr",
":GrQuad_hdr",
"//include/core:SkRect_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkVx_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/core:SkPathPriv_hdr",
],
)
@ -137,7 +137,7 @@ generated_cc_atom(
deps = [
":GrQuad_hdr",
"//include/core:SkMatrix_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
],
)

2
src/gpu/ganesh/geometry/GrQuad.cpp
View File

@ -8,7 +8,7 @@
#include "src/gpu/ganesh/geometry/GrQuad.h"
#include "include/core/SkMatrix.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
using V4f = skvx::Vec<4, float>;

2
src/gpu/ganesh/geometry/GrQuadUtils.cpp
View File

@ -8,8 +8,8 @@
#include "src/gpu/ganesh/geometry/GrQuadUtils.h"
#include "include/core/SkRect.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/SkVx.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/core/SkPathPriv.h"
#include "src/gpu/ganesh/geometry/GrQuad.h"

16
src/gpu/ganesh/gl/BUILD.bazel
View File

@ -106,10 +106,10 @@ generated_cc_atom(
deps = [
":GrGLAttachment_hdr",
":GrGLUtil_hdr",
"//include/private:GrGLTypesPriv_hdr",
"//include/private:SkChecksum_hdr",
"//include/private:SkTArray_hdr",
"//include/private:SkTHash_hdr",
"//include/private/gpu/ganesh:GrGLTypesPriv_hdr",
"//src/gpu:Swizzle_hdr",
"//src/gpu/ganesh:GrCaps_hdr",
],
@ -416,7 +416,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrBackendSemaphore_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrSemaphore_hdr",
],
)
@ -461,7 +461,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":GrGLUtil_hdr",
"//include/private:GrGLTypesPriv_hdr",
"//include/private/gpu/ganesh:GrGLTypesPriv_hdr",
"//src/gpu/ganesh:GrGpu_hdr",
"//src/gpu/ganesh:GrTexture_hdr",
],
@ -489,7 +489,7 @@ generated_cc_atom(
deps = [
":GrGLDefines_impl_hdr",
"//include/core:SkScalar_hdr",
"//include/private:GrGLTypesPriv_hdr",
"//include/private/gpu/ganesh:GrGLTypesPriv_hdr",
"//src/gpu:Swizzle_hdr",
],
)
@ -526,8 +526,8 @@ generated_cc_atom(
deps = [
":GrGLDefines_impl_hdr",
"//include/gpu/gl:GrGLInterface_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkImageInfoPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrDataUtils_hdr",
"//src/gpu/ganesh:GrStencilSettings_hdr",
],
@ -540,7 +540,7 @@ generated_cc_atom(
deps = [
":GrGLUtil_hdr",
"//include/core:SkMatrix_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrDataUtils_hdr",
],
)
@ -551,7 +551,7 @@ generated_cc_atom(
visibility = ["//:__subpackages__"],
deps = [
":GrGLProgramDataManager_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh/glsl:GrGLSLVarying_hdr",
],
)
@ -563,8 +563,8 @@ generated_cc_atom(
deps = [
":GrGLDefines_impl_hdr",
"//include/gpu/gl:GrGLTypes_hdr",
"//include/private:GrTypesPriv_hdr",
"//include/private:SkTArray_hdr",
"//include/private/gpu/ganesh:GrTypesPriv_hdr",
"//src/gpu/ganesh:GrGpuResource_hdr",
],
)

2
src/gpu/ganesh/gl/GrGLCaps.h
View File

@ -10,10 +10,10 @@
#define GrGLCaps_DEFINED
#include <functional>
#include "include/private/GrGLTypesPriv.h"
#include "include/private/SkChecksum.h"
#include "include/private/SkTArray.h"
#include "include/private/SkTHash.h"
#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
#include "src/gpu/Swizzle.h"
#include "src/gpu/ganesh/GrCaps.h"
#include "src/gpu/ganesh/gl/GrGLAttachment.h"

2
src/gpu/ganesh/gl/GrGLSemaphore.h
View File

@ -9,7 +9,7 @@
#define GrGLSemaphore_DEFINED
#include "include/gpu/GrBackendSemaphore.h"
#include "include/private/GrTypesPriv.h"
#include "include/private/gpu/ganesh/GrTypesPriv.h"
#include "src/gpu/ganesh/GrSemaphore.h"
class GrGLGpu;

2
src/gpu/ganesh/gl/GrGLTexture.h
View File

@ -9,7 +9,7 @@
#ifndef GrGLTexture_DEFINED
#define GrGLTexture_DEFINED
#include "include/private/GrGLTypesPriv.h"
#include "include/private/gpu/ganesh/GrGLTypesPriv.h"
#include "src/gpu/ganesh/GrGpu.h"
#include "src/gpu/ganesh/GrTexture.h"
#include "src/gpu/ganesh/gl/GrGLUtil.h"

Some files were not shown because too many files have changed in this diff Show More