diff --git a/BUILD.bazel b/BUILD.bazel index cce2493bb3..252ebef075 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -55,10 +55,10 @@ CORE_DEPS = [ "//third_party:skcms", ] + select({ "//bazel/common_config_settings:has_gpu_backend": [ - "//src/gpu:srcs", + "//src/gpu/ganesh:srcs", "//src/sksl:srcs", # TODO(kjlubick) should mock be test only? - "//src/gpu:mock_srcs", + "//src/gpu/ganesh:mock_srcs", ], "//conditions:default": [], }) + select_multi( diff --git a/BUILD.gn b/BUILD.gn index 5e109ad6cd..6d84aa7480 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -890,8 +890,8 @@ optional("gpu") { public_defines += [ "SK_GL" ] if (is_android) { sources += [ - "src/gpu/gl/egl/GrGLMakeEGLInterface.cpp", - "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp", + "src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp", ] # this lib is required to link against AHardwareBuffer @@ -900,29 +900,29 @@ optional("gpu") { } } else if (skia_use_egl) { sources += [ - "src/gpu/gl/egl/GrGLMakeEGLInterface.cpp", - "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp", + "src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp", ] libs += [ "EGL" ] } else if (skia_use_webgl) { - sources += [ "src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp" ] + sources += [ "src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp" ] } else if (is_linux && skia_use_x11) { sources += [ - "src/gpu/gl/glx/GrGLMakeGLXInterface.cpp", - "src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp", + "src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp", + "src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp", ] libs += [ "GL" ] } else if (is_mac) { - sources += [ "src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp" ] + sources += [ "src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp" ] } else if (is_ios) { - sources += [ "src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp" ] + sources += [ "src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp" ] } else if (is_win && !skia_enable_winuwp) { - sources += [ "src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp" ] + sources += [ "src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp" ] if (target_cpu != "arm64") { libs += [ "OpenGL32.lib" ] } } else { - sources += [ "src/gpu/gl/GrGLMakeNativeInterface_none.cpp" ] + sources += [ "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ] } sources += skia_gl_gpu_sources } diff --git a/bench/BulkRectBench.cpp b/bench/BulkRectBench.cpp index 51c4eccd93..88918281a4 100644 --- a/bench/BulkRectBench.cpp +++ b/bench/BulkRectBench.cpp @@ -13,9 +13,9 @@ #include "include/gpu/GrDirectContext.h" #include "include/utils/SkRandom.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrOpsTypes.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrOpsTypes.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" // Benchmarks that exercise the bulk image and solid color quad APIs, under a variety of patterns: enum class ImageMode { diff --git a/bench/ClearBench.cpp b/bench/ClearBench.cpp index bf0473f3b4..37c5aa36ac 100644 --- a/bench/ClearBench.cpp +++ b/bench/ClearBench.cpp @@ -18,7 +18,7 @@ #include "include/core/SkRect.h" #include "include/effects/SkGradientShader.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" static sk_sp make_shader() { static const SkPoint kPts[] = {{0, 0}, {10, 10}}; diff --git a/bench/GMBench.cpp b/bench/GMBench.cpp index 58c3186241..dbce90e8dc 100644 --- a/bench/GMBench.cpp +++ b/bench/GMBench.cpp @@ -8,7 +8,7 @@ #include "bench/GMBench.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" GMBench::GMBench(std::unique_ptr gm) : fGM(std::move(gm)) { fGM->setMode(skiagm::GM::kBench_Mode); diff --git a/bench/GlyphQuadFillBench.cpp b/bench/GlyphQuadFillBench.cpp index 363a0c45e9..7b4e5746c1 100644 --- a/bench/GlyphQuadFillBench.cpp +++ b/bench/GlyphQuadFillBench.cpp @@ -13,10 +13,10 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkStrikeCache.h" #include "src/core/SkUtils.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/text/GrStrikeCache.h" -#include "src/gpu/text/GrTextBlob.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" #include "src/utils/SkUTF.h" // From Project Guttenberg. This is UTF-8 text. diff --git a/bench/GrMemoryPoolBench.cpp b/bench/GrMemoryPoolBench.cpp index 9547171ded..0df6c04584 100644 --- a/bench/GrMemoryPoolBench.cpp +++ b/bench/GrMemoryPoolBench.cpp @@ -8,7 +8,7 @@ #include "bench/Benchmark.h" #include "include/private/GrTypesPriv.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrMemoryPool.h" +#include "src/gpu/ganesh/GrMemoryPool.h" #include diff --git a/bench/GrQuadBench.cpp b/bench/GrQuadBench.cpp index 21f9aadcfb..ea3a8fb16c 100644 --- a/bench/GrQuadBench.cpp +++ b/bench/GrQuadBench.cpp @@ -7,8 +7,8 @@ #include "bench/Benchmark.h" #include "include/utils/SkRandom.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" class GrQuadBoundsBench : public Benchmark { public: diff --git a/bench/GrResourceCacheBench.cpp b/bench/GrResourceCacheBench.cpp index 8422fb73a1..a43b857889 100644 --- a/bench/GrResourceCacheBench.cpp +++ b/bench/GrResourceCacheBench.cpp @@ -9,11 +9,11 @@ #include "include/core/SkCanvas.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" enum { CACHE_SIZE_COUNT = 4096, diff --git a/bench/ImageCacheBudgetBench.cpp b/bench/ImageCacheBudgetBench.cpp index b39083ca63..d7bbb2baac 100644 --- a/bench/ImageCacheBudgetBench.cpp +++ b/bench/ImageCacheBudgetBench.cpp @@ -10,8 +10,8 @@ #include "include/core/SkImage.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" #include "tools/ToolUtils.h" diff --git a/bench/RectanizerBench.cpp b/bench/RectanizerBench.cpp index 843b26c91f..06406bdd22 100644 --- a/bench/RectanizerBench.cpp +++ b/bench/RectanizerBench.cpp @@ -12,8 +12,8 @@ #include "include/private/SkTDArray.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrRectanizerPow2.h" -#include "src/gpu/GrRectanizerSkyline.h" +#include "src/gpu/ganesh/GrRectanizerPow2.h" +#include "src/gpu/ganesh/GrRectanizerSkyline.h" /** * This bench exercises Ganesh' GrRectanizer classes. It exercises the following diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp index fdc87db784..fe874dcc0f 100644 --- a/bench/SKPBench.cpp +++ b/bench/SKPBench.cpp @@ -8,7 +8,7 @@ #include "bench/SKPBench.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tools/flags/CommandLineFlags.h" @@ -136,7 +136,7 @@ void SKPBench::drawPicture() { } } -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrGpu.h" static void draw_pic_for_stats(SkCanvas* canvas, GrDirectContext* dContext, const SkPicture* picture, diff --git a/bench/SkSLBench.cpp b/bench/SkSLBench.cpp index f150446b79..17dca013c1 100644 --- a/bench/SkSLBench.cpp +++ b/bench/SkSLBench.cpp @@ -8,9 +8,9 @@ #include "bench/ResultsWriter.h" #include "bench/SkSLBench.h" #include "include/core/SkCanvas.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/mock/GrMockCaps.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/mock/GrMockCaps.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/SkSLDSLParser.h" diff --git a/bench/TessellateBench.cpp b/bench/TessellateBench.cpp index c9bc83f744..63093c4289 100644 --- a/bench/TessellateBench.cpp +++ b/bench/TessellateBench.cpp @@ -9,10 +9,10 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkPathPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/mock/GrMockOpTarget.h" -#include "src/gpu/ops/PathTessellator.h" -#include "src/gpu/ops/StrokeTessellator.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/mock/GrMockOpTarget.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" +#include "src/gpu/ganesh/ops/StrokeTessellator.h" #include "src/gpu/tessellate/AffineMatrix.h" #include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h" #include "src/gpu/tessellate/WangsFormula.h" diff --git a/bench/TopoSortBench.cpp b/bench/TopoSortBench.cpp index 32ec93d2a4..42abce5d2d 100644 --- a/bench/TopoSortBench.cpp +++ b/bench/TopoSortBench.cpp @@ -8,7 +8,7 @@ #include "bench/Benchmark.h" #include "include/core/SkString.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrTTopoSort.h" +#include "src/gpu/ganesh/GrTTopoSort.h" #include "tools/ToolUtils.h" diff --git a/bench/TriangulatorBench.cpp b/bench/TriangulatorBench.cpp index c848d26c07..f67071d571 100644 --- a/bench/TriangulatorBench.cpp +++ b/bench/TriangulatorBench.cpp @@ -8,9 +8,9 @@ #include "bench/Benchmark.h" #include "include/core/SkPath.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/geometry/GrInnerFanTriangulator.h" -#include "src/gpu/geometry/GrTriangulator.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/geometry/GrInnerFanTriangulator.h" +#include "src/gpu/ganesh/geometry/GrTriangulator.h" #include struct TigerPath { diff --git a/bench/VertexColorSpaceBench.cpp b/bench/VertexColorSpaceBench.cpp index 9b08b973c4..517c884155 100644 --- a/bench/VertexColorSpaceBench.cpp +++ b/bench/VertexColorSpaceBench.cpp @@ -11,19 +11,19 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/SkHalf.h" #include "src/core/SkColorSpacePriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrProgramInfo.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp index 5e5c791080..444d4b3816 100644 --- a/bench/nanobench.cpp +++ b/bench/nanobench.cpp @@ -91,9 +91,9 @@ SK_BLITTER_TRACE_INIT #endif #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" #include "tools/gpu/GrContextFactory.h" using sk_gpu_test::ContextInfo; diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index d9253c27b3..36f8b82ffc 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -45,8 +45,8 @@ #include "src/core/SkRecorder.h" #include "src/core/SkTLazy.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "src/utils/SkJSONWriter.h" #include "src/utils/SkMultiPictureDocumentPriv.h" #include "src/utils/SkOSPath.h" diff --git a/experimental/sorttoy/sorttoy.cpp b/experimental/sorttoy/sorttoy.cpp index 131add5606..6c58a15e84 100644 --- a/experimental/sorttoy/sorttoy.cpp +++ b/experimental/sorttoy/sorttoy.cpp @@ -9,8 +9,8 @@ #include "include/core/SkGraphics.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkOSFile.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "src/utils/SkOSPath.h" #include "tools/ToolUtils.h" #include "tools/flags/CommandLineFlags.h" diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 1d860a4cd1..69af03dcbb 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -50,14 +50,14 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tools/gpu/GrContextFactory.h" #endif #ifdef SK_GL #include "include/gpu/gl/GrGLFunctions.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #include diff --git a/fuzz/FuzzCreateDDL.cpp b/fuzz/FuzzCreateDDL.cpp index be44d20393..fc62e3894d 100644 --- a/fuzz/FuzzCreateDDL.cpp +++ b/fuzz/FuzzCreateDDL.cpp @@ -13,7 +13,7 @@ #include "include/core/SkSurfaceCharacterization.h" #include "include/gpu/GrDirectContext.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "tools/gpu/GrContextFactory.h" #include "fuzz/Fuzz.h" diff --git a/fuzz/FuzzTriangulation.cpp b/fuzz/FuzzTriangulation.cpp index b62054c483..b1a532d8a5 100644 --- a/fuzz/FuzzTriangulation.cpp +++ b/fuzz/FuzzTriangulation.cpp @@ -8,9 +8,9 @@ #include "fuzz/Fuzz.h" #include "fuzz/FuzzCommon.h" #include "include/core/SkPath.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/geometry/GrTriangulator.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrTriangulator.h" DEF_FUZZ(Triangulation, fuzz) { diff --git a/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp b/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp index e22ced3293..beb25f0ac3 100644 --- a/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp +++ b/fuzz/oss_fuzz/FuzzSKSL2GLSL.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLCompiler.h" #include "fuzz/Fuzz.h" diff --git a/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp b/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp index 546463a2c8..e0a75b2078 100644 --- a/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp +++ b/fuzz/oss_fuzz/FuzzSKSL2Metal.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLCompiler.h" #include "fuzz/Fuzz.h" diff --git a/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp b/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp index 6a529b0025..7cd5292626 100644 --- a/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp +++ b/fuzz/oss_fuzz/FuzzSKSL2Pipeline.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/codegen/SkSLPipelineStageCodeGenerator.h" #include "src/sksl/ir/SkSLVarDeclarations.h" diff --git a/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp b/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp index 41281f3e35..6840d7a974 100644 --- a/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp +++ b/fuzz/oss_fuzz/FuzzSKSL2SPIRV.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLCompiler.h" #include "fuzz/Fuzz.h" diff --git a/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp b/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp index d75c252b7d..ec52e5b13a 100644 --- a/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp +++ b/fuzz/oss_fuzz/FuzzSkRuntimeEffect.cpp @@ -12,7 +12,7 @@ #include "include/core/SkSurface.h" #include "include/effects/SkBlenders.h" #include "include/effects/SkRuntimeEffect.h" -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "fuzz/Fuzz.h" diff --git a/gm/BUILD.bazel b/gm/BUILD.bazel index 51a6ffe3ef..cc593fcba8 100644 --- a/gm/BUILD.bazel +++ b/gm/BUILD.bazel @@ -520,10 +520,10 @@ generated_cc_atom( "//include/core:SkString_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:TestOps_hdr", ], ) @@ -925,21 +925,21 @@ generated_cc_atom( "//include/core:SkRect_hdr", "//include/gpu:GrRecordingContext_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrBuffer_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpuBuffer_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrShaderVar_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrBuffer_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -1035,8 +1035,8 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrRecordingContext_hdr", "//src/core:SkCompressedDataUtils_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuBase_hdr", "//tools/gpu:ProxyUtils_hdr", @@ -1068,26 +1068,26 @@ generated_cc_atom( "//src/core:SkCanvasPriv_hdr", "//src/core:SkGeometry_hdr", "//src/core:SkPointPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrProcessorAnalysis_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrUserStencilSettings_hdr", - "//src/gpu/effects:GrBezierEffect_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/ops:GrMeshDrawOp_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrProcessorAnalysis_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrUserStencilSettings_hdr", + "//src/gpu/ganesh/effects:GrBezierEffect_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/ops:GrMeshDrawOp_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelper_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1196,14 +1196,14 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/effects:GrRRectEffect_hdr", - "//src/gpu/ops:FillRectOp_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrRRectEffect_hdr", + "//src/gpu/ganesh/ops:FillRectOp_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:ToolUtils_hdr", ], ) @@ -1393,8 +1393,8 @@ generated_cc_atom( "//include/core:SkTileMode_hdr", "//include/core:SkTypes_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", ], ) @@ -1619,7 +1619,7 @@ generated_cc_atom( "//include/private:SkTo_hdr", "//src/core:SkBlurMask_hdr", "//src/core:SkMask_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", "//tools/timer:TimeUtils_hdr", ], ) @@ -1927,9 +1927,9 @@ generated_cc_atom( "//include/core:SkRect_hdr", "//include/private:SkColorData_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SurfaceFillContext_hdr", "//src/gpu:Swizzle_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", ], ) @@ -2040,32 +2040,32 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//include/private:SkColorData_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpuBuffer_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrShaderVar_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrBuffer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -2551,9 +2551,9 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//src/core:SkCompressedDataUtils_hdr", "//src/core:SkMipmap_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuBase_hdr", "//third_party:etc1", @@ -2623,12 +2623,12 @@ generated_cc_atom( "//include/private:SkColorData_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkMatrixProvider_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:ToolUtils_hdr", "//tools/gpu:TestOps_hdr", ], @@ -2725,11 +2725,11 @@ generated_cc_atom( "//include/core:SkString_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu/effects:GrConvexPolyEffect_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh/effects:GrConvexPolyEffect_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:TestOps_hdr", ], ) @@ -3356,12 +3356,12 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/effects:SkImageFilters_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:Resources_hdr", "//tools:ToolUtils_hdr", ], @@ -3736,9 +3736,9 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkMatrixProvider_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:ToolUtils_hdr", ], ) @@ -3849,8 +3849,8 @@ generated_cc_atom( "//include/effects:SkRuntimeEffect_hdr", "//include/sksl:DSL_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", "//src/sksl/dsl/priv:DSLFPs_hdr", "//src/sksl/dsl/priv:DSLWriter_hdr", "//src/sksl/ir:SkSLVariable_hdr", @@ -4081,9 +4081,9 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//src/core:SkCompressedDataUtils_hdr", "//src/core:SkMipmap_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/gl:GrGLDefines_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuBase_hdr", "//tools:Resources_hdr", @@ -4292,8 +4292,8 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/gpu:GrTypes_hdr", "//include/private:SkTArray_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPixmap_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPixmap_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_Gpu_hdr", "//tools:ToolUtils_hdr", @@ -4321,7 +4321,7 @@ generated_cc_atom( "//include/gpu:GrContextOptions_hdr", "//include/gpu:GrDirectContext_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools:ToolUtils_hdr", ], ) @@ -4382,7 +4382,7 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/private:GrTypesPriv_hdr", "//include/private:SkTemplates_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools:ToolUtils_hdr", ], ) @@ -4438,13 +4438,13 @@ generated_cc_atom( "//include/core:SkFont_hdr", "//include/effects:SkRuntimeEffect_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:ToolUtils_hdr", ], ) @@ -4468,15 +4468,15 @@ generated_cc_atom( "//include/core:SkTileMode_hdr", "//include/core:SkTypes_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrRRectEffect_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrRRectEffect_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", "//tools:Resources_hdr", "//tools:ToolUtils_hdr", ], @@ -4499,30 +4499,30 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpuBuffer_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrShaderVar_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrBuffer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -4666,12 +4666,12 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkGpuBlurUtils_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//src/image:SkImage_Base_hdr", ], ) @@ -5065,10 +5065,10 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/gpu:GrTypes_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SurfaceContext_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_Gpu_hdr", ], @@ -5886,13 +5886,13 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkConvertPixels_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -6199,9 +6199,9 @@ generated_cc_atom( "//include/core:SkPath_hdr", "//include/gpu:GrContextOptions_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", "//tools:ToolUtils_hdr", ], ) @@ -6247,7 +6247,7 @@ generated_cc_atom( "//include/core:SkTypeface_hdr", "//include/effects:SkGradientShader_hdr", "//include/effects:SkImageFilters_hdr", - "//src/gpu/effects:GrMatrixConvolutionEffect_hdr", + "//src/gpu/ganesh/effects:GrMatrixConvolutionEffect_hdr", "//tools:ToolUtils_hdr", ], ) @@ -7251,10 +7251,10 @@ generated_cc_atom( "//include/gpu:GrContextOptions_hdr", "//include/gpu:GrRecordingContext_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:ToolUtils_hdr", ], ) @@ -7393,10 +7393,10 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrTypes_hdr", "//src/core:SkAutoPixmapStorage_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu/gl:GrGLCaps_hdr", - "//src/gpu/gl:GrGLDefines_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh/gl:GrGLCaps_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", ], ) @@ -7527,14 +7527,14 @@ generated_cc_atom( "//include/effects:SkGradientShader_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/effects:GrRRectEffect_hdr", - "//src/gpu/ops:FillRectOp_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrRRectEffect_hdr", + "//src/gpu/ganesh/ops:FillRectOp_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -7636,8 +7636,8 @@ generated_cc_atom( "//include/effects:SkRuntimeEffect_hdr", "//include/utils:SkRandom_hdr", "//src/core:SkRuntimeEffectPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", "//tools:Resources_hdr", "//tools:ToolUtils_hdr", ], @@ -8584,10 +8584,10 @@ generated_cc_atom( "//include/core:SkRect_hdr", "//include/core:SkTypes_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//tools:Resources_hdr", ], ) @@ -8647,22 +8647,22 @@ generated_cc_atom( deps = [ ":gm_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrShaderVar_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -8702,12 +8702,12 @@ generated_cc_atom( "//include/core:SkString_hdr", "//include/private:SkTArray_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:Resources_hdr", "//tools/gpu:TestOps_hdr", ], @@ -9203,11 +9203,11 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/utils:SkRandom_hdr", "//src/core:SkGeometry_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/ops:TessellationPathRenderer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/ops:TessellationPathRenderer_hdr", ], ) @@ -9418,8 +9418,8 @@ generated_cc_atom( "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkConvertPixels_hdr", "//src/core:SkYUVMath_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", "//tools:Resources_hdr", "//tools:ToolUtils_hdr", "//tools/gpu:YUVUtils_hdr", @@ -9438,11 +9438,11 @@ generated_cc_atom( "//include/gpu:GrContextOptions_hdr", "//include/gpu:GrDirectContext_hdr", "//include/utils:SkRandom_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/ops:TessellationPathRenderer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/ops:TessellationPathRenderer_hdr", ], ) @@ -9639,12 +9639,12 @@ generated_cc_atom( "//include/core:SkYUVAInfo_hdr", "//include/core:SkYUVAPixmaps_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrYUVATextureProxies_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrYUVtoRGBEffect_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrYUVATextureProxies_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrYUVtoRGBEffect_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) diff --git a/gm/aarecteffect.cpp b/gm/aarecteffect.cpp index a7176d8d73..3367c13ee1 100644 --- a/gm/aarecteffect.cpp +++ b/gm/aarecteffect.cpp @@ -18,10 +18,10 @@ #include "include/core/SkString.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/gpu/TestOps.h" #include diff --git a/gm/attributes.cpp b/gm/attributes.cpp index 28539e95ef..1d5b3fc6ab 100644 --- a/gm/attributes.cpp +++ b/gm/attributes.cpp @@ -10,21 +10,21 @@ #include "include/core/SkRect.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrShaderVar.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/gpu/ProxyUtils.h" #include diff --git a/gm/bc1_transparency.cpp b/gm/bc1_transparency.cpp index d52be82e4b..5c486d5fb5 100644 --- a/gm/bc1_transparency.cpp +++ b/gm/bc1_transparency.cpp @@ -11,8 +11,8 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkCompressedDataUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuBase.h" #include "tools/gpu/ProxyUtils.h" diff --git a/gm/beziereffects.cpp b/gm/beziereffects.cpp index ebd5132128..662b84230c 100644 --- a/gm/beziereffects.cpp +++ b/gm/beziereffects.cpp @@ -27,26 +27,26 @@ #include "src/core/SkCanvasPriv.h" #include "src/core/SkGeometry.h" #include "src/core/SkPointPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProcessorAnalysis.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/effects/GrBezierEffect.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/effects/GrBezierEffect.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include #include diff --git a/gm/bigrrectaaeffect.cpp b/gm/bigrrectaaeffect.cpp index d5061354bb..56a3f566c4 100644 --- a/gm/bigrrectaaeffect.cpp +++ b/gm/bigrrectaaeffect.cpp @@ -19,14 +19,14 @@ #include "include/core/SkTypes.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/effects/GrRRectEffect.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/ToolUtils.h" #include diff --git a/gm/bitmapshader.cpp b/gm/bitmapshader.cpp index cbf153a5d1..7ee6aad8fb 100644 --- a/gm/bitmapshader.cpp +++ b/gm/bitmapshader.cpp @@ -19,8 +19,8 @@ #include "include/core/SkTileMode.h" #include "include/core/SkTypes.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" namespace skiagm { diff --git a/gm/blurrect.cpp b/gm/blurrect.cpp index 2ff36ca747..07f734d87e 100644 --- a/gm/blurrect.cpp +++ b/gm/blurrect.cpp @@ -32,7 +32,7 @@ #include "include/private/SkTo.h" #include "src/core/SkBlurMask.h" #include "src/core/SkMask.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "tools/timer/TimeUtils.h" #include diff --git a/gm/clear_swizzle.cpp b/gm/clear_swizzle.cpp index 2564a073aa..c95e48dde8 100644 --- a/gm/clear_swizzle.cpp +++ b/gm/clear_swizzle.cpp @@ -12,9 +12,9 @@ #include "include/core/SkRect.h" #include "include/private/SkColorData.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SurfaceFillContext.h" #include "src/gpu/Swizzle.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" namespace skiagm { diff --git a/gm/clockwise.cpp b/gm/clockwise.cpp index 26ec414e57..cdfea165a7 100644 --- a/gm/clockwise.cpp +++ b/gm/clockwise.cpp @@ -21,32 +21,32 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/gpu/ProxyUtils.h" #include diff --git a/gm/compressed_textures.cpp b/gm/compressed_textures.cpp index dab9e88073..ec3d57a22b 100644 --- a/gm/compressed_textures.cpp +++ b/gm/compressed_textures.cpp @@ -25,9 +25,9 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuBase.h" #include "third_party/etc1/etc1.h" diff --git a/gm/constcolorprocessor.cpp b/gm/constcolorprocessor.cpp index e40821ef12..7afcbd0aca 100644 --- a/gm/constcolorprocessor.cpp +++ b/gm/constcolorprocessor.cpp @@ -30,12 +30,12 @@ #include "include/private/SkColorData.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkMatrixProvider.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/ToolUtils.h" #include "tools/gpu/TestOps.h" diff --git a/gm/convexpolyeffect.cpp b/gm/convexpolyeffect.cpp index 87e931fb49..674a483b75 100644 --- a/gm/convexpolyeffect.cpp +++ b/gm/convexpolyeffect.cpp @@ -20,11 +20,11 @@ #include "include/core/SkString.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/effects/GrConvexPolyEffect.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/effects/GrConvexPolyEffect.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/gpu/TestOps.h" #include diff --git a/gm/destcolor.cpp b/gm/destcolor.cpp index 520de1137c..627bbe2e11 100644 --- a/gm/destcolor.cpp +++ b/gm/destcolor.cpp @@ -13,12 +13,12 @@ #include "include/core/SkTypes.h" #include "include/effects/SkImageFilters.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/Resources.h" #include "tools/ToolUtils.h" diff --git a/gm/drawquadset.cpp b/gm/drawquadset.cpp index fad8a1aea1..dff6961536 100644 --- a/gm/drawquadset.cpp +++ b/gm/drawquadset.cpp @@ -26,9 +26,9 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkMatrixProvider.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/ToolUtils.h" #include diff --git a/gm/dsl_processor_test.cpp b/gm/dsl_processor_test.cpp index 467226e171..be26f68ebb 100644 --- a/gm/dsl_processor_test.cpp +++ b/gm/dsl_processor_test.cpp @@ -9,8 +9,8 @@ #include "include/effects/SkRuntimeEffect.h" #include "include/sksl/DSL.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" #include "src/sksl/dsl/priv/DSLFPs.h" #include "src/sksl/dsl/priv/DSLWriter.h" #include "src/sksl/ir/SkSLVariable.h" diff --git a/gm/exoticformats.cpp b/gm/exoticformats.cpp index 3bd0fad019..86d182ae85 100644 --- a/gm/exoticformats.cpp +++ b/gm/exoticformats.cpp @@ -13,9 +13,9 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuBase.h" #include "tools/gpu/ProxyUtils.h" diff --git a/gm/flippity.cpp b/gm/flippity.cpp index 5edf19286b..7ac50e08e8 100644 --- a/gm/flippity.cpp +++ b/gm/flippity.cpp @@ -27,8 +27,8 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrTypes.h" #include "include/private/SkTArray.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPixmap.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPixmap.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" #include "tools/ToolUtils.h" diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index f65e31a6b4..21b6669f25 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -23,7 +23,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tools/ToolUtils.h" static SkScalar draw_string(SkCanvas* canvas, const SkString& text, SkScalar x, diff --git a/gm/fontregen.cpp b/gm/fontregen.cpp index 26c9b954c8..26ac51f988 100644 --- a/gm/fontregen.cpp +++ b/gm/fontregen.cpp @@ -33,7 +33,7 @@ #include "include/gpu/GrRecordingContext.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkTemplates.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tools/ToolUtils.h" static sk_sp make_blob(const SkString& text, const SkFont& font) { diff --git a/gm/fp_sample_chaining.cpp b/gm/fp_sample_chaining.cpp index 1ba87ea810..f21da69fba 100644 --- a/gm/fp_sample_chaining.cpp +++ b/gm/fp_sample_chaining.cpp @@ -10,13 +10,13 @@ #include "include/core/SkFont.h" #include "include/effects/SkRuntimeEffect.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/ToolUtils.h" namespace { diff --git a/gm/fpcoordinateoverride.cpp b/gm/fpcoordinateoverride.cpp index fcaf1e57b1..c31ea708fb 100644 --- a/gm/fpcoordinateoverride.cpp +++ b/gm/fpcoordinateoverride.cpp @@ -19,15 +19,15 @@ #include "include/core/SkTileMode.h" #include "include/core/SkTypes.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrRRectEffect.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" #include "tools/Resources.h" #include "tools/ToolUtils.h" diff --git a/gm/fwidth_squircle.cpp b/gm/fwidth_squircle.cpp index 4a2023b2d5..368f2aa43b 100644 --- a/gm/fwidth_squircle.cpp +++ b/gm/fwidth_squircle.cpp @@ -17,30 +17,30 @@ #include "include/gpu/GrRecordingContext.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/gpu/ProxyUtils.h" #include diff --git a/gm/gpu_blur_utils.cpp b/gm/gpu_blur_utils.cpp index de77519c24..5d87e61f5d 100644 --- a/gm/gpu_blur_utils.cpp +++ b/gm/gpu_blur_utils.cpp @@ -12,12 +12,12 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkGpuBlurUtils.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/image/SkImage_Base.h" namespace { diff --git a/gm/image_pict.cpp b/gm/image_pict.cpp index 75ac56bfbb..8f05448b18 100644 --- a/gm/image_pict.cpp +++ b/gm/image_pict.cpp @@ -29,10 +29,10 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" diff --git a/gm/lazytiling.cpp b/gm/lazytiling.cpp index 63c559bfa4..df9e7e112b 100644 --- a/gm/lazytiling.cpp +++ b/gm/lazytiling.cpp @@ -15,13 +15,13 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/gpu/ProxyUtils.h" static GrSurfaceProxyView create_view(GrDirectContext* dContext, diff --git a/gm/manypathatlases.cpp b/gm/manypathatlases.cpp index ab0bc167cc..b6c7214106 100644 --- a/gm/manypathatlases.cpp +++ b/gm/manypathatlases.cpp @@ -10,9 +10,9 @@ #include "include/core/SkPath.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "tools/ToolUtils.h" namespace skiagm { diff --git a/gm/matrixconvolution.cpp b/gm/matrixconvolution.cpp index a150057e5c..f721a80146 100644 --- a/gm/matrixconvolution.cpp +++ b/gm/matrixconvolution.cpp @@ -22,7 +22,7 @@ #include "include/core/SkTypeface.h" #include "include/effects/SkGradientShader.h" #include "include/effects/SkImageFilters.h" -#include "src/gpu/effects/GrMatrixConvolutionEffect.h" +#include "src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h" #include "tools/ToolUtils.h" #include diff --git a/gm/preservefillrule.cpp b/gm/preservefillrule.cpp index 2b559d17cb..73b5fa9a9b 100644 --- a/gm/preservefillrule.cpp +++ b/gm/preservefillrule.cpp @@ -11,10 +11,10 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/ToolUtils.h" namespace skiagm { diff --git a/gm/rectangletexture.cpp b/gm/rectangletexture.cpp index b0e87611fa..0b8cc00f93 100644 --- a/gm/rectangletexture.cpp +++ b/gm/rectangletexture.cpp @@ -30,10 +30,10 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrTypes.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/gl/GrGLCaps.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include #include diff --git a/gm/rrects.cpp b/gm/rrects.cpp index 7e853288fa..766a9bad60 100644 --- a/gm/rrects.cpp +++ b/gm/rrects.cpp @@ -20,14 +20,14 @@ #include "include/effects/SkGradientShader.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/effects/GrRRectEffect.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include #include diff --git a/gm/runtimeintrinsics.cpp b/gm/runtimeintrinsics.cpp index 183da789fa..5eb96b6c8a 100644 --- a/gm/runtimeintrinsics.cpp +++ b/gm/runtimeintrinsics.cpp @@ -19,8 +19,8 @@ #include "include/effects/SkRuntimeEffect.h" #include "include/utils/SkRandom.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "tools/Resources.h" #include "tools/ToolUtils.h" diff --git a/gm/swizzle.cpp b/gm/swizzle.cpp index ab8f0c4f3d..da9b838e3c 100644 --- a/gm/swizzle.cpp +++ b/gm/swizzle.cpp @@ -13,10 +13,10 @@ #include "include/core/SkRect.h" #include "include/core/SkTypes.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "tools/Resources.h" DEF_SIMPLE_GPU_GM(swizzle, rContext, canvas, 512, 512) { diff --git a/gm/tessellation.cpp b/gm/tessellation.cpp index c0e337c073..526d4bc4e5 100644 --- a/gm/tessellation.cpp +++ b/gm/tessellation.cpp @@ -8,22 +8,22 @@ #include "gm/gm.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace skiagm { diff --git a/gm/texelsubset.cpp b/gm/texelsubset.cpp index f0bc241176..cdad2e9970 100644 --- a/gm/texelsubset.cpp +++ b/gm/texelsubset.cpp @@ -18,12 +18,12 @@ #include "include/core/SkString.h" #include "include/private/SkTArray.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tools/Resources.h" #include "tools/gpu/TestOps.h" diff --git a/gm/trickycubicstrokes.cpp b/gm/trickycubicstrokes.cpp index 07d72aaddb..938638a1d3 100644 --- a/gm/trickycubicstrokes.cpp +++ b/gm/trickycubicstrokes.cpp @@ -20,10 +20,10 @@ #include "include/gpu/GrDirectContext.h" #include "include/utils/SkRandom.h" #include "src/core/SkGeometry.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" static constexpr float kStrokeWidth = 30; static constexpr int kCellSize = 200; @@ -182,7 +182,7 @@ DEF_SIMPLE_GM(trickycubicstrokes_roundcaps, canvas, kTestWidth, kTestHeight) { } #if SK_GPU_V1 -#include "src/gpu/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" class TrickyCubicStrokes_tess_segs_5 : public skiagm::GM { SkString onShortName() override { diff --git a/gm/wacky_yuv_formats.cpp b/gm/wacky_yuv_formats.cpp index c753426635..2fde8bf700 100644 --- a/gm/wacky_yuv_formats.cpp +++ b/gm/wacky_yuv_formats.cpp @@ -45,8 +45,8 @@ #include "include/utils/SkTextUtils.h" #include "src/core/SkConvertPixels.h" #include "src/core/SkYUVMath.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "tools/ToolUtils.h" #include "tools/gpu/YUVUtils.h" diff --git a/gm/widebuttcaps.cpp b/gm/widebuttcaps.cpp index a8c2a9ddf7..5476470c1c 100644 --- a/gm/widebuttcaps.cpp +++ b/gm/widebuttcaps.cpp @@ -12,11 +12,11 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" static constexpr float kStrokeWidth = 100; static constexpr int kTestWidth = 120 * 4; diff --git a/gm/yuvtorgbsubset.cpp b/gm/yuvtorgbsubset.cpp index e2f707c499..1dc6153c6e 100644 --- a/gm/yuvtorgbsubset.cpp +++ b/gm/yuvtorgbsubset.cpp @@ -19,12 +19,12 @@ #include "include/core/SkYUVAInfo.h" #include "include/core/SkYUVAPixmaps.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrYUVATextureProxies.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrYUVtoRGBEffect.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include #include diff --git a/gn/gpu.gni b/gn/gpu.gni index 6660d859a7..686a708c91 100644 --- a/gn/gpu.gni +++ b/gn/gpu.gni @@ -6,7 +6,6 @@ # Things are easiest for everyone if these source paths are absolute. _src = get_path_info("../src", "abspath") _include = get_path_info("../include", "abspath") - skia_gpu_sources = [ "$_include/gpu/GrBackendDrawableInfo.h", "$_include/gpu/GrBackendSemaphore.h", @@ -29,366 +28,368 @@ skia_gpu_sources = [ "$_include/private/GrMtlTypesPriv.h", "$_include/private/GrTypesPriv.h", "$_include/private/chromium/GrSlug.h", - "$_src/gpu/GrAHardwareBufferImageGenerator.cpp", - "$_src/gpu/GrAHardwareBufferImageGenerator.h", - "$_src/gpu/GrAHardwareBufferUtils.cpp", "$_src/gpu/GrAHardwareBufferUtils.h", - "$_src/gpu/GrAppliedClip.h", - "$_src/gpu/GrAttachment.cpp", - "$_src/gpu/GrAttachment.h", - "$_src/gpu/GrAuditTrail.h", - "$_src/gpu/GrAutoLocaleSetter.h", - "$_src/gpu/GrBackendSemaphore.cpp", - "$_src/gpu/GrBackendSurface.cpp", - "$_src/gpu/GrBackendSurfaceMutableState.cpp", - "$_src/gpu/GrBackendSurfaceMutableStateImpl.h", - "$_src/gpu/GrBackendTextureImageGenerator.cpp", - "$_src/gpu/GrBackendTextureImageGenerator.h", - "$_src/gpu/GrBackendUtils.cpp", - "$_src/gpu/GrBackendUtils.h", - "$_src/gpu/GrBaseContextPriv.h", - "$_src/gpu/GrBuffer.h", - "$_src/gpu/GrBufferAllocPool.cpp", - "$_src/gpu/GrBufferAllocPool.h", - "$_src/gpu/GrCaps.cpp", - "$_src/gpu/GrCaps.h", - "$_src/gpu/GrClientMappedBufferManager.cpp", - "$_src/gpu/GrClientMappedBufferManager.h", - "$_src/gpu/GrClip.h", - "$_src/gpu/GrColor.h", - "$_src/gpu/GrColorInfo.cpp", - "$_src/gpu/GrColorInfo.h", - "$_src/gpu/GrColorSpaceXform.cpp", - "$_src/gpu/GrColorSpaceXform.h", - "$_src/gpu/GrContextThreadSafeProxy.cpp", - "$_src/gpu/GrContextThreadSafeProxyPriv.h", - "$_src/gpu/GrContext_Base.cpp", - "$_src/gpu/GrCopyRenderTask.cpp", - "$_src/gpu/GrCopyRenderTask.h", - "$_src/gpu/GrCpuBuffer.h", - "$_src/gpu/GrDDLContext.cpp", - "$_src/gpu/GrDDLTask.cpp", - "$_src/gpu/GrDDLTask.h", - "$_src/gpu/GrDataUtils.cpp", - "$_src/gpu/GrDataUtils.h", - "$_src/gpu/GrDefaultGeoProcFactory.cpp", - "$_src/gpu/GrDefaultGeoProcFactory.h", - "$_src/gpu/GrDeferredProxyUploader.h", - "$_src/gpu/GrDeferredUpload.h", - "$_src/gpu/GrDirectContext.cpp", - "$_src/gpu/GrDirectContextPriv.cpp", - "$_src/gpu/GrDirectContextPriv.h", - "$_src/gpu/GrDistanceFieldGenFromVector.cpp", - "$_src/gpu/GrDistanceFieldGenFromVector.h", - "$_src/gpu/GrDrawIndirectCommand.h", - "$_src/gpu/GrDrawOpAtlas.cpp", - "$_src/gpu/GrDrawOpAtlas.h", - "$_src/gpu/GrDrawingManager.cpp", - "$_src/gpu/GrDrawingManager.h", - "$_src/gpu/GrDriverBugWorkarounds.cpp", - "$_src/gpu/GrDstProxyView.h", - "$_src/gpu/GrDynamicAtlas.cpp", - "$_src/gpu/GrDynamicAtlas.h", - "$_src/gpu/GrEagerVertexAllocator.cpp", - "$_src/gpu/GrEagerVertexAllocator.h", - "$_src/gpu/GrFinishCallbacks.cpp", - "$_src/gpu/GrFinishCallbacks.h", - "$_src/gpu/GrFixedClip.cpp", - "$_src/gpu/GrFixedClip.h", - "$_src/gpu/GrFragmentProcessor.cpp", - "$_src/gpu/GrFragmentProcessor.h", - "$_src/gpu/GrGeometryProcessor.cpp", - "$_src/gpu/GrGeometryProcessor.h", - "$_src/gpu/GrGlyph.h", - "$_src/gpu/GrGpu.cpp", - "$_src/gpu/GrGpu.h", - "$_src/gpu/GrGpuBuffer.cpp", - "$_src/gpu/GrGpuBuffer.h", - "$_src/gpu/GrGpuResource.cpp", - "$_src/gpu/GrGpuResource.h", - "$_src/gpu/GrGpuResourceCacheAccess.h", - "$_src/gpu/GrGpuResourcePriv.h", - "$_src/gpu/GrHashMapWithCache.h", - "$_src/gpu/GrImageContext.cpp", - "$_src/gpu/GrImageContextPriv.h", - "$_src/gpu/GrImageInfo.cpp", - "$_src/gpu/GrImageInfo.h", - "$_src/gpu/GrManagedResource.cpp", - "$_src/gpu/GrManagedResource.h", - "$_src/gpu/GrMemoryPool.cpp", - "$_src/gpu/GrMemoryPool.h", - "$_src/gpu/GrMeshDrawTarget.cpp", - "$_src/gpu/GrMeshDrawTarget.h", - "$_src/gpu/GrNativeRect.h", - "$_src/gpu/GrNonAtomicRef.h", - "$_src/gpu/GrOnFlushResourceProvider.cpp", - "$_src/gpu/GrOnFlushResourceProvider.h", - "$_src/gpu/GrOpFlushState.cpp", - "$_src/gpu/GrOpFlushState.h", - "$_src/gpu/GrOpsRenderPass.cpp", - "$_src/gpu/GrOpsRenderPass.h", - "$_src/gpu/GrOpsTypes.h", - "$_src/gpu/GrPaint.cpp", - "$_src/gpu/GrPaint.h", - "$_src/gpu/GrPersistentCacheUtils.cpp", - "$_src/gpu/GrPersistentCacheUtils.h", - "$_src/gpu/GrPipeline.cpp", - "$_src/gpu/GrPipeline.h", - "$_src/gpu/GrPixmap.h", - "$_src/gpu/GrProcessor.cpp", - "$_src/gpu/GrProcessor.h", - "$_src/gpu/GrProcessorAnalysis.cpp", - "$_src/gpu/GrProcessorAnalysis.h", - "$_src/gpu/GrProcessorSet.cpp", - "$_src/gpu/GrProcessorSet.h", - "$_src/gpu/GrProcessorUnitTest.cpp", - "$_src/gpu/GrProcessorUnitTest.h", - "$_src/gpu/GrProgramDesc.cpp", - "$_src/gpu/GrProgramDesc.h", - "$_src/gpu/GrProgramInfo.cpp", - "$_src/gpu/GrProgramInfo.h", - "$_src/gpu/GrProxyProvider.cpp", - "$_src/gpu/GrProxyProvider.h", - "$_src/gpu/GrRecordingContext.cpp", - "$_src/gpu/GrRecordingContextPriv.cpp", - "$_src/gpu/GrRecordingContextPriv.h", "$_src/gpu/GrRectanizer.h", - "$_src/gpu/GrRectanizerPow2.cpp", - "$_src/gpu/GrRectanizerPow2.h", - "$_src/gpu/GrRectanizerSkyline.cpp", - "$_src/gpu/GrRectanizerSkyline.h", - "$_src/gpu/GrRefCnt.h", - "$_src/gpu/GrRenderTarget.cpp", - "$_src/gpu/GrRenderTarget.h", - "$_src/gpu/GrRenderTargetProxy.cpp", - "$_src/gpu/GrRenderTargetProxy.h", - "$_src/gpu/GrRenderTask.cpp", - "$_src/gpu/GrRenderTask.h", - "$_src/gpu/GrRenderTaskCluster.cpp", - "$_src/gpu/GrRenderTaskCluster.h", - "$_src/gpu/GrResourceAllocator.cpp", - "$_src/gpu/GrResourceAllocator.h", - "$_src/gpu/GrResourceCache.cpp", - "$_src/gpu/GrResourceCache.h", - "$_src/gpu/GrResourceHandle.h", - "$_src/gpu/GrResourceProvider.cpp", - "$_src/gpu/GrResourceProvider.h", - "$_src/gpu/GrResourceProviderPriv.h", - "$_src/gpu/GrRingBuffer.cpp", - "$_src/gpu/GrRingBuffer.h", - "$_src/gpu/GrSPIRVUniformHandler.cpp", - "$_src/gpu/GrSPIRVUniformHandler.h", - "$_src/gpu/GrSPIRVVaryingHandler.cpp", - "$_src/gpu/GrSPIRVVaryingHandler.h", - "$_src/gpu/GrSWMaskHelper.cpp", - "$_src/gpu/GrSWMaskHelper.h", - "$_src/gpu/GrSamplerState.h", - "$_src/gpu/GrScissorState.h", - "$_src/gpu/GrSemaphore.h", - "$_src/gpu/GrShaderCaps.cpp", - "$_src/gpu/GrShaderCaps.h", - "$_src/gpu/GrShaderVar.cpp", - "$_src/gpu/GrShaderVar.h", - "$_src/gpu/GrSimpleMesh.h", - "$_src/gpu/GrStagingBufferManager.cpp", - "$_src/gpu/GrStagingBufferManager.h", - "$_src/gpu/GrStencilSettings.cpp", - "$_src/gpu/GrStencilSettings.h", - "$_src/gpu/GrStyle.cpp", - "$_src/gpu/GrStyle.h", - "$_src/gpu/GrSubRunAllocator.cpp", - "$_src/gpu/GrSubRunAllocator.h", - "$_src/gpu/GrSurface.cpp", - "$_src/gpu/GrSurface.h", - "$_src/gpu/GrSurfaceInfo.cpp", - "$_src/gpu/GrSurfaceProxy.cpp", - "$_src/gpu/GrSurfaceProxy.h", - "$_src/gpu/GrSurfaceProxyPriv.h", - "$_src/gpu/GrSurfaceProxyView.h", - "$_src/gpu/GrTTopoSort.h", - "$_src/gpu/GrTestUtils.cpp", - "$_src/gpu/GrTestUtils.h", - "$_src/gpu/GrTexture.cpp", - "$_src/gpu/GrTexture.h", - "$_src/gpu/GrTextureProxy.cpp", - "$_src/gpu/GrTextureProxy.h", - "$_src/gpu/GrTextureProxyCacheAccess.h", - "$_src/gpu/GrTextureProxyPriv.h", - "$_src/gpu/GrTextureRenderTargetProxy.cpp", - "$_src/gpu/GrTextureRenderTargetProxy.h", - "$_src/gpu/GrTextureResolveManager.h", - "$_src/gpu/GrTextureResolveRenderTask.cpp", - "$_src/gpu/GrTextureResolveRenderTask.h", - "$_src/gpu/GrThreadSafeCache.cpp", - "$_src/gpu/GrThreadSafeCache.h", - "$_src/gpu/GrThreadSafePipelineBuilder.cpp", - "$_src/gpu/GrThreadSafePipelineBuilder.h", - "$_src/gpu/GrTracing.h", - "$_src/gpu/GrTransferFromRenderTask.cpp", - "$_src/gpu/GrTransferFromRenderTask.h", - "$_src/gpu/GrUniformDataManager.cpp", - "$_src/gpu/GrUniformDataManager.h", - "$_src/gpu/GrUserStencilSettings.h", - "$_src/gpu/GrUtil.cpp", - "$_src/gpu/GrUtil.h", - "$_src/gpu/GrVertexChunkArray.cpp", - "$_src/gpu/GrVertexChunkArray.h", - "$_src/gpu/GrVx.h", - "$_src/gpu/GrWaitRenderTask.cpp", - "$_src/gpu/GrWaitRenderTask.h", - "$_src/gpu/GrWindowRectangles.h", - "$_src/gpu/GrWindowRectsState.h", - "$_src/gpu/GrWritePixelsRenderTask.cpp", - "$_src/gpu/GrWritePixelsRenderTask.h", - "$_src/gpu/GrXferProcessor.cpp", - "$_src/gpu/GrXferProcessor.h", - "$_src/gpu/GrYUVABackendTextures.cpp", - "$_src/gpu/GrYUVATextureProxies.cpp", - "$_src/gpu/GrYUVATextureProxies.h", - "$_src/gpu/SurfaceContext.cpp", - "$_src/gpu/SurfaceContext.h", - "$_src/gpu/SurfaceFillContext.cpp", - "$_src/gpu/SurfaceFillContext.h", + "$_src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp", + "$_src/gpu/ganesh/GrAHardwareBufferImageGenerator.h", + "$_src/gpu/ganesh/GrAHardwareBufferUtils.cpp", + "$_src/gpu/ganesh/GrAHardwareBufferUtils_impl.h", + "$_src/gpu/ganesh/GrAppliedClip.h", + "$_src/gpu/ganesh/GrAttachment.cpp", + "$_src/gpu/ganesh/GrAttachment.h", + "$_src/gpu/ganesh/GrAuditTrail.h", + "$_src/gpu/ganesh/GrAutoLocaleSetter.h", + "$_src/gpu/ganesh/GrBackendSemaphore.cpp", + "$_src/gpu/ganesh/GrBackendSurface.cpp", + "$_src/gpu/ganesh/GrBackendSurfaceMutableState.cpp", + "$_src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h", + "$_src/gpu/ganesh/GrBackendTextureImageGenerator.cpp", + "$_src/gpu/ganesh/GrBackendTextureImageGenerator.h", + "$_src/gpu/ganesh/GrBackendUtils.cpp", + "$_src/gpu/ganesh/GrBackendUtils.h", + "$_src/gpu/ganesh/GrBaseContextPriv.h", + "$_src/gpu/ganesh/GrBuffer.h", + "$_src/gpu/ganesh/GrBufferAllocPool.cpp", + "$_src/gpu/ganesh/GrBufferAllocPool.h", + "$_src/gpu/ganesh/GrCaps.cpp", + "$_src/gpu/ganesh/GrCaps.h", + "$_src/gpu/ganesh/GrClientMappedBufferManager.cpp", + "$_src/gpu/ganesh/GrClientMappedBufferManager.h", + "$_src/gpu/ganesh/GrClip.h", + "$_src/gpu/ganesh/GrColor.h", + "$_src/gpu/ganesh/GrColorInfo.cpp", + "$_src/gpu/ganesh/GrColorInfo.h", + "$_src/gpu/ganesh/GrColorSpaceXform.cpp", + "$_src/gpu/ganesh/GrColorSpaceXform.h", + "$_src/gpu/ganesh/GrContextThreadSafeProxy.cpp", + "$_src/gpu/ganesh/GrContextThreadSafeProxyPriv.h", + "$_src/gpu/ganesh/GrContext_Base.cpp", + "$_src/gpu/ganesh/GrCopyRenderTask.cpp", + "$_src/gpu/ganesh/GrCopyRenderTask.h", + "$_src/gpu/ganesh/GrCpuBuffer.h", + "$_src/gpu/ganesh/GrDDLContext.cpp", + "$_src/gpu/ganesh/GrDDLTask.cpp", + "$_src/gpu/ganesh/GrDDLTask.h", + "$_src/gpu/ganesh/GrDataUtils.cpp", + "$_src/gpu/ganesh/GrDataUtils.h", + "$_src/gpu/ganesh/GrDefaultGeoProcFactory.cpp", + "$_src/gpu/ganesh/GrDefaultGeoProcFactory.h", + "$_src/gpu/ganesh/GrDeferredProxyUploader.h", + "$_src/gpu/ganesh/GrDeferredUpload.h", + "$_src/gpu/ganesh/GrDirectContext.cpp", + "$_src/gpu/ganesh/GrDirectContextPriv.cpp", + "$_src/gpu/ganesh/GrDirectContextPriv.h", + "$_src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp", + "$_src/gpu/ganesh/GrDistanceFieldGenFromVector.h", + "$_src/gpu/ganesh/GrDrawIndirectCommand.h", + "$_src/gpu/ganesh/GrDrawOpAtlas.cpp", + "$_src/gpu/ganesh/GrDrawOpAtlas.h", + "$_src/gpu/ganesh/GrDrawingManager.cpp", + "$_src/gpu/ganesh/GrDrawingManager.h", + "$_src/gpu/ganesh/GrDriverBugWorkarounds.cpp", + "$_src/gpu/ganesh/GrDstProxyView.h", + "$_src/gpu/ganesh/GrDynamicAtlas.cpp", + "$_src/gpu/ganesh/GrDynamicAtlas.h", + "$_src/gpu/ganesh/GrEagerVertexAllocator.cpp", + "$_src/gpu/ganesh/GrEagerVertexAllocator.h", + "$_src/gpu/ganesh/GrFinishCallbacks.cpp", + "$_src/gpu/ganesh/GrFinishCallbacks.h", + "$_src/gpu/ganesh/GrFixedClip.cpp", + "$_src/gpu/ganesh/GrFixedClip.h", + "$_src/gpu/ganesh/GrFragmentProcessor.cpp", + "$_src/gpu/ganesh/GrFragmentProcessor.h", + "$_src/gpu/ganesh/GrGeometryProcessor.cpp", + "$_src/gpu/ganesh/GrGeometryProcessor.h", + "$_src/gpu/ganesh/GrGlyph.h", + "$_src/gpu/ganesh/GrGpu.cpp", + "$_src/gpu/ganesh/GrGpu.h", + "$_src/gpu/ganesh/GrGpuBuffer.cpp", + "$_src/gpu/ganesh/GrGpuBuffer.h", + "$_src/gpu/ganesh/GrGpuResource.cpp", + "$_src/gpu/ganesh/GrGpuResource.h", + "$_src/gpu/ganesh/GrGpuResourceCacheAccess.h", + "$_src/gpu/ganesh/GrGpuResourcePriv.h", + "$_src/gpu/ganesh/GrHashMapWithCache.h", + "$_src/gpu/ganesh/GrImageContext.cpp", + "$_src/gpu/ganesh/GrImageContextPriv.h", + "$_src/gpu/ganesh/GrImageInfo.cpp", + "$_src/gpu/ganesh/GrImageInfo.h", + "$_src/gpu/ganesh/GrManagedResource.cpp", + "$_src/gpu/ganesh/GrManagedResource.h", + "$_src/gpu/ganesh/GrMemoryPool.cpp", + "$_src/gpu/ganesh/GrMemoryPool.h", + "$_src/gpu/ganesh/GrMeshDrawTarget.cpp", + "$_src/gpu/ganesh/GrMeshDrawTarget.h", + "$_src/gpu/ganesh/GrNativeRect.h", + "$_src/gpu/ganesh/GrNonAtomicRef.h", + "$_src/gpu/ganesh/GrOnFlushResourceProvider.cpp", + "$_src/gpu/ganesh/GrOnFlushResourceProvider.h", + "$_src/gpu/ganesh/GrOpFlushState.cpp", + "$_src/gpu/ganesh/GrOpFlushState.h", + "$_src/gpu/ganesh/GrOpsRenderPass.cpp", + "$_src/gpu/ganesh/GrOpsRenderPass.h", + "$_src/gpu/ganesh/GrOpsTypes.h", + "$_src/gpu/ganesh/GrPaint.cpp", + "$_src/gpu/ganesh/GrPaint.h", + "$_src/gpu/ganesh/GrPersistentCacheUtils.cpp", + "$_src/gpu/ganesh/GrPersistentCacheUtils.h", + "$_src/gpu/ganesh/GrPipeline.cpp", + "$_src/gpu/ganesh/GrPipeline.h", + "$_src/gpu/ganesh/GrPixmap.h", + "$_src/gpu/ganesh/GrProcessor.cpp", + "$_src/gpu/ganesh/GrProcessor.h", + "$_src/gpu/ganesh/GrProcessorAnalysis.cpp", + "$_src/gpu/ganesh/GrProcessorAnalysis.h", + "$_src/gpu/ganesh/GrProcessorSet.cpp", + "$_src/gpu/ganesh/GrProcessorSet.h", + "$_src/gpu/ganesh/GrProcessorUnitTest.cpp", + "$_src/gpu/ganesh/GrProcessorUnitTest.h", + "$_src/gpu/ganesh/GrProgramDesc.cpp", + "$_src/gpu/ganesh/GrProgramDesc.h", + "$_src/gpu/ganesh/GrProgramInfo.cpp", + "$_src/gpu/ganesh/GrProgramInfo.h", + "$_src/gpu/ganesh/GrProxyProvider.cpp", + "$_src/gpu/ganesh/GrProxyProvider.h", + "$_src/gpu/ganesh/GrRecordingContext.cpp", + "$_src/gpu/ganesh/GrRecordingContextPriv.cpp", + "$_src/gpu/ganesh/GrRecordingContextPriv.h", + "$_src/gpu/ganesh/GrRectanizerPow2.cpp", + "$_src/gpu/ganesh/GrRectanizerPow2.h", + "$_src/gpu/ganesh/GrRectanizerSkyline.cpp", + "$_src/gpu/ganesh/GrRectanizerSkyline.h", + "$_src/gpu/ganesh/GrRectanizer_impl.h", + "$_src/gpu/ganesh/GrRefCnt.h", + "$_src/gpu/ganesh/GrRenderTarget.cpp", + "$_src/gpu/ganesh/GrRenderTarget.h", + "$_src/gpu/ganesh/GrRenderTargetProxy.cpp", + "$_src/gpu/ganesh/GrRenderTargetProxy.h", + "$_src/gpu/ganesh/GrRenderTask.cpp", + "$_src/gpu/ganesh/GrRenderTask.h", + "$_src/gpu/ganesh/GrRenderTaskCluster.cpp", + "$_src/gpu/ganesh/GrRenderTaskCluster.h", + "$_src/gpu/ganesh/GrResourceAllocator.cpp", + "$_src/gpu/ganesh/GrResourceAllocator.h", + "$_src/gpu/ganesh/GrResourceCache.cpp", + "$_src/gpu/ganesh/GrResourceCache.h", + "$_src/gpu/ganesh/GrResourceHandle.h", + "$_src/gpu/ganesh/GrResourceProvider.cpp", + "$_src/gpu/ganesh/GrResourceProvider.h", + "$_src/gpu/ganesh/GrResourceProviderPriv.h", + "$_src/gpu/ganesh/GrRingBuffer.cpp", + "$_src/gpu/ganesh/GrRingBuffer.h", + "$_src/gpu/ganesh/GrSPIRVUniformHandler.cpp", + "$_src/gpu/ganesh/GrSPIRVUniformHandler.h", + "$_src/gpu/ganesh/GrSPIRVVaryingHandler.cpp", + "$_src/gpu/ganesh/GrSPIRVVaryingHandler.h", + "$_src/gpu/ganesh/GrSWMaskHelper.cpp", + "$_src/gpu/ganesh/GrSWMaskHelper.h", + "$_src/gpu/ganesh/GrSamplerState.h", + "$_src/gpu/ganesh/GrScissorState.h", + "$_src/gpu/ganesh/GrSemaphore.h", + "$_src/gpu/ganesh/GrShaderCaps.cpp", + "$_src/gpu/ganesh/GrShaderCaps.h", + "$_src/gpu/ganesh/GrShaderVar.cpp", + "$_src/gpu/ganesh/GrShaderVar.h", + "$_src/gpu/ganesh/GrSimpleMesh.h", + "$_src/gpu/ganesh/GrStagingBufferManager.cpp", + "$_src/gpu/ganesh/GrStagingBufferManager.h", + "$_src/gpu/ganesh/GrStencilSettings.cpp", + "$_src/gpu/ganesh/GrStencilSettings.h", + "$_src/gpu/ganesh/GrStyle.cpp", + "$_src/gpu/ganesh/GrStyle.h", + "$_src/gpu/ganesh/GrSubRunAllocator.cpp", + "$_src/gpu/ganesh/GrSubRunAllocator.h", + "$_src/gpu/ganesh/GrSurface.cpp", + "$_src/gpu/ganesh/GrSurface.h", + "$_src/gpu/ganesh/GrSurfaceInfo.cpp", + "$_src/gpu/ganesh/GrSurfaceProxy.cpp", + "$_src/gpu/ganesh/GrSurfaceProxy.h", + "$_src/gpu/ganesh/GrSurfaceProxyPriv.h", + "$_src/gpu/ganesh/GrSurfaceProxyView.h", + "$_src/gpu/ganesh/GrTTopoSort.h", + "$_src/gpu/ganesh/GrTestUtils.cpp", + "$_src/gpu/ganesh/GrTestUtils.h", + "$_src/gpu/ganesh/GrTexture.cpp", + "$_src/gpu/ganesh/GrTexture.h", + "$_src/gpu/ganesh/GrTextureProxy.cpp", + "$_src/gpu/ganesh/GrTextureProxy.h", + "$_src/gpu/ganesh/GrTextureProxyCacheAccess.h", + "$_src/gpu/ganesh/GrTextureProxyPriv.h", + "$_src/gpu/ganesh/GrTextureRenderTargetProxy.cpp", + "$_src/gpu/ganesh/GrTextureRenderTargetProxy.h", + "$_src/gpu/ganesh/GrTextureResolveManager.h", + "$_src/gpu/ganesh/GrTextureResolveRenderTask.cpp", + "$_src/gpu/ganesh/GrTextureResolveRenderTask.h", + "$_src/gpu/ganesh/GrThreadSafeCache.cpp", + "$_src/gpu/ganesh/GrThreadSafeCache.h", + "$_src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp", + "$_src/gpu/ganesh/GrThreadSafePipelineBuilder.h", + "$_src/gpu/ganesh/GrTracing.h", + "$_src/gpu/ganesh/GrTransferFromRenderTask.cpp", + "$_src/gpu/ganesh/GrTransferFromRenderTask.h", + "$_src/gpu/ganesh/GrUniformDataManager.cpp", + "$_src/gpu/ganesh/GrUniformDataManager.h", + "$_src/gpu/ganesh/GrUserStencilSettings.h", + "$_src/gpu/ganesh/GrUtil.cpp", + "$_src/gpu/ganesh/GrUtil.h", + "$_src/gpu/ganesh/GrVertexChunkArray.cpp", + "$_src/gpu/ganesh/GrVertexChunkArray.h", + "$_src/gpu/ganesh/GrVx.h", + "$_src/gpu/ganesh/GrWaitRenderTask.cpp", + "$_src/gpu/ganesh/GrWaitRenderTask.h", + "$_src/gpu/ganesh/GrWindowRectangles.h", + "$_src/gpu/ganesh/GrWindowRectsState.h", + "$_src/gpu/ganesh/GrWritePixelsRenderTask.cpp", + "$_src/gpu/ganesh/GrWritePixelsRenderTask.h", + "$_src/gpu/ganesh/GrXferProcessor.cpp", + "$_src/gpu/ganesh/GrXferProcessor.h", + "$_src/gpu/ganesh/GrYUVABackendTextures.cpp", + "$_src/gpu/ganesh/GrYUVATextureProxies.cpp", + "$_src/gpu/ganesh/GrYUVATextureProxies.h", + "$_src/gpu/ganesh/SurfaceContext.cpp", + "$_src/gpu/ganesh/SurfaceContext.h", + "$_src/gpu/ganesh/SurfaceFillContext.cpp", + "$_src/gpu/ganesh/SurfaceFillContext.h", # Ops - "$_src/gpu/effects/GrBezierEffect.cpp", - "$_src/gpu/effects/GrBezierEffect.h", - "$_src/gpu/effects/GrBicubicEffect.cpp", - "$_src/gpu/effects/GrBicubicEffect.h", - "$_src/gpu/effects/GrBitmapTextGeoProc.cpp", - "$_src/gpu/effects/GrBitmapTextGeoProc.h", - "$_src/gpu/effects/GrBlendFragmentProcessor.cpp", - "$_src/gpu/effects/GrBlendFragmentProcessor.h", - "$_src/gpu/effects/GrConvexPolyEffect.cpp", - "$_src/gpu/effects/GrConvexPolyEffect.h", - "$_src/gpu/effects/GrCoverageSetOpXP.cpp", - "$_src/gpu/effects/GrCoverageSetOpXP.h", - "$_src/gpu/effects/GrCustomXfermode.cpp", - "$_src/gpu/effects/GrCustomXfermode.h", - "$_src/gpu/effects/GrDisableColorXP.cpp", - "$_src/gpu/effects/GrDisableColorXP.h", - "$_src/gpu/effects/GrDistanceFieldGeoProc.cpp", - "$_src/gpu/effects/GrDistanceFieldGeoProc.h", - "$_src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp", - "$_src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h", - "$_src/gpu/effects/GrMatrixConvolutionEffect.cpp", - "$_src/gpu/effects/GrMatrixConvolutionEffect.h", - "$_src/gpu/effects/GrMatrixEffect.cpp", - "$_src/gpu/effects/GrMatrixEffect.h", - "$_src/gpu/effects/GrModulateAtlasCoverageEffect.cpp", - "$_src/gpu/effects/GrModulateAtlasCoverageEffect.h", - "$_src/gpu/effects/GrOvalEffect.cpp", - "$_src/gpu/effects/GrOvalEffect.h", - "$_src/gpu/effects/GrPorterDuffXferProcessor.cpp", - "$_src/gpu/effects/GrPorterDuffXferProcessor.h", - "$_src/gpu/effects/GrRRectEffect.cpp", - "$_src/gpu/effects/GrRRectEffect.h", - "$_src/gpu/effects/GrShadowGeoProc.cpp", - "$_src/gpu/effects/GrShadowGeoProc.h", - "$_src/gpu/effects/GrSkSLFP.cpp", - "$_src/gpu/effects/GrSkSLFP.h", - "$_src/gpu/effects/GrTextureEffect.cpp", - "$_src/gpu/effects/GrTextureEffect.h", - "$_src/gpu/effects/GrYUVtoRGBEffect.cpp", - "$_src/gpu/effects/GrYUVtoRGBEffect.h", - "$_src/gpu/geometry/GrAAConvexTessellator.cpp", - "$_src/gpu/geometry/GrAAConvexTessellator.h", - "$_src/gpu/geometry/GrAATriangulator.cpp", - "$_src/gpu/geometry/GrAATriangulator.h", - "$_src/gpu/geometry/GrInnerFanTriangulator.h", - "$_src/gpu/geometry/GrPathUtils.cpp", - "$_src/gpu/geometry/GrPathUtils.h", - "$_src/gpu/geometry/GrQuad.cpp", - "$_src/gpu/geometry/GrQuad.h", - "$_src/gpu/geometry/GrQuadBuffer.h", - "$_src/gpu/geometry/GrQuadUtils.cpp", - "$_src/gpu/geometry/GrQuadUtils.h", - "$_src/gpu/geometry/GrRect.h", - "$_src/gpu/geometry/GrShape.cpp", - "$_src/gpu/geometry/GrShape.h", - "$_src/gpu/geometry/GrStyledShape.cpp", - "$_src/gpu/geometry/GrStyledShape.h", - "$_src/gpu/geometry/GrTriangulator.cpp", - "$_src/gpu/geometry/GrTriangulator.h", + "$_src/gpu/ganesh/effects/GrBezierEffect.cpp", + "$_src/gpu/ganesh/effects/GrBezierEffect.h", + "$_src/gpu/ganesh/effects/GrBicubicEffect.cpp", + "$_src/gpu/ganesh/effects/GrBicubicEffect.h", + "$_src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp", + "$_src/gpu/ganesh/effects/GrBitmapTextGeoProc.h", + "$_src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp", + "$_src/gpu/ganesh/effects/GrBlendFragmentProcessor.h", + "$_src/gpu/ganesh/effects/GrConvexPolyEffect.cpp", + "$_src/gpu/ganesh/effects/GrConvexPolyEffect.h", + "$_src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp", + "$_src/gpu/ganesh/effects/GrCoverageSetOpXP.h", + "$_src/gpu/ganesh/effects/GrCustomXfermode.cpp", + "$_src/gpu/ganesh/effects/GrCustomXfermode.h", + "$_src/gpu/ganesh/effects/GrDisableColorXP.cpp", + "$_src/gpu/ganesh/effects/GrDisableColorXP.h", + "$_src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp", + "$_src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h", + "$_src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.cpp", + "$_src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h", + "$_src/gpu/ganesh/effects/GrMatrixConvolutionEffect.cpp", + "$_src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h", + "$_src/gpu/ganesh/effects/GrMatrixEffect.cpp", + "$_src/gpu/ganesh/effects/GrMatrixEffect.h", + "$_src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp", + "$_src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h", + "$_src/gpu/ganesh/effects/GrOvalEffect.cpp", + "$_src/gpu/ganesh/effects/GrOvalEffect.h", + "$_src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp", + "$_src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h", + "$_src/gpu/ganesh/effects/GrRRectEffect.cpp", + "$_src/gpu/ganesh/effects/GrRRectEffect.h", + "$_src/gpu/ganesh/effects/GrShadowGeoProc.cpp", + "$_src/gpu/ganesh/effects/GrShadowGeoProc.h", + "$_src/gpu/ganesh/effects/GrSkSLFP.cpp", + "$_src/gpu/ganesh/effects/GrSkSLFP.h", + "$_src/gpu/ganesh/effects/GrTextureEffect.cpp", + "$_src/gpu/ganesh/effects/GrTextureEffect.h", + "$_src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp", + "$_src/gpu/ganesh/effects/GrYUVtoRGBEffect.h", + "$_src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp", + "$_src/gpu/ganesh/geometry/GrAAConvexTessellator.h", + "$_src/gpu/ganesh/geometry/GrAATriangulator.cpp", + "$_src/gpu/ganesh/geometry/GrAATriangulator.h", + "$_src/gpu/ganesh/geometry/GrInnerFanTriangulator.h", + "$_src/gpu/ganesh/geometry/GrPathUtils.cpp", + "$_src/gpu/ganesh/geometry/GrPathUtils.h", + "$_src/gpu/ganesh/geometry/GrQuad.cpp", + "$_src/gpu/ganesh/geometry/GrQuad.h", + "$_src/gpu/ganesh/geometry/GrQuadBuffer.h", + "$_src/gpu/ganesh/geometry/GrQuadUtils.cpp", + "$_src/gpu/ganesh/geometry/GrQuadUtils.h", + "$_src/gpu/ganesh/geometry/GrRect.h", + "$_src/gpu/ganesh/geometry/GrShape.cpp", + "$_src/gpu/ganesh/geometry/GrShape.h", + "$_src/gpu/ganesh/geometry/GrStyledShape.cpp", + "$_src/gpu/ganesh/geometry/GrStyledShape.h", + "$_src/gpu/ganesh/geometry/GrTriangulator.cpp", + "$_src/gpu/ganesh/geometry/GrTriangulator.h", # gradients - "$_src/gpu/gradients/GrGradientBitmapCache.cpp", - "$_src/gpu/gradients/GrGradientBitmapCache.h", - "$_src/gpu/gradients/GrGradientShader.cpp", - "$_src/gpu/gradients/GrGradientShader.h", + "$_src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp", + "$_src/gpu/ganesh/gradients/GrGradientBitmapCache.h", + "$_src/gpu/ganesh/gradients/GrGradientShader.cpp", + "$_src/gpu/ganesh/gradients/GrGradientShader.h", # tessellate/shaders - "$_src/gpu/tessellate/shaders/GrPathTessellationShader.cpp", - "$_src/gpu/tessellate/shaders/GrPathTessellationShader.h", - "$_src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp", - "$_src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp", - "$_src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp", - "$_src/gpu/tessellate/shaders/GrStrokeTessellationShader.h", - "$_src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp", - "$_src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp", - "$_src/gpu/tessellate/shaders/GrTessellationShader.cpp", - "$_src/gpu/tessellate/shaders/GrTessellationShader.h", + "$_src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h", + "$_src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_Hardware.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h", + "$_src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrTessellationShader.cpp", + "$_src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h", # text - "$_src/gpu/text/GrAtlasManager.cpp", - "$_src/gpu/text/GrAtlasManager.h", - "$_src/gpu/text/GrDistanceFieldAdjustTable.cpp", - "$_src/gpu/text/GrDistanceFieldAdjustTable.h", - "$_src/gpu/text/GrGlyphVector.cpp", - "$_src/gpu/text/GrGlyphVector.h", - "$_src/gpu/text/GrSDFMaskFilter.cpp", - "$_src/gpu/text/GrSDFMaskFilter.h", - "$_src/gpu/text/GrSDFTControl.cpp", - "$_src/gpu/text/GrSDFTControl.h", - "$_src/gpu/text/GrSlug.cpp", - "$_src/gpu/text/GrStrikeCache.cpp", - "$_src/gpu/text/GrStrikeCache.h", - "$_src/gpu/text/GrTextBlob.cpp", - "$_src/gpu/text/GrTextBlob.h", - "$_src/gpu/text/GrTextBlobRedrawCoordinator.cpp", - "$_src/gpu/text/GrTextBlobRedrawCoordinator.h", + "$_src/gpu/ganesh/text/GrAtlasManager.cpp", + "$_src/gpu/ganesh/text/GrAtlasManager.h", + "$_src/gpu/ganesh/text/GrDistanceFieldAdjustTable.cpp", + "$_src/gpu/ganesh/text/GrDistanceFieldAdjustTable.h", + "$_src/gpu/ganesh/text/GrGlyphVector.cpp", + "$_src/gpu/ganesh/text/GrGlyphVector.h", + "$_src/gpu/ganesh/text/GrSDFMaskFilter.cpp", + "$_src/gpu/ganesh/text/GrSDFMaskFilter.h", + "$_src/gpu/ganesh/text/GrSDFTControl.cpp", + "$_src/gpu/ganesh/text/GrSDFTControl.h", + "$_src/gpu/ganesh/text/GrSlug.cpp", + "$_src/gpu/ganesh/text/GrStrikeCache.cpp", + "$_src/gpu/ganesh/text/GrStrikeCache.h", + "$_src/gpu/ganesh/text/GrTextBlob.cpp", + "$_src/gpu/ganesh/text/GrTextBlob.h", + "$_src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.cpp", + "$_src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h", # GLSL - "$_src/gpu/glsl/GrGLSL.cpp", - "$_src/gpu/glsl/GrGLSL.h", - "$_src/gpu/glsl/GrGLSLBlend.cpp", - "$_src/gpu/glsl/GrGLSLBlend.h", - "$_src/gpu/glsl/GrGLSLColorSpaceXformHelper.h", - "$_src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp", - "$_src/gpu/glsl/GrGLSLFragmentShaderBuilder.h", - "$_src/gpu/glsl/GrGLSLProgramBuilder.cpp", - "$_src/gpu/glsl/GrGLSLProgramBuilder.h", - "$_src/gpu/glsl/GrGLSLProgramDataManager.cpp", - "$_src/gpu/glsl/GrGLSLProgramDataManager.h", - "$_src/gpu/glsl/GrGLSLShaderBuilder.cpp", - "$_src/gpu/glsl/GrGLSLShaderBuilder.h", - "$_src/gpu/glsl/GrGLSLUniformHandler.cpp", - "$_src/gpu/glsl/GrGLSLUniformHandler.h", - "$_src/gpu/glsl/GrGLSLVarying.cpp", - "$_src/gpu/glsl/GrGLSLVarying.h", - "$_src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp", - "$_src/gpu/glsl/GrGLSLVertexGeoBuilder.h", + "$_src/gpu/ganesh/glsl/GrGLSL.cpp", + "$_src/gpu/ganesh/glsl/GrGLSL.h", + "$_src/gpu/ganesh/glsl/GrGLSLBlend.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLBlend.h", + "$_src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h", + "$_src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h", + "$_src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h", + "$_src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h", + "$_src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h", + "$_src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLUniformHandler.h", + "$_src/gpu/ganesh/glsl/GrGLSLVarying.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLVarying.h", + "$_src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp", + "$_src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h", # Mock "$_include/gpu/mock/GrMockTypes.h", "$_include/private/GrMockTypesPriv.h", - "$_src/gpu/mock/GrMockAttachment.h", - "$_src/gpu/mock/GrMockBuffer.h", - "$_src/gpu/mock/GrMockCaps.cpp", - "$_src/gpu/mock/GrMockCaps.h", - "$_src/gpu/mock/GrMockGpu.cpp", - "$_src/gpu/mock/GrMockGpu.h", - "$_src/gpu/mock/GrMockOpsRenderPass.h", - "$_src/gpu/mock/GrMockRenderTask.h", - "$_src/gpu/mock/GrMockSurfaceProxy.h", - "$_src/gpu/mock/GrMockTexture.h", - "$_src/gpu/mock/GrMockTypes.cpp", + "$_src/gpu/ganesh/mock/GrMockAttachment.h", + "$_src/gpu/ganesh/mock/GrMockBuffer.h", + "$_src/gpu/ganesh/mock/GrMockCaps.cpp", + "$_src/gpu/ganesh/mock/GrMockCaps.h", + "$_src/gpu/ganesh/mock/GrMockGpu.cpp", + "$_src/gpu/ganesh/mock/GrMockGpu.h", + "$_src/gpu/ganesh/mock/GrMockOpsRenderPass.h", + "$_src/gpu/ganesh/mock/GrMockRenderTask.h", + "$_src/gpu/ganesh/mock/GrMockSurfaceProxy.h", + "$_src/gpu/ganesh/mock/GrMockTexture.h", + "$_src/gpu/ganesh/mock/GrMockTypes.cpp", # Sk files - "$_src/gpu/BaseDevice.cpp", - "$_src/gpu/BaseDevice.h", - "$_src/gpu/SkGr.cpp", - "$_src/gpu/SkGr.h", + "$_src/gpu/ganesh/BaseDevice.cpp", + "$_src/gpu/ganesh/BaseDevice.h", + "$_src/gpu/ganesh/SkGr.cpp", + "$_src/gpu/ganesh/SkGr.h", "$_src/image/SkImage_Gpu.cpp", "$_src/image/SkImage_Gpu.h", "$_src/image/SkImage_GpuBase.cpp", @@ -406,169 +407,171 @@ skia_gl_gpu_sources = [ "$_include/gpu/gl/GrGLFunctions.h", "$_include/gpu/gl/GrGLInterface.h", "$_include/gpu/gl/GrGLTypes.h", - "$_src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp", - "$_src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp", - "$_src/gpu/gl/GrGLAssembleHelpers.cpp", - "$_src/gpu/gl/GrGLAssembleInterface.cpp", - "$_src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp", - "$_src/gpu/gl/GrGLAttachment.cpp", - "$_src/gpu/gl/GrGLAttachment.h", - "$_src/gpu/gl/GrGLBuffer.cpp", - "$_src/gpu/gl/GrGLBuffer.h", - "$_src/gpu/gl/GrGLCaps.cpp", - "$_src/gpu/gl/GrGLCaps.h", - "$_src/gpu/gl/GrGLContext.cpp", - "$_src/gpu/gl/GrGLContext.h", + "$_src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp", + "$_src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp", + "$_src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp", + "$_src/gpu/ganesh/gl/GrGLAssembleInterface.cpp", + "$_src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp", + "$_src/gpu/ganesh/gl/GrGLAttachment.cpp", + "$_src/gpu/ganesh/gl/GrGLAttachment.h", + "$_src/gpu/ganesh/gl/GrGLBuffer.cpp", + "$_src/gpu/ganesh/gl/GrGLBuffer.h", + "$_src/gpu/ganesh/gl/GrGLCaps.cpp", + "$_src/gpu/ganesh/gl/GrGLCaps.h", + "$_src/gpu/ganesh/gl/GrGLContext.cpp", + "$_src/gpu/ganesh/gl/GrGLContext.h", + "$_src/gpu/ganesh/gl/GrGLDefines_impl.h", + "$_src/gpu/ganesh/gl/GrGLExtensions.cpp", + "$_src/gpu/ganesh/gl/GrGLGLSL.cpp", + "$_src/gpu/ganesh/gl/GrGLGLSL.h", + "$_src/gpu/ganesh/gl/GrGLGpu.cpp", + "$_src/gpu/ganesh/gl/GrGLGpu.h", + "$_src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp", + "$_src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp", + "$_src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp", + "$_src/gpu/ganesh/gl/GrGLOpsRenderPass.h", + "$_src/gpu/ganesh/gl/GrGLProgram.cpp", + "$_src/gpu/ganesh/gl/GrGLProgram.h", + "$_src/gpu/ganesh/gl/GrGLProgramDataManager.cpp", + "$_src/gpu/ganesh/gl/GrGLProgramDataManager.h", + "$_src/gpu/ganesh/gl/GrGLRenderTarget.cpp", + "$_src/gpu/ganesh/gl/GrGLRenderTarget.h", + "$_src/gpu/ganesh/gl/GrGLSemaphore.cpp", + "$_src/gpu/ganesh/gl/GrGLSemaphore.h", + "$_src/gpu/ganesh/gl/GrGLTexture.cpp", + "$_src/gpu/ganesh/gl/GrGLTexture.h", + "$_src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp", + "$_src/gpu/ganesh/gl/GrGLTextureRenderTarget.h", + "$_src/gpu/ganesh/gl/GrGLTypesPriv.cpp", + "$_src/gpu/ganesh/gl/GrGLUniformHandler.cpp", + "$_src/gpu/ganesh/gl/GrGLUniformHandler.h", + "$_src/gpu/ganesh/gl/GrGLUtil.cpp", + "$_src/gpu/ganesh/gl/GrGLUtil.h", + "$_src/gpu/ganesh/gl/GrGLVaryingHandler.h", + "$_src/gpu/ganesh/gl/GrGLVertexArray.cpp", + "$_src/gpu/ganesh/gl/GrGLVertexArray.h", "$_src/gpu/gl/GrGLDefines.h", - "$_src/gpu/gl/GrGLExtensions.cpp", - "$_src/gpu/gl/GrGLGLSL.cpp", - "$_src/gpu/gl/GrGLGLSL.h", - "$_src/gpu/gl/GrGLGpu.cpp", - "$_src/gpu/gl/GrGLGpu.h", - "$_src/gpu/gl/GrGLGpuProgramCache.cpp", - "$_src/gpu/gl/GrGLInterfaceAutogen.cpp", - "$_src/gpu/gl/GrGLOpsRenderPass.cpp", - "$_src/gpu/gl/GrGLOpsRenderPass.h", - "$_src/gpu/gl/GrGLProgram.cpp", - "$_src/gpu/gl/GrGLProgram.h", - "$_src/gpu/gl/GrGLProgramDataManager.cpp", - "$_src/gpu/gl/GrGLProgramDataManager.h", - "$_src/gpu/gl/GrGLRenderTarget.cpp", - "$_src/gpu/gl/GrGLRenderTarget.h", - "$_src/gpu/gl/GrGLSemaphore.cpp", - "$_src/gpu/gl/GrGLSemaphore.h", - "$_src/gpu/gl/GrGLTexture.cpp", - "$_src/gpu/gl/GrGLTexture.h", - "$_src/gpu/gl/GrGLTextureRenderTarget.cpp", - "$_src/gpu/gl/GrGLTextureRenderTarget.h", - "$_src/gpu/gl/GrGLTypesPriv.cpp", - "$_src/gpu/gl/GrGLUniformHandler.cpp", - "$_src/gpu/gl/GrGLUniformHandler.h", - "$_src/gpu/gl/GrGLUtil.cpp", - "$_src/gpu/gl/GrGLUtil.h", - "$_src/gpu/gl/GrGLVaryingHandler.h", - "$_src/gpu/gl/GrGLVertexArray.cpp", - "$_src/gpu/gl/GrGLVertexArray.h", # Files for building GLSL shaders - "$_src/gpu/gl/builders/GrGLProgramBuilder.cpp", - "$_src/gpu/gl/builders/GrGLProgramBuilder.h", - "$_src/gpu/gl/builders/GrGLShaderStringBuilder.cpp", - "$_src/gpu/gl/builders/GrGLShaderStringBuilder.h", + "$_src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp", + "$_src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h", + "$_src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp", + "$_src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h", ] -skia_null_gpu_sources = [ "$_src/gpu/gl/GrGLMakeNativeInterface_none.cpp" ] +skia_null_gpu_sources = + [ "$_src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp" ] skia_skgpu_v1_sources = [ - "$_src/gpu/GrAuditTrail.cpp", - "$_src/gpu/GrBlurUtils.cpp", - "$_src/gpu/GrBlurUtils.h", - "$_src/gpu/GrDrawOpTest.cpp", - "$_src/gpu/GrDrawOpTest.h", + "$_src/gpu/ganesh/GrAuditTrail.cpp", + "$_src/gpu/ganesh/GrBlurUtils.cpp", + "$_src/gpu/ganesh/GrBlurUtils.h", + "$_src/gpu/ganesh/GrDrawOpTest.cpp", + "$_src/gpu/ganesh/GrDrawOpTest.h", # Ops - "$_src/gpu/ops/AAConvexPathRenderer.cpp", - "$_src/gpu/ops/AAConvexPathRenderer.h", - "$_src/gpu/ops/AAHairLinePathRenderer.cpp", - "$_src/gpu/ops/AAHairLinePathRenderer.h", - "$_src/gpu/ops/AALinearizingConvexPathRenderer.cpp", - "$_src/gpu/ops/AALinearizingConvexPathRenderer.h", - "$_src/gpu/ops/AtlasInstancedHelper.cpp", - "$_src/gpu/ops/AtlasInstancedHelper.h", - "$_src/gpu/ops/AtlasPathRenderer.cpp", - "$_src/gpu/ops/AtlasPathRenderer.h", - "$_src/gpu/ops/AtlasRenderTask.cpp", - "$_src/gpu/ops/AtlasRenderTask.h", - "$_src/gpu/ops/AtlasTextOp.cpp", - "$_src/gpu/ops/AtlasTextOp.h", - "$_src/gpu/ops/ClearOp.cpp", - "$_src/gpu/ops/ClearOp.h", - "$_src/gpu/ops/DashLinePathRenderer.cpp", - "$_src/gpu/ops/DashLinePathRenderer.h", - "$_src/gpu/ops/DashOp.cpp", - "$_src/gpu/ops/DashOp.h", - "$_src/gpu/ops/DefaultPathRenderer.cpp", - "$_src/gpu/ops/DefaultPathRenderer.h", - "$_src/gpu/ops/DrawAtlasOp.cpp", - "$_src/gpu/ops/DrawAtlasOp.h", - "$_src/gpu/ops/DrawAtlasPathOp.cpp", - "$_src/gpu/ops/DrawAtlasPathOp.h", - "$_src/gpu/ops/DrawCustomMeshOp.cpp", - "$_src/gpu/ops/DrawCustomMeshOp.h", - "$_src/gpu/ops/DrawableOp.cpp", - "$_src/gpu/ops/DrawableOp.h", - "$_src/gpu/ops/FillPathFlags.h", - "$_src/gpu/ops/FillRRectOp.cpp", - "$_src/gpu/ops/FillRRectOp.h", - "$_src/gpu/ops/FillRectOp.cpp", - "$_src/gpu/ops/FillRectOp.h", - "$_src/gpu/ops/GrDrawOp.h", - "$_src/gpu/ops/GrMeshDrawOp.cpp", - "$_src/gpu/ops/GrMeshDrawOp.h", - "$_src/gpu/ops/GrOp.cpp", - "$_src/gpu/ops/GrOp.h", - "$_src/gpu/ops/GrOvalOpFactory.cpp", - "$_src/gpu/ops/GrOvalOpFactory.h", - "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp", - "$_src/gpu/ops/GrSimpleMeshDrawOpHelper.h", - "$_src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp", - "$_src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h", - "$_src/gpu/ops/LatticeOp.cpp", - "$_src/gpu/ops/LatticeOp.h", - "$_src/gpu/ops/OpsTask.cpp", - "$_src/gpu/ops/OpsTask.h", - "$_src/gpu/ops/PathInnerTriangulateOp.cpp", - "$_src/gpu/ops/PathInnerTriangulateOp.h", - "$_src/gpu/ops/PathStencilCoverOp.cpp", - "$_src/gpu/ops/PathStencilCoverOp.h", - "$_src/gpu/ops/PathTessellateOp.cpp", - "$_src/gpu/ops/PathTessellateOp.h", - "$_src/gpu/ops/PathTessellator.cpp", - "$_src/gpu/ops/PathTessellator.h", - "$_src/gpu/ops/QuadPerEdgeAA.cpp", - "$_src/gpu/ops/QuadPerEdgeAA.h", - "$_src/gpu/ops/RegionOp.cpp", - "$_src/gpu/ops/RegionOp.h", - "$_src/gpu/ops/ShadowRRectOp.cpp", - "$_src/gpu/ops/ShadowRRectOp.h", - "$_src/gpu/ops/SmallPathAtlasMgr.cpp", - "$_src/gpu/ops/SmallPathAtlasMgr.h", - "$_src/gpu/ops/SmallPathRenderer.cpp", - "$_src/gpu/ops/SmallPathRenderer.h", - "$_src/gpu/ops/SmallPathShapeData.cpp", - "$_src/gpu/ops/SmallPathShapeData.h", - "$_src/gpu/ops/SoftwarePathRenderer.cpp", - "$_src/gpu/ops/SoftwarePathRenderer.h", - "$_src/gpu/ops/StrokeRectOp.cpp", - "$_src/gpu/ops/StrokeRectOp.h", - "$_src/gpu/ops/StrokeTessellateOp.cpp", - "$_src/gpu/ops/StrokeTessellateOp.h", - "$_src/gpu/ops/StrokeTessellator.cpp", - "$_src/gpu/ops/StrokeTessellator.h", - "$_src/gpu/ops/TessellationPathRenderer.cpp", - "$_src/gpu/ops/TessellationPathRenderer.h", - "$_src/gpu/ops/TextureOp.cpp", - "$_src/gpu/ops/TextureOp.h", - "$_src/gpu/ops/TriangulatingPathRenderer.cpp", - "$_src/gpu/ops/TriangulatingPathRenderer.h", + "$_src/gpu/ganesh/ops/AAConvexPathRenderer.cpp", + "$_src/gpu/ganesh/ops/AAConvexPathRenderer.h", + "$_src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp", + "$_src/gpu/ganesh/ops/AAHairLinePathRenderer.h", + "$_src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp", + "$_src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h", + "$_src/gpu/ganesh/ops/AtlasInstancedHelper.cpp", + "$_src/gpu/ganesh/ops/AtlasInstancedHelper.h", + "$_src/gpu/ganesh/ops/AtlasPathRenderer.cpp", + "$_src/gpu/ganesh/ops/AtlasPathRenderer.h", + "$_src/gpu/ganesh/ops/AtlasRenderTask.cpp", + "$_src/gpu/ganesh/ops/AtlasRenderTask.h", + "$_src/gpu/ganesh/ops/AtlasTextOp.cpp", + "$_src/gpu/ganesh/ops/AtlasTextOp.h", + "$_src/gpu/ganesh/ops/ClearOp.cpp", + "$_src/gpu/ganesh/ops/ClearOp.h", + "$_src/gpu/ganesh/ops/DashLinePathRenderer.cpp", + "$_src/gpu/ganesh/ops/DashLinePathRenderer.h", + "$_src/gpu/ganesh/ops/DashOp.cpp", + "$_src/gpu/ganesh/ops/DashOp.h", + "$_src/gpu/ganesh/ops/DefaultPathRenderer.cpp", + "$_src/gpu/ganesh/ops/DefaultPathRenderer.h", + "$_src/gpu/ganesh/ops/DrawAtlasOp.cpp", + "$_src/gpu/ganesh/ops/DrawAtlasOp.h", + "$_src/gpu/ganesh/ops/DrawAtlasPathOp.cpp", + "$_src/gpu/ganesh/ops/DrawAtlasPathOp.h", + "$_src/gpu/ganesh/ops/DrawCustomMeshOp.cpp", + "$_src/gpu/ganesh/ops/DrawCustomMeshOp.h", + "$_src/gpu/ganesh/ops/DrawableOp.cpp", + "$_src/gpu/ganesh/ops/DrawableOp.h", + "$_src/gpu/ganesh/ops/FillPathFlags.h", + "$_src/gpu/ganesh/ops/FillRRectOp.cpp", + "$_src/gpu/ganesh/ops/FillRRectOp.h", + "$_src/gpu/ganesh/ops/FillRectOp.cpp", + "$_src/gpu/ganesh/ops/FillRectOp.h", + "$_src/gpu/ganesh/ops/GrDrawOp.h", + "$_src/gpu/ganesh/ops/GrMeshDrawOp.cpp", + "$_src/gpu/ganesh/ops/GrMeshDrawOp.h", + "$_src/gpu/ganesh/ops/GrOp.cpp", + "$_src/gpu/ganesh/ops/GrOp.h", + "$_src/gpu/ganesh/ops/GrOvalOpFactory.cpp", + "$_src/gpu/ganesh/ops/GrOvalOpFactory.h", + "$_src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp", + "$_src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h", + "$_src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp", + "$_src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h", + "$_src/gpu/ganesh/ops/LatticeOp.cpp", + "$_src/gpu/ganesh/ops/LatticeOp.h", + "$_src/gpu/ganesh/ops/OpsTask.cpp", + "$_src/gpu/ganesh/ops/OpsTask.h", + "$_src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp", + "$_src/gpu/ganesh/ops/PathInnerTriangulateOp.h", + "$_src/gpu/ganesh/ops/PathStencilCoverOp.cpp", + "$_src/gpu/ganesh/ops/PathStencilCoverOp.h", + "$_src/gpu/ganesh/ops/PathTessellateOp.cpp", + "$_src/gpu/ganesh/ops/PathTessellateOp.h", + "$_src/gpu/ganesh/ops/PathTessellator.cpp", + "$_src/gpu/ganesh/ops/PathTessellator.h", + "$_src/gpu/ganesh/ops/QuadPerEdgeAA.cpp", + "$_src/gpu/ganesh/ops/QuadPerEdgeAA.h", + "$_src/gpu/ganesh/ops/RegionOp.cpp", + "$_src/gpu/ganesh/ops/RegionOp.h", + "$_src/gpu/ganesh/ops/ShadowRRectOp.cpp", + "$_src/gpu/ganesh/ops/ShadowRRectOp.h", + "$_src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp", + "$_src/gpu/ganesh/ops/SmallPathAtlasMgr.h", + "$_src/gpu/ganesh/ops/SmallPathRenderer.cpp", + "$_src/gpu/ganesh/ops/SmallPathRenderer.h", + "$_src/gpu/ganesh/ops/SmallPathShapeData.cpp", + "$_src/gpu/ganesh/ops/SmallPathShapeData.h", + "$_src/gpu/ganesh/ops/SoftwarePathRenderer.cpp", + "$_src/gpu/ganesh/ops/SoftwarePathRenderer.h", + "$_src/gpu/ganesh/ops/StrokeRectOp.cpp", + "$_src/gpu/ganesh/ops/StrokeRectOp.h", + "$_src/gpu/ganesh/ops/StrokeTessellateOp.cpp", + "$_src/gpu/ganesh/ops/StrokeTessellateOp.h", + "$_src/gpu/ganesh/ops/StrokeTessellator.cpp", + "$_src/gpu/ganesh/ops/StrokeTessellator.h", + "$_src/gpu/ganesh/ops/TessellationPathRenderer.cpp", + "$_src/gpu/ganesh/ops/TessellationPathRenderer.h", + "$_src/gpu/ganesh/ops/TextureOp.cpp", + "$_src/gpu/ganesh/ops/TextureOp.h", + "$_src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp", + "$_src/gpu/ganesh/ops/TriangulatingPathRenderer.h", # v1 - "$_src/gpu/v1/ClipStack.cpp", - "$_src/gpu/v1/ClipStack.h", - "$_src/gpu/v1/Device.cpp", - "$_src/gpu/v1/Device_drawTexture.cpp", - "$_src/gpu/v1/Device_v1.h", - "$_src/gpu/v1/PathRenderer.cpp", - "$_src/gpu/v1/PathRenderer.h", - "$_src/gpu/v1/PathRendererChain.cpp", - "$_src/gpu/v1/PathRendererChain.h", - "$_src/gpu/v1/StencilClip.h", - "$_src/gpu/v1/StencilMaskHelper.cpp", - "$_src/gpu/v1/StencilMaskHelper.h", - "$_src/gpu/v1/SurfaceDrawContext.cpp", - "$_src/gpu/v1/SurfaceDrawContext_v1.h", - "$_src/gpu/v1/SurfaceFillContext_v1.cpp", - "$_src/gpu/v1/SurfaceFillContext_v1.h", + "$_src/gpu/ganesh/v1/ClipStack.cpp", + "$_src/gpu/ganesh/v1/ClipStack.h", + "$_src/gpu/ganesh/v1/Device.cpp", + "$_src/gpu/ganesh/v1/Device_drawTexture.cpp", + "$_src/gpu/ganesh/v1/Device_v1.h", + "$_src/gpu/ganesh/v1/PathRenderer.cpp", + "$_src/gpu/ganesh/v1/PathRenderer.h", + "$_src/gpu/ganesh/v1/PathRendererChain.cpp", + "$_src/gpu/ganesh/v1/PathRendererChain.h", + "$_src/gpu/ganesh/v1/StencilClip.h", + "$_src/gpu/ganesh/v1/StencilMaskHelper.cpp", + "$_src/gpu/ganesh/v1/StencilMaskHelper.h", + "$_src/gpu/ganesh/v1/SurfaceDrawContext.cpp", + "$_src/gpu/ganesh/v1/SurfaceDrawContext_v1.h", + "$_src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp", + "$_src/gpu/ganesh/v1/SurfaceFillContext_v1.h", ] skia_gpu_sources += skia_skgpu_v1_sources @@ -580,225 +583,226 @@ skia_vk_sources = [ "$_include/gpu/vk/GrVkTypes.h", "$_include/gpu/vk/GrVkVulkan.h", "$_include/private/GrVkTypesPriv.h", - "$_src/gpu/vk/GrVkAMDMemoryAllocator.cpp", - "$_src/gpu/vk/GrVkAMDMemoryAllocator.h", - "$_src/gpu/vk/GrVkBuffer.cpp", - "$_src/gpu/vk/GrVkBuffer.h", - "$_src/gpu/vk/GrVkCaps.cpp", - "$_src/gpu/vk/GrVkCaps.h", - "$_src/gpu/vk/GrVkCommandBuffer.cpp", - "$_src/gpu/vk/GrVkCommandBuffer.h", - "$_src/gpu/vk/GrVkCommandPool.cpp", - "$_src/gpu/vk/GrVkCommandPool.h", - "$_src/gpu/vk/GrVkDescriptorPool.cpp", - "$_src/gpu/vk/GrVkDescriptorPool.h", - "$_src/gpu/vk/GrVkDescriptorSet.cpp", - "$_src/gpu/vk/GrVkDescriptorSet.h", - "$_src/gpu/vk/GrVkDescriptorSetManager.cpp", - "$_src/gpu/vk/GrVkDescriptorSetManager.h", - "$_src/gpu/vk/GrVkExtensions.cpp", - "$_src/gpu/vk/GrVkFramebuffer.cpp", - "$_src/gpu/vk/GrVkFramebuffer.h", - "$_src/gpu/vk/GrVkGpu.cpp", - "$_src/gpu/vk/GrVkGpu.h", - "$_src/gpu/vk/GrVkImage.cpp", - "$_src/gpu/vk/GrVkImage.h", - "$_src/gpu/vk/GrVkImageLayout.h", - "$_src/gpu/vk/GrVkImageView.cpp", - "$_src/gpu/vk/GrVkImageView.h", - "$_src/gpu/vk/GrVkInterface.cpp", - "$_src/gpu/vk/GrVkInterface.h", - "$_src/gpu/vk/GrVkMSAALoadManager.cpp", - "$_src/gpu/vk/GrVkMSAALoadManager.h", - "$_src/gpu/vk/GrVkManagedResource.h", - "$_src/gpu/vk/GrVkMemory.cpp", - "$_src/gpu/vk/GrVkMemory.h", - "$_src/gpu/vk/GrVkOpsRenderPass.cpp", - "$_src/gpu/vk/GrVkOpsRenderPass.h", - "$_src/gpu/vk/GrVkPipeline.cpp", - "$_src/gpu/vk/GrVkPipeline.h", - "$_src/gpu/vk/GrVkPipelineState.cpp", - "$_src/gpu/vk/GrVkPipelineState.h", - "$_src/gpu/vk/GrVkPipelineStateBuilder.cpp", - "$_src/gpu/vk/GrVkPipelineStateBuilder.h", - "$_src/gpu/vk/GrVkPipelineStateCache.cpp", - "$_src/gpu/vk/GrVkPipelineStateDataManager.cpp", - "$_src/gpu/vk/GrVkPipelineStateDataManager.h", - "$_src/gpu/vk/GrVkRenderPass.cpp", - "$_src/gpu/vk/GrVkRenderPass.h", - "$_src/gpu/vk/GrVkRenderTarget.cpp", - "$_src/gpu/vk/GrVkRenderTarget.h", - "$_src/gpu/vk/GrVkResourceProvider.cpp", - "$_src/gpu/vk/GrVkResourceProvider.h", - "$_src/gpu/vk/GrVkSampler.cpp", - "$_src/gpu/vk/GrVkSampler.h", - "$_src/gpu/vk/GrVkSamplerYcbcrConversion.cpp", - "$_src/gpu/vk/GrVkSamplerYcbcrConversion.h", - "$_src/gpu/vk/GrVkSecondaryCBDrawContext.cpp", + "$_src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.cpp", + "$_src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.h", + "$_src/gpu/ganesh/vk/GrVkBuffer.cpp", + "$_src/gpu/ganesh/vk/GrVkBuffer.h", + "$_src/gpu/ganesh/vk/GrVkCaps.cpp", + "$_src/gpu/ganesh/vk/GrVkCaps.h", + "$_src/gpu/ganesh/vk/GrVkCommandBuffer.cpp", + "$_src/gpu/ganesh/vk/GrVkCommandBuffer.h", + "$_src/gpu/ganesh/vk/GrVkCommandPool.cpp", + "$_src/gpu/ganesh/vk/GrVkCommandPool.h", + "$_src/gpu/ganesh/vk/GrVkDescriptorPool.cpp", + "$_src/gpu/ganesh/vk/GrVkDescriptorPool.h", + "$_src/gpu/ganesh/vk/GrVkDescriptorSet.cpp", + "$_src/gpu/ganesh/vk/GrVkDescriptorSet.h", + "$_src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp", + "$_src/gpu/ganesh/vk/GrVkDescriptorSetManager.h", + "$_src/gpu/ganesh/vk/GrVkExtensions.cpp", + "$_src/gpu/ganesh/vk/GrVkFramebuffer.cpp", + "$_src/gpu/ganesh/vk/GrVkFramebuffer.h", + "$_src/gpu/ganesh/vk/GrVkGpu.cpp", + "$_src/gpu/ganesh/vk/GrVkGpu.h", + "$_src/gpu/ganesh/vk/GrVkImage.cpp", + "$_src/gpu/ganesh/vk/GrVkImage.h", + "$_src/gpu/ganesh/vk/GrVkImageLayout.h", + "$_src/gpu/ganesh/vk/GrVkImageView.cpp", + "$_src/gpu/ganesh/vk/GrVkImageView.h", + "$_src/gpu/ganesh/vk/GrVkInterface.cpp", + "$_src/gpu/ganesh/vk/GrVkInterface.h", + "$_src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp", + "$_src/gpu/ganesh/vk/GrVkMSAALoadManager.h", + "$_src/gpu/ganesh/vk/GrVkManagedResource.h", + "$_src/gpu/ganesh/vk/GrVkMemory.cpp", + "$_src/gpu/ganesh/vk/GrVkMemory.h", + "$_src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp", + "$_src/gpu/ganesh/vk/GrVkOpsRenderPass.h", + "$_src/gpu/ganesh/vk/GrVkPipeline.cpp", + "$_src/gpu/ganesh/vk/GrVkPipeline.h", + "$_src/gpu/ganesh/vk/GrVkPipelineState.cpp", + "$_src/gpu/ganesh/vk/GrVkPipelineState.h", + "$_src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp", + "$_src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h", + "$_src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp", + "$_src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp", + "$_src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h", + "$_src/gpu/ganesh/vk/GrVkRenderPass.cpp", + "$_src/gpu/ganesh/vk/GrVkRenderPass.h", + "$_src/gpu/ganesh/vk/GrVkRenderTarget.cpp", + "$_src/gpu/ganesh/vk/GrVkRenderTarget.h", + "$_src/gpu/ganesh/vk/GrVkResourceProvider.cpp", + "$_src/gpu/ganesh/vk/GrVkResourceProvider.h", + "$_src/gpu/ganesh/vk/GrVkSampler.cpp", + "$_src/gpu/ganesh/vk/GrVkSampler.h", + "$_src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp", + "$_src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h", + "$_src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp", + "$_src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h", + "$_src/gpu/ganesh/vk/GrVkSemaphore.cpp", + "$_src/gpu/ganesh/vk/GrVkSemaphore.h", + "$_src/gpu/ganesh/vk/GrVkTexture.cpp", + "$_src/gpu/ganesh/vk/GrVkTexture.h", + "$_src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp", + "$_src/gpu/ganesh/vk/GrVkTextureRenderTarget.h", + "$_src/gpu/ganesh/vk/GrVkTypesPriv.cpp", + "$_src/gpu/ganesh/vk/GrVkUniformHandler.cpp", + "$_src/gpu/ganesh/vk/GrVkUniformHandler.h", + "$_src/gpu/ganesh/vk/GrVkUtil.cpp", + "$_src/gpu/ganesh/vk/GrVkUtil.h", + "$_src/gpu/ganesh/vk/GrVkVaryingHandler.cpp", + "$_src/gpu/ganesh/vk/GrVkVaryingHandler.h", "$_src/gpu/vk/GrVkSecondaryCBDrawContext.h", - "$_src/gpu/vk/GrVkSemaphore.cpp", - "$_src/gpu/vk/GrVkSemaphore.h", - "$_src/gpu/vk/GrVkTexture.cpp", - "$_src/gpu/vk/GrVkTexture.h", - "$_src/gpu/vk/GrVkTextureRenderTarget.cpp", - "$_src/gpu/vk/GrVkTextureRenderTarget.h", - "$_src/gpu/vk/GrVkTypesPriv.cpp", - "$_src/gpu/vk/GrVkUniformHandler.cpp", - "$_src/gpu/vk/GrVkUniformHandler.h", - "$_src/gpu/vk/GrVkUtil.cpp", - "$_src/gpu/vk/GrVkUtil.h", - "$_src/gpu/vk/GrVkVaryingHandler.cpp", - "$_src/gpu/vk/GrVkVaryingHandler.h", ] skia_direct3d_sources = [ "$_include/gpu/d3d/GrD3DBackendContext.h", "$_include/gpu/d3d/GrD3DTypes.h", "$_include/private/GrD3DTypesMinimal.h", - "$_src/gpu/d3d/GrD3DAMDMemoryAllocator.cpp", - "$_src/gpu/d3d/GrD3DAMDMemoryAllocator.h", - "$_src/gpu/d3d/GrD3DAttachment.cpp", - "$_src/gpu/d3d/GrD3DAttachment.h", - "$_src/gpu/d3d/GrD3DBuffer.cpp", - "$_src/gpu/d3d/GrD3DBuffer.h", - "$_src/gpu/d3d/GrD3DCaps.cpp", - "$_src/gpu/d3d/GrD3DCaps.h", - "$_src/gpu/d3d/GrD3DCommandList.cpp", - "$_src/gpu/d3d/GrD3DCommandList.h", - "$_src/gpu/d3d/GrD3DCommandSignature.cpp", - "$_src/gpu/d3d/GrD3DCommandSignature.h", - "$_src/gpu/d3d/GrD3DCpuDescriptorManager.cpp", - "$_src/gpu/d3d/GrD3DCpuDescriptorManager.h", - "$_src/gpu/d3d/GrD3DDescriptorHeap.cpp", - "$_src/gpu/d3d/GrD3DDescriptorHeap.h", - "$_src/gpu/d3d/GrD3DDescriptorTableManager.cpp", - "$_src/gpu/d3d/GrD3DDescriptorTableManager.h", - "$_src/gpu/d3d/GrD3DGpu.cpp", - "$_src/gpu/d3d/GrD3DGpu.h", - "$_src/gpu/d3d/GrD3DOpsRenderPass.cpp", - "$_src/gpu/d3d/GrD3DOpsRenderPass.h", - "$_src/gpu/d3d/GrD3DPipeline.h", - "$_src/gpu/d3d/GrD3DPipelineState.cpp", - "$_src/gpu/d3d/GrD3DPipelineState.h", - "$_src/gpu/d3d/GrD3DPipelineStateBuilder.cpp", - "$_src/gpu/d3d/GrD3DPipelineStateBuilder.h", - "$_src/gpu/d3d/GrD3DPipelineStateDataManager.cpp", - "$_src/gpu/d3d/GrD3DPipelineStateDataManager.h", - "$_src/gpu/d3d/GrD3DRenderTarget.cpp", - "$_src/gpu/d3d/GrD3DRenderTarget.h", - "$_src/gpu/d3d/GrD3DResourceProvider.cpp", - "$_src/gpu/d3d/GrD3DResourceProvider.h", - "$_src/gpu/d3d/GrD3DResourceState.h", - "$_src/gpu/d3d/GrD3DRootSignature.cpp", - "$_src/gpu/d3d/GrD3DRootSignature.h", - "$_src/gpu/d3d/GrD3DSemaphore.cpp", - "$_src/gpu/d3d/GrD3DSemaphore.h", - "$_src/gpu/d3d/GrD3DTexture.cpp", - "$_src/gpu/d3d/GrD3DTexture.h", - "$_src/gpu/d3d/GrD3DTextureRenderTarget.cpp", - "$_src/gpu/d3d/GrD3DTextureRenderTarget.h", - "$_src/gpu/d3d/GrD3DTextureResource.cpp", - "$_src/gpu/d3d/GrD3DTextureResource.h", - "$_src/gpu/d3d/GrD3DTypesMinimal.cpp", - "$_src/gpu/d3d/GrD3DTypesPriv.cpp", - "$_src/gpu/d3d/GrD3DTypesPriv.h", - "$_src/gpu/d3d/GrD3DUtil.cpp", - "$_src/gpu/d3d/GrD3DUtil.h", + "$_src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp", + "$_src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h", + "$_src/gpu/ganesh/d3d/GrD3DAttachment.cpp", + "$_src/gpu/ganesh/d3d/GrD3DAttachment.h", + "$_src/gpu/ganesh/d3d/GrD3DBuffer.cpp", + "$_src/gpu/ganesh/d3d/GrD3DBuffer.h", + "$_src/gpu/ganesh/d3d/GrD3DCaps.cpp", + "$_src/gpu/ganesh/d3d/GrD3DCaps.h", + "$_src/gpu/ganesh/d3d/GrD3DCommandList.cpp", + "$_src/gpu/ganesh/d3d/GrD3DCommandList.h", + "$_src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp", + "$_src/gpu/ganesh/d3d/GrD3DCommandSignature.h", + "$_src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp", + "$_src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h", + "$_src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp", + "$_src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h", + "$_src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp", + "$_src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h", + "$_src/gpu/ganesh/d3d/GrD3DGpu.cpp", + "$_src/gpu/ganesh/d3d/GrD3DGpu.h", + "$_src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp", + "$_src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h", + "$_src/gpu/ganesh/d3d/GrD3DPipeline.h", + "$_src/gpu/ganesh/d3d/GrD3DPipelineState.cpp", + "$_src/gpu/ganesh/d3d/GrD3DPipelineState.h", + "$_src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp", + "$_src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h", + "$_src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp", + "$_src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h", + "$_src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp", + "$_src/gpu/ganesh/d3d/GrD3DRenderTarget.h", + "$_src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp", + "$_src/gpu/ganesh/d3d/GrD3DResourceProvider.h", + "$_src/gpu/ganesh/d3d/GrD3DResourceState.h", + "$_src/gpu/ganesh/d3d/GrD3DRootSignature.cpp", + "$_src/gpu/ganesh/d3d/GrD3DRootSignature.h", + "$_src/gpu/ganesh/d3d/GrD3DSemaphore.cpp", + "$_src/gpu/ganesh/d3d/GrD3DSemaphore.h", + "$_src/gpu/ganesh/d3d/GrD3DTexture.cpp", + "$_src/gpu/ganesh/d3d/GrD3DTexture.h", + "$_src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp", + "$_src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h", + "$_src/gpu/ganesh/d3d/GrD3DTextureResource.cpp", + "$_src/gpu/ganesh/d3d/GrD3DTextureResource.h", + "$_src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp", + "$_src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp", + "$_src/gpu/ganesh/d3d/GrD3DTypesPriv.h", + "$_src/gpu/ganesh/d3d/GrD3DUtil.cpp", + "$_src/gpu/ganesh/d3d/GrD3DUtil.h", ] skia_dawn_sources = [ "$_include/gpu/dawn/GrDawnTypes.h", "$_include/private/GrDawnTypesPriv.h", - "$_src/gpu/dawn/GrDawnAttachment.cpp", - "$_src/gpu/dawn/GrDawnAttachment.h", - "$_src/gpu/dawn/GrDawnBuffer.cpp", - "$_src/gpu/dawn/GrDawnBuffer.h", - "$_src/gpu/dawn/GrDawnCaps.cpp", - "$_src/gpu/dawn/GrDawnCaps.h", - "$_src/gpu/dawn/GrDawnGpu.cpp", - "$_src/gpu/dawn/GrDawnGpu.h", - "$_src/gpu/dawn/GrDawnOpsRenderPass.cpp", - "$_src/gpu/dawn/GrDawnOpsRenderPass.h", - "$_src/gpu/dawn/GrDawnProgramBuilder.cpp", - "$_src/gpu/dawn/GrDawnProgramBuilder.h", - "$_src/gpu/dawn/GrDawnProgramDataManager.cpp", - "$_src/gpu/dawn/GrDawnProgramDataManager.h", - "$_src/gpu/dawn/GrDawnRenderTarget.cpp", - "$_src/gpu/dawn/GrDawnRenderTarget.h", - "$_src/gpu/dawn/GrDawnRingBuffer.cpp", - "$_src/gpu/dawn/GrDawnRingBuffer.h", - "$_src/gpu/dawn/GrDawnTexture.cpp", - "$_src/gpu/dawn/GrDawnTexture.h", - "$_src/gpu/dawn/GrDawnTextureRenderTarget.cpp", - "$_src/gpu/dawn/GrDawnTextureRenderTarget.h", - "$_src/gpu/dawn/GrDawnTypesPriv.cpp", - "$_src/gpu/dawn/GrDawnUtil.cpp", - "$_src/gpu/dawn/GrDawnUtil.h", + "$_src/gpu/ganesh/dawn/GrDawnAttachment.cpp", + "$_src/gpu/ganesh/dawn/GrDawnAttachment.h", + "$_src/gpu/ganesh/dawn/GrDawnBuffer.cpp", + "$_src/gpu/ganesh/dawn/GrDawnBuffer.h", + "$_src/gpu/ganesh/dawn/GrDawnCaps.cpp", + "$_src/gpu/ganesh/dawn/GrDawnCaps.h", + "$_src/gpu/ganesh/dawn/GrDawnGpu.cpp", + "$_src/gpu/ganesh/dawn/GrDawnGpu.h", + "$_src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp", + "$_src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h", + "$_src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp", + "$_src/gpu/ganesh/dawn/GrDawnProgramBuilder.h", + "$_src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp", + "$_src/gpu/ganesh/dawn/GrDawnProgramDataManager.h", + "$_src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp", + "$_src/gpu/ganesh/dawn/GrDawnRenderTarget.h", + "$_src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp", + "$_src/gpu/ganesh/dawn/GrDawnRingBuffer.h", + "$_src/gpu/ganesh/dawn/GrDawnTexture.cpp", + "$_src/gpu/ganesh/dawn/GrDawnTexture.h", + "$_src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp", + "$_src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h", + "$_src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp", + "$_src/gpu/ganesh/dawn/GrDawnUtil.cpp", + "$_src/gpu/ganesh/dawn/GrDawnUtil.h", ] skia_metal_sources = [ "$_include/gpu/mtl/GrMtlBackendContext.h", "$_include/gpu/mtl/GrMtlTypes.h", - "$_src/gpu/mtl/GrMtlAttachment.h", - "$_src/gpu/mtl/GrMtlAttachment.mm", - "$_src/gpu/mtl/GrMtlBuffer.h", - "$_src/gpu/mtl/GrMtlBuffer.mm", - "$_src/gpu/mtl/GrMtlCaps.h", - "$_src/gpu/mtl/GrMtlCaps.mm", - "$_src/gpu/mtl/GrMtlCommandBuffer.h", - "$_src/gpu/mtl/GrMtlCommandBuffer.mm", - "$_src/gpu/mtl/GrMtlCppUtil.h", - "$_src/gpu/mtl/GrMtlDepthStencil.h", - "$_src/gpu/mtl/GrMtlDepthStencil.mm", - "$_src/gpu/mtl/GrMtlFramebuffer.h", - "$_src/gpu/mtl/GrMtlFramebuffer.mm", - "$_src/gpu/mtl/GrMtlGpu.h", - "$_src/gpu/mtl/GrMtlGpu.mm", - "$_src/gpu/mtl/GrMtlOpsRenderPass.h", - "$_src/gpu/mtl/GrMtlOpsRenderPass.mm", - "$_src/gpu/mtl/GrMtlPipeline.h", - "$_src/gpu/mtl/GrMtlPipelineState.h", - "$_src/gpu/mtl/GrMtlPipelineState.mm", - "$_src/gpu/mtl/GrMtlPipelineStateBuilder.h", - "$_src/gpu/mtl/GrMtlPipelineStateBuilder.mm", - "$_src/gpu/mtl/GrMtlPipelineStateDataManager.h", - "$_src/gpu/mtl/GrMtlPipelineStateDataManager.mm", - "$_src/gpu/mtl/GrMtlRenderCommandEncoder.h", - "$_src/gpu/mtl/GrMtlRenderTarget.h", - "$_src/gpu/mtl/GrMtlRenderTarget.mm", - "$_src/gpu/mtl/GrMtlResourceProvider.h", - "$_src/gpu/mtl/GrMtlResourceProvider.mm", - "$_src/gpu/mtl/GrMtlSampler.h", - "$_src/gpu/mtl/GrMtlSampler.mm", - "$_src/gpu/mtl/GrMtlSemaphore.h", - "$_src/gpu/mtl/GrMtlSemaphore.mm", - "$_src/gpu/mtl/GrMtlTexture.h", - "$_src/gpu/mtl/GrMtlTexture.mm", - "$_src/gpu/mtl/GrMtlTextureRenderTarget.h", - "$_src/gpu/mtl/GrMtlTextureRenderTarget.mm", - "$_src/gpu/mtl/GrMtlTrampoline.h", - "$_src/gpu/mtl/GrMtlTrampoline.mm", - "$_src/gpu/mtl/GrMtlTypesPriv.mm", - "$_src/gpu/mtl/GrMtlUniformHandler.h", - "$_src/gpu/mtl/GrMtlUniformHandler.mm", - "$_src/gpu/mtl/GrMtlUtil.h", - "$_src/gpu/mtl/GrMtlUtil.mm", - "$_src/gpu/mtl/GrMtlVaryingHandler.h", - "$_src/gpu/mtl/GrMtlVaryingHandler.mm", + "$_src/gpu/ganesh/mtl/GrMtlAttachment.h", + "$_src/gpu/ganesh/mtl/GrMtlAttachment.mm", + "$_src/gpu/ganesh/mtl/GrMtlBuffer.h", + "$_src/gpu/ganesh/mtl/GrMtlBuffer.mm", + "$_src/gpu/ganesh/mtl/GrMtlCaps.h", + "$_src/gpu/ganesh/mtl/GrMtlCaps.mm", + "$_src/gpu/ganesh/mtl/GrMtlCommandBuffer.h", + "$_src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm", + "$_src/gpu/ganesh/mtl/GrMtlCppUtil.h", + "$_src/gpu/ganesh/mtl/GrMtlDepthStencil.h", + "$_src/gpu/ganesh/mtl/GrMtlDepthStencil.mm", + "$_src/gpu/ganesh/mtl/GrMtlFramebuffer.h", + "$_src/gpu/ganesh/mtl/GrMtlFramebuffer.mm", + "$_src/gpu/ganesh/mtl/GrMtlGpu.h", + "$_src/gpu/ganesh/mtl/GrMtlGpu.mm", + "$_src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h", + "$_src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm", + "$_src/gpu/ganesh/mtl/GrMtlPipeline.h", + "$_src/gpu/ganesh/mtl/GrMtlPipelineState.h", + "$_src/gpu/ganesh/mtl/GrMtlPipelineState.mm", + "$_src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h", + "$_src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm", + "$_src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h", + "$_src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm", + "$_src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h", + "$_src/gpu/ganesh/mtl/GrMtlRenderTarget.h", + "$_src/gpu/ganesh/mtl/GrMtlRenderTarget.mm", + "$_src/gpu/ganesh/mtl/GrMtlResourceProvider.h", + "$_src/gpu/ganesh/mtl/GrMtlResourceProvider.mm", + "$_src/gpu/ganesh/mtl/GrMtlSampler.h", + "$_src/gpu/ganesh/mtl/GrMtlSampler.mm", + "$_src/gpu/ganesh/mtl/GrMtlSemaphore.h", + "$_src/gpu/ganesh/mtl/GrMtlSemaphore.mm", + "$_src/gpu/ganesh/mtl/GrMtlTexture.h", + "$_src/gpu/ganesh/mtl/GrMtlTexture.mm", + "$_src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h", + "$_src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm", + "$_src/gpu/ganesh/mtl/GrMtlTrampoline.h", + "$_src/gpu/ganesh/mtl/GrMtlTrampoline.mm", + "$_src/gpu/ganesh/mtl/GrMtlTypesPriv.mm", + "$_src/gpu/ganesh/mtl/GrMtlUniformHandler.h", + "$_src/gpu/ganesh/mtl/GrMtlUniformHandler.mm", + "$_src/gpu/ganesh/mtl/GrMtlUtil.h", + "$_src/gpu/ganesh/mtl/GrMtlUtil.mm", + "$_src/gpu/ganesh/mtl/GrMtlVaryingHandler.h", + "$_src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm", "$_src/image/SkSurface_GpuMtl.mm", ] skia_native_gpu_sources = [ "$_include/gpu/gl/egl/GrGLMakeEGLInterface.h", "$_include/gpu/gl/glx/GrGLMakeGLXInterface.h", - "$_src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp", - "$_src/gpu/gl/egl/GrGLMakeEGLInterface.cpp", - "$_src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", - "$_src/gpu/gl/glx/GrGLMakeGLXInterface.cpp", - "$_src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp", - "$_src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", - "$_src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp", - "$_src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp", + "$_src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp", + "$_src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp", + "$_src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "$_src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp", + "$_src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp", + "$_src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", + "$_src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp", + "$_src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp", ] skia_shared_gpu_sources = [ diff --git a/gn/sksl.gni b/gn/sksl.gni index bcccdd164a..68c63a399c 100644 --- a/gn/sksl.gni +++ b/gn/sksl.gni @@ -246,7 +246,7 @@ skslc_deps = [ "$_src/core/SkThreadID.cpp", "$_src/core/SkUtils.cpp", "$_src/core/SkVM.cpp", - "$_src/gpu/GrMemoryPool.cpp", + "$_src/gpu/ganesh/GrMemoryPool.cpp", "$_src/ports/SkMemory_malloc.cpp", "$_src/ports/SkOSFile_stdio.cpp", "$_src/utils/SkJSON.cpp", diff --git a/modules/canvaskit/canvaskit_bindings.cpp b/modules/canvaskit/canvaskit_bindings.cpp index e4c9702ce8..38c8544171 100644 --- a/modules/canvaskit/canvaskit_bindings.cpp +++ b/modules/canvaskit/canvaskit_bindings.cpp @@ -67,10 +67,10 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/gl/GrGLInterface.h" #include "include/gpu/gl/GrGLTypes.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/RefCntedCallback.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include #endif diff --git a/public.bzl b/public.bzl index 6c57b2ddee..4c98241d00 100644 --- a/public.bzl +++ b/public.bzl @@ -209,13 +209,13 @@ BASE_SRCS_ALL = struct( "src/codec/*", "src/device/xps/*", # Windows-only. Move to ports? "src/doc/*_XPS.cpp", # Windows-only. Move to ports? - "src/gpu/gl/android/*", - "src/gpu/gl/egl/*", - "src/gpu/gl/glfw/*", - "src/gpu/gl/glx/*", - "src/gpu/gl/iOS/*", - "src/gpu/gl/mac/*", - "src/gpu/gl/win/*", + "src/gpu/ganesh/gl/android/*", + "src/gpu/ganesh/gl/egl/*", + "src/gpu/ganesh/gl/glfw/*", + "src/gpu/ganesh/gl/glx/*", + "src/gpu/ganesh/gl/iOS/*", + "src/gpu/ganesh/gl/mac/*", + "src/gpu/ganesh/gl/win/*", "src/opts/**/*", "src/ports/**/*", "src/utils/android/**/*", @@ -223,7 +223,7 @@ BASE_SRCS_ALL = struct( "src/utils/win/**/*", # Exclude multiple definitions. - "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", + "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp", "src/pdf/SkDocument_PDF_None.cpp", # We use src/pdf/SkPDFDocument.cpp. # Exclude files that don't compile everywhere. @@ -231,20 +231,20 @@ BASE_SRCS_ALL = struct( "src/xml/**/*", # Avoid dragging in expat when not needed. # Exclude all GL specific files - "src/gpu/gl/*", - "src/gpu/gl/builders/*", + "src/gpu/ganesh/gl/*", + "src/gpu/ganesh/gl/builders/*", # Exclude all WebGL specific files - "src/gpu/gl/webgl/*", + "src/gpu/ganesh/gl/webgl/*", # Currently exclude all vulkan specific files - "src/gpu/vk/*", + "src/gpu/ganesh/vk/*", # Currently exclude all Direct3D specific files - "src/gpu/d3d/*", + "src/gpu/ganesh/d3d/*", # Currently exclude all Dawn-specific files - "src/gpu/dawn/*", + "src/gpu/ganesh/dawn/*", # Defines main. "tools/skslc/Main.cpp", @@ -268,24 +268,24 @@ def codec_srcs(limited): GL_SRCS_UNIX = struct( include = [ - "src/gpu/gl/*.cpp", - "src/gpu/gl/*.h", - "src/gpu/gl/builders/*.cpp", - "src/gpu/gl/builders/*.h", + "src/gpu/ganesh/gl/*.cpp", + "src/gpu/ganesh/gl/*.h", + "src/gpu/ganesh/gl/builders/*.cpp", + "src/gpu/ganesh/gl/builders/*.h", ], exclude = [], ) GL_SRCS_UNIX_EGL = struct( include = [ - "src/gpu/gl/*.cpp", - "src/gpu/gl/*.h", - "src/gpu/gl/builders/*.cpp", - "src/gpu/gl/builders/*.h", - "src/gpu/gl/egl/GrGLMakeEGLInterface.cpp", - "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "src/gpu/ganesh/gl/*.cpp", + "src/gpu/ganesh/gl/*.h", + "src/gpu/ganesh/gl/builders/*.cpp", + "src/gpu/ganesh/gl/builders/*.h", + "src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp", + "src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp", ], exclude = [ - "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", + "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp", ], ) PORTS_SRCS_UNIX = struct( @@ -315,14 +315,14 @@ PORTS_SRCS_UNIX = struct( GL_SRCS_ANDROID = struct( include = [ - "src/gpu/gl/*.cpp", - "src/gpu/gl/*.h", - "src/gpu/gl/builders/*.cpp", - "src/gpu/gl/builders/*.h", - "src/gpu/gl/android/*.cpp", + "src/gpu/ganesh/gl/*.cpp", + "src/gpu/ganesh/gl/*.h", + "src/gpu/ganesh/gl/builders/*.cpp", + "src/gpu/ganesh/gl/builders/*.h", + "src/gpu/ganesh/gl/android/*.cpp", ], exclude = [ - "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", + "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp", ], ) PORTS_SRCS_ANDROID = struct( @@ -378,14 +378,14 @@ PORTS_SRCS_ANDROID_NO_FONT = struct( GL_SRCS_IOS = struct( include = [ - "src/gpu/gl/*.cpp", - "src/gpu/gl/*.h", - "src/gpu/gl/builders/*.cpp", - "src/gpu/gl/builders/*.h", - "src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", + "src/gpu/ganesh/gl/*.cpp", + "src/gpu/ganesh/gl/*.h", + "src/gpu/ganesh/gl/builders/*.cpp", + "src/gpu/ganesh/gl/builders/*.h", + "src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp", ], exclude = [ - "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", + "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp", ], ) PORTS_SRCS_IOS = struct( @@ -420,15 +420,15 @@ PORTS_SRCS_IOS = struct( GL_SRCS_WASM = struct( include = [ - "src/gpu/gl/*.cpp", - "src/gpu/gl/*.h", - "src/gpu/gl/builders/*.cpp", - "src/gpu/gl/builders/*.h", - "src/gpu/gl/egl/GrGLMakeEGLInterface.cpp", - "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp", + "src/gpu/ganesh/gl/*.cpp", + "src/gpu/ganesh/gl/*.h", + "src/gpu/ganesh/gl/builders/*.cpp", + "src/gpu/ganesh/gl/builders/*.h", + "src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp", + "src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp", ], exclude = [ - "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", + "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp", ], ) PORTS_SRCS_WASM = struct( @@ -468,8 +468,8 @@ PORTS_SRCS_WASM = struct( GL_SRCS_FUCHSIA = struct( include = [ - "src/gpu/vk/*.cpp", - "src/gpu/vk/*.h", + "src/gpu/ganesh/vk/*.cpp", + "src/gpu/ganesh/vk/*.h", ], exclude = [], ) @@ -508,14 +508,14 @@ PORTS_SRCS_FUCHSIA = struct( GL_SRCS_MACOS = struct( include = [ - "src/gpu/gl/*.cpp", - "src/gpu/gl/*.h", - "src/gpu/gl/builders/*.cpp", - "src/gpu/gl/builders/*.h", - "src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp", + "src/gpu/ganesh/gl/*.cpp", + "src/gpu/ganesh/gl/*.h", + "src/gpu/ganesh/gl/builders/*.cpp", + "src/gpu/ganesh/gl/builders/*.h", + "src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp", ], exclude = [ - "src/gpu/gl/GrGLMakeNativeInterface_none.cpp", + "src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp", ], ) PORTS_SRCS_MACOS = PORTS_SRCS_IOS @@ -561,7 +561,7 @@ def metal_objc_srcs(): [ "include/**/*.h", "src/**/*.h", - "src/gpu/mtl/**/*.mm", + "src/gpu/ganesh/mtl/**/*.mm", "third_party/**/*.h", ], ) + [ diff --git a/samplecode/SampleAnimatedText.cpp b/samplecode/SampleAnimatedText.cpp index 80aafdc85e..d452d08696 100644 --- a/samplecode/SampleAnimatedText.cpp +++ b/samplecode/SampleAnimatedText.cpp @@ -18,7 +18,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif SkRandom gRand; diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp index 0e62725f25..529c279b63 100644 --- a/samplecode/SampleChineseFling.cpp +++ b/samplecode/SampleChineseFling.cpp @@ -18,7 +18,7 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif static sk_sp chinese_typeface() { diff --git a/samplecode/SampleDegenerateQuads.cpp b/samplecode/SampleDegenerateQuads.cpp index e3ab138632..da1e47c22b 100644 --- a/samplecode/SampleDegenerateQuads.cpp +++ b/samplecode/SampleDegenerateQuads.cpp @@ -7,8 +7,8 @@ #include "samplecode/Sample.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/ops/QuadPerEdgeAA.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/ops/QuadPerEdgeAA.h" #include "include/core/SkCanvas.h" #include "include/core/SkPaint.h" diff --git a/samplecode/SamplePathTessellators.cpp b/samplecode/SamplePathTessellators.cpp index dd8763da33..72a28086da 100644 --- a/samplecode/SamplePathTessellators.cpp +++ b/samplecode/SamplePathTessellators.cpp @@ -12,16 +12,16 @@ #if SK_SUPPORT_GPU #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/ops/PathTessellator.h" -#include "src/gpu/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/gpu/tessellate/AffineMatrix.h" #include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h" -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" namespace skgpu::v1 { diff --git a/samplecode/SampleRectanizer.cpp b/samplecode/SampleRectanizer.cpp index 2b81079973..09e8f4e371 100644 --- a/samplecode/SampleRectanizer.cpp +++ b/samplecode/SampleRectanizer.cpp @@ -12,8 +12,8 @@ #include "samplecode/Sample.h" #include "src/utils/SkUTF.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrRectanizerPow2.h" -#include "src/gpu/GrRectanizerSkyline.h" +#include "src/gpu/ganesh/GrRectanizerPow2.h" +#include "src/gpu/ganesh/GrRectanizerSkyline.h" // This slide visualizes the various GrRectanizer-derived classes behavior // for various input sets diff --git a/src/core/BUILD.bazel b/src/core/BUILD.bazel index 9aada3a122..baef5bd591 100644 --- a/src/core/BUILD.bazel +++ b/src/core/BUILD.bazel @@ -653,8 +653,8 @@ generated_cc_atom( ":SkKeyHelpers_hdr", ":SkReadBuffer_hdr", ":SkWriteBuffer_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", ], ) @@ -666,7 +666,7 @@ generated_cc_atom( "//include/core:SkBlendMode_hdr", "//include/core:SkColor_hdr", "//include/private:SkColorData_hdr", - "//src/gpu:GrXferProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", ], ) @@ -869,22 +869,22 @@ generated_cc_atom( "//include/core:SkStrokeRec_hdr", "//include/core:SkVertices_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrThreadSafeCache_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrThreadSafeCache_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -981,7 +981,7 @@ generated_cc_atom( ":SkDevice_hdr", ":SkReadBuffer_hdr", ":SkWriter32_hdr", - "//src/gpu:BaseDevice_hdr", + "//src/gpu/ganesh:BaseDevice_hdr", ], ) @@ -1030,10 +1030,10 @@ generated_cc_atom( "//include/private:SkTo_hdr", "//include/private/chromium:GrSlug_hdr", "//include/utils:SkNoDrawCanvas_hdr", - "//src/gpu:BaseDevice_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:BaseDevice_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkSurface_Base_hdr", "//src/utils:SkPatchUtils_hdr", @@ -1089,7 +1089,7 @@ generated_cc_atom( ":SkRectPriv_hdr", "//include/core:SkCanvas_hdr", "//include/core:SkPath_hdr", - "//src/gpu:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", "//src/shaders:SkShaderBase_hdr", ], ) @@ -1138,7 +1138,7 @@ generated_cc_atom( "//include/effects:SkRuntimeEffect_hdr", "//include/private:SkColorData_hdr", "//include/private:SkNx_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", ], ) @@ -1166,9 +1166,9 @@ generated_cc_atom( "//include/private:SkNx_hdr", "//include/private:SkTDArray_hdr", "//include/third_party/skcms:skcms_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -1434,10 +1434,10 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/gpu:GrRecordingContext_hdr", "//include/gpu:GrYUVABackendTextures_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//src/image:SkImage_GpuYUVA_hdr", "//src/image:SkImage_Gpu_hdr", "//src/image:SkSurface_Gpu_hdr", @@ -1453,8 +1453,8 @@ generated_cc_atom( "//include/core:SkDeferredDisplayList_hdr", "//include/core:SkRefCnt_hdr", "//include/core:SkTypes_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRenderTask_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTask_hdr", ], ) @@ -1493,7 +1493,7 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/private:SkTo_hdr", "//include/private/chromium:SkChromeRemoteGlyphCache_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", ], ) @@ -2123,7 +2123,7 @@ generated_cc_atom( ":SkScalerContext_hdr", ":SkTextBlobPriv_hdr", "//include/core:SkSurfaceProps_hdr", - "//src/gpu/text:GrSDFTControl_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", ], ) @@ -2151,14 +2151,14 @@ generated_cc_atom( "//include/core:SkPathEffect_hdr", "//include/gpu:GrRecordingContext_hdr", "//include/private:SkTDArray_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/text:GrSDFTControl_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -2252,13 +2252,13 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/core:SkRect_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrGaussianConvolutionFragmentProcessor_hdr", - "//src/gpu/effects:GrMatrixConvolutionEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrGaussianConvolutionFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrMatrixConvolutionEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -2430,12 +2430,12 @@ generated_cc_atom( "//include/core:SkRect_hdr", "//include/gpu:GrRecordingContext_hdr", "//include/private:SkSafe32_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", ], ) @@ -2450,7 +2450,7 @@ generated_cc_atom( "//include/core:SkImageGenerator_hdr", "//include/core:SkImage_hdr", "//src/codec:SkColorTable_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", ], ) @@ -2702,10 +2702,10 @@ generated_cc_atom( ":SkWriteBuffer_hdr", "//include/core:SkPath_hdr", "//include/core:SkRRect_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu/text:GrSDFMaskFilter_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh/text:GrSDFMaskFilter_hdr", ], ) @@ -3023,9 +3023,9 @@ generated_cc_atom( "//include/private:SkColorData_hdr", "//include/utils:SkRandom_hdr", "//src/gpu:Blend_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", ], ) @@ -3429,8 +3429,8 @@ generated_cc_atom( "//include/core:SkPicture_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//src/image:SkImage_Base_hdr", ], ) @@ -4179,13 +4179,13 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/private:SkMutex_hdr", "//include/sksl:DSLCore_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrFPArgs_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrFPArgs_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", "//src/image:SkImage_Gpu_hdr", "//src/sksl:SkSLAnalysis_hdr", "//src/sksl:SkSLCompiler_hdr", @@ -4517,7 +4517,7 @@ generated_cc_atom( "//include/core:SkSamplingOptions_hdr", "//include/core:SkSurfaceProps_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", ], ) @@ -4537,10 +4537,10 @@ generated_cc_atom( "//include/core:SkTileMode_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_Gpu_hdr", "//src/shaders:SkImageShader_hdr", @@ -4571,7 +4571,7 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/core:SkMallocPixelRef_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", ], ) @@ -4687,7 +4687,7 @@ generated_cc_atom( "//include/core:SkTypeface_hdr", "//include/private:SkMutex_hdr", "//include/private:SkTemplates_hdr", - "//src/gpu/text:GrStrikeCache_hdr", + "//src/gpu/ganesh/text:GrStrikeCache_hdr", ], ) @@ -4722,7 +4722,7 @@ generated_cc_atom( ":SkStrikeForGPU_hdr", "//include/core:SkMaskFilter_hdr", "//include/core:SkPathEffect_hdr", - "//src/gpu/text:GrSDFTControl_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", ], ) @@ -4737,9 +4737,9 @@ generated_cc_atom( ":SkStrikeSpec_hdr", ":SkTLazy_hdr", "//include/core:SkGraphics_hdr", - "//src/gpu/text:GrSDFMaskFilter_hdr", - "//src/gpu/text:GrSDFTControl_hdr", - "//src/gpu/text:GrStrikeCache_hdr", + "//src/gpu/ganesh/text:GrSDFMaskFilter_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", + "//src/gpu/ganesh/text:GrStrikeCache_hdr", ], ) @@ -4839,8 +4839,8 @@ generated_cc_atom( deps = [ "//include/core:SkSurfaceCharacterization_hdr", "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrContextThreadSafeProxyPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrContextThreadSafeProxyPriv_hdr", ], ) @@ -5020,7 +5020,7 @@ generated_cc_atom( "//include/core:SkRSXform_hdr", "//include/core:SkTextBlob_hdr", "//include/core:SkTypeface_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", ], ) @@ -5436,9 +5436,9 @@ generated_cc_atom( "//include/core:SkString_hdr", "//include/private:SkColorData_hdr", "//include/private:SkOnce_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/effects:GrCustomXfermode_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrCustomXfermode_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", ], ) @@ -5548,9 +5548,9 @@ generated_cc_atom( "//include/private:SkChecksum_hdr", "//include/private:SkTHash_hdr", "//include/private/chromium:SkChromeRemoteGlyphCache_hdr", - "//src/gpu:GrDrawOpAtlas_hdr", - "//src/gpu/text:GrSDFTControl_hdr", - "//src/gpu/text:GrTextBlob_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", + "//src/gpu/ganesh/text:GrTextBlob_hdr", ], ) diff --git a/src/core/SkBlendModeBlender.cpp b/src/core/SkBlendModeBlender.cpp index 8a7200a6fe..872ac13d5d 100644 --- a/src/core/SkBlendModeBlender.cpp +++ b/src/core/SkBlendModeBlender.cpp @@ -10,8 +10,8 @@ #include "src/core/SkWriteBuffer.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" #endif #ifdef SK_ENABLE_SKSL diff --git a/src/core/SkBlendModePriv.h b/src/core/SkBlendModePriv.h index f24c8ca982..5df436aab3 100644 --- a/src/core/SkBlendModePriv.h +++ b/src/core/SkBlendModePriv.h @@ -33,7 +33,7 @@ void SkBlendMode_AppendStages(SkBlendMode, SkRasterPipeline*); SkPMColor4f SkBlendMode_Apply(SkBlendMode, const SkPMColor4f& src, const SkPMColor4f& dst); #if SK_SUPPORT_GPU -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" const GrXPFactory* SkBlendMode_AsXPFactory(SkBlendMode); #endif diff --git a/src/core/SkBlurMF.cpp b/src/core/SkBlurMF.cpp index 54216973bb..4d464fbe45 100644 --- a/src/core/SkBlurMF.cpp +++ b/src/core/SkBlurMF.cpp @@ -24,23 +24,23 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #if SK_GPU_V1 -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #endif // SK_GPU_V1 #endif // SK_SUPPORT_GPU diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index ecd85b357e..8df126c7b7 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -54,12 +54,12 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" #include "include/private/chromium/GrSlug.h" -#include "src/gpu/BaseDevice.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/SkGr.h" #include "src/utils/SkTestCanvas.h" #if defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) -# include "src/gpu/GrRenderTarget.h" -# include "src/gpu/GrRenderTargetProxy.h" +# include "src/gpu/ganesh/GrRenderTarget.h" +# include "src/gpu/ganesh/GrRenderTargetProxy.h" #endif #endif diff --git a/src/core/SkCanvasPriv.cpp b/src/core/SkCanvasPriv.cpp index a282099d5d..786c7de3ab 100644 --- a/src/core/SkCanvasPriv.cpp +++ b/src/core/SkCanvasPriv.cpp @@ -113,7 +113,7 @@ void SkCanvasPriv::DrawCustomMesh(SkCanvas* canvas, #if GR_TEST_UTILS #if SK_SUPPORT_GPU -#include "src/gpu/BaseDevice.h" +#include "src/gpu/ganesh/BaseDevice.h" #if SK_GPU_V1 skgpu::v1::SurfaceDrawContext* SkCanvasPriv::TopDeviceSurfaceDrawContext(SkCanvas* canvas) { @@ -150,7 +150,7 @@ skgpu::SurfaceFillContext* SkCanvasPriv::TopDeviceSurfaceFillContext(SkCanvas* c #endif // GR_TEST_UTILS #if SK_SUPPORT_GPU -#include "src/gpu/BaseDevice.h" +#include "src/gpu/ganesh/BaseDevice.h" GrRenderTargetProxy* SkCanvasPriv::TopDeviceTargetProxy(SkCanvas* canvas) { if (auto gpuDevice = canvas->topDevice()->asGaneshDevice()) { diff --git a/src/core/SkChromeRemoteGlyphCache.cpp b/src/core/SkChromeRemoteGlyphCache.cpp index 37634c0927..b04b582d9e 100644 --- a/src/core/SkChromeRemoteGlyphCache.cpp +++ b/src/core/SkChromeRemoteGlyphCache.cpp @@ -33,9 +33,9 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrContextOptions.h" -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/text/GrSDFTControl.h" -#include "src/gpu/text/GrTextBlob.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" #endif namespace { diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp index af0d1a7dfc..a1016a4729 100644 --- a/src/core/SkClipStack.cpp +++ b/src/core/SkClipStack.cpp @@ -15,7 +15,7 @@ #include #if SK_SUPPORT_GPU -#include "src/gpu/GrProxyProvider.h" +#include "src/gpu/ganesh/GrProxyProvider.h" #endif SkClipStack::Element::Element(const Element& that) { diff --git a/src/core/SkColorFilter.cpp b/src/core/SkColorFilter.cpp index b4d250400a..c77b38f7e8 100644 --- a/src/core/SkColorFilter.cpp +++ b/src/core/SkColorFilter.cpp @@ -25,9 +25,9 @@ #include "src/core/SkWriteBuffer.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #endif bool SkColorFilter::asAColorMode(SkColor* color, SkBlendMode* mode) const { diff --git a/src/core/SkColorFilter_Matrix.cpp b/src/core/SkColorFilter_Matrix.cpp index a0a047c345..b59a6b6440 100644 --- a/src/core/SkColorFilter_Matrix.cpp +++ b/src/core/SkColorFilter_Matrix.cpp @@ -120,7 +120,7 @@ skvm::Color SkColorFilter_Matrix::onProgram(skvm::Builder* p, skvm::Color c, } #if SK_SUPPORT_GPU -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" // Convert RGBA -> HSLA (including unpremul). // diff --git a/src/core/SkDeferredDisplayList.cpp b/src/core/SkDeferredDisplayList.cpp index 56ed63a7a4..de7669385c 100644 --- a/src/core/SkDeferredDisplayList.cpp +++ b/src/core/SkDeferredDisplayList.cpp @@ -14,8 +14,8 @@ class SkSurfaceCharacterization; #if SK_SUPPORT_GPU -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRenderTask.h" #endif SkDeferredDisplayList::SkDeferredDisplayList(const SkSurfaceCharacterization& characterization, diff --git a/src/core/SkDeferredDisplayListRecorder.cpp b/src/core/SkDeferredDisplayListRecorder.cpp index 3651045340..d067b17d94 100644 --- a/src/core/SkDeferredDisplayListRecorder.cpp +++ b/src/core/SkDeferredDisplayListRecorder.cpp @@ -28,10 +28,10 @@ sk_sp SkDeferredDisplayListRecorder::detach() { return nu #include "include/core/SkPromiseImageTexture.h" #include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrYUVABackendTextures.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkImage_GpuYUVA.h" #include "src/image/SkSurface_Gpu.h" diff --git a/src/core/SkDescriptor.cpp b/src/core/SkDescriptor.cpp index 75e02e6f73..545fddd715 100644 --- a/src/core/SkDescriptor.cpp +++ b/src/core/SkDescriptor.cpp @@ -16,7 +16,7 @@ #include "src/core/SkOpts.h" #include "src/core/SkReadBuffer.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" std::unique_ptr SkDescriptor::Alloc(size_t length) { SkASSERT(length >= sizeof(SkDescriptor) && SkAlign4(length) == length); diff --git a/src/core/SkGlyphRunPainter.cpp b/src/core/SkGlyphRunPainter.cpp index 611e5b4095..df4069726a 100644 --- a/src/core/SkGlyphRunPainter.cpp +++ b/src/core/SkGlyphRunPainter.cpp @@ -9,14 +9,14 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/text/GrSDFTControl.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #endif // SK_SUPPORT_GPU #include "include/core/SkBitmap.h" diff --git a/src/core/SkGlyphRunPainter.h b/src/core/SkGlyphRunPainter.h index 8a707a200a..6466b5c1dc 100644 --- a/src/core/SkGlyphRunPainter.h +++ b/src/core/SkGlyphRunPainter.h @@ -16,7 +16,7 @@ #include "src/core/SkTextBlobPriv.h" #if SK_SUPPORT_GPU -#include "src/gpu/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" class GrColorInfo; namespace skgpu { namespace v1 { class SurfaceDrawContext; }} #endif diff --git a/src/core/SkGpuBlurUtils.cpp b/src/core/SkGpuBlurUtils.cpp index 26e528d5b0..cf3f6d000c 100644 --- a/src/core/SkGpuBlurUtils.cpp +++ b/src/core/SkGpuBlurUtils.cpp @@ -14,15 +14,15 @@ #if SK_SUPPORT_GPU #include "include/core/SkColorSpace.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h" -#include "src/gpu/effects/GrMatrixConvolutionEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #if SK_GPU_V1 -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" using Direction = GrGaussianConvolutionFragmentProcessor::Direction; diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp index b3214a9851..7fa655238a 100644 --- a/src/core/SkImageFilter.cpp +++ b/src/core/SkImageFilter.cpp @@ -22,12 +22,12 @@ #include "src/core/SkWriteBuffer.h" #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" #endif #include diff --git a/src/core/SkImageGenerator.cpp b/src/core/SkImageGenerator.cpp index f0f5c2323f..6baa1dcf91 100644 --- a/src/core/SkImageGenerator.cpp +++ b/src/core/SkImageGenerator.cpp @@ -43,7 +43,7 @@ bool SkImageGenerator::getYUVAPlanes(const SkYUVAPixmaps& yuvaPixmaps) { } #if SK_SUPPORT_GPU -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" GrSurfaceProxyView SkImageGenerator::generateTexture(GrRecordingContext* ctx, const SkImageInfo& info, diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp index ba4efb4b9c..8388a1b194 100644 --- a/src/core/SkMaskFilter.cpp +++ b/src/core/SkMaskFilter.cpp @@ -19,10 +19,10 @@ #include "src/core/SkWriteBuffer.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/text/GrSDFMaskFilter.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/text/GrSDFMaskFilter.h" #endif SkMaskFilterBase::NinePatch::~NinePatch() { diff --git a/src/core/SkModeColorFilter.cpp b/src/core/SkModeColorFilter.cpp index f8543b2ff7..bfe3db2346 100644 --- a/src/core/SkModeColorFilter.cpp +++ b/src/core/SkModeColorFilter.cpp @@ -84,9 +84,9 @@ skvm::Color SkModeColorFilter::onProgram(skvm::Builder* p, skvm::Color c, /////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU #include "src/gpu/Blend.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" GrFPResult SkModeColorFilter::asFragmentProcessor(std::unique_ptr inputFP, GrRecordingContext*, diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index 01c163e3fd..3aba369bc6 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -92,8 +92,8 @@ bool SkPictureImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" GrSurfaceProxyView SkPictureImageGenerator::onGenerateTexture(GrRecordingContext* ctx, const SkImageInfo& info, diff --git a/src/core/SkRuntimeEffect.cpp b/src/core/SkRuntimeEffect.cpp index be08ac001a..6e3a05e526 100644 --- a/src/core/SkRuntimeEffect.cpp +++ b/src/core/SkRuntimeEffect.cpp @@ -37,13 +37,13 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrFPArgs.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrFPArgs.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" #include "src/image/SkImage_Gpu.h" #endif diff --git a/src/core/SkSpecialImage.cpp b/src/core/SkSpecialImage.cpp index f034f585b9..5e6ba7a214 100644 --- a/src/core/SkSpecialImage.cpp +++ b/src/core/SkSpecialImage.cpp @@ -20,10 +20,10 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" #include "src/image/SkImage_Gpu.h" #include "src/shaders/SkImageShader.h" #endif diff --git a/src/core/SkSpecialImage.h b/src/core/SkSpecialImage.h index fa1bbf776a..2b4cead64c 100644 --- a/src/core/SkSpecialImage.h +++ b/src/core/SkSpecialImage.h @@ -16,7 +16,7 @@ #if SK_SUPPORT_GPU #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" #endif class GrRecordingContext; diff --git a/src/core/SkSpecialSurface.cpp b/src/core/SkSpecialSurface.cpp index 0b5e9b8fd2..1545197190 100644 --- a/src/core/SkSpecialSurface.cpp +++ b/src/core/SkSpecialSurface.cpp @@ -120,7 +120,7 @@ sk_sp SkSpecialSurface::MakeRaster(const SkImageInfo& info, #if SK_SUPPORT_GPU /////////////////////////////////////////////////////////////////////////////// #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" class SkSpecialSurface_Gpu : public SkSpecialSurface_Base { public: diff --git a/src/core/SkStrikeCache.cpp b/src/core/SkStrikeCache.cpp index 1608b0ffea..94cb4d8876 100644 --- a/src/core/SkStrikeCache.cpp +++ b/src/core/SkStrikeCache.cpp @@ -19,7 +19,7 @@ #include "src/core/SkScalerCache.h" #if SK_SUPPORT_GPU -#include "src/gpu/text/GrStrikeCache.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" #endif bool gSkUseThreadLocalStrikeCaches_IAcknowledgeThisIsIncrediblyExperimental = false; diff --git a/src/core/SkStrikeSpec.cpp b/src/core/SkStrikeSpec.cpp index 7ae34a267a..b854f19e87 100644 --- a/src/core/SkStrikeSpec.cpp +++ b/src/core/SkStrikeSpec.cpp @@ -14,9 +14,9 @@ #include "src/core/SkTLazy.h" #if SK_SUPPORT_GPU -#include "src/gpu/text/GrSDFMaskFilter.h" -#include "src/gpu/text/GrSDFTControl.h" -#include "src/gpu/text/GrStrikeCache.h" +#include "src/gpu/ganesh/text/GrSDFMaskFilter.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" #endif SkStrikeSpec::SkStrikeSpec(const SkDescriptor& descriptor, sk_sp typeface) diff --git a/src/core/SkStrikeSpec.h b/src/core/SkStrikeSpec.h index bd7615f773..18a04490b9 100644 --- a/src/core/SkStrikeSpec.h +++ b/src/core/SkStrikeSpec.h @@ -16,7 +16,7 @@ #include #if SK_SUPPORT_GPU -#include "src/gpu/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" class GrStrikeCache; class GrTextStrike; #endif diff --git a/src/core/SkSurfaceCharacterization.cpp b/src/core/SkSurfaceCharacterization.cpp index cd226f3ec3..e84a1385c9 100644 --- a/src/core/SkSurfaceCharacterization.cpp +++ b/src/core/SkSurfaceCharacterization.cpp @@ -8,8 +8,8 @@ #include "include/core/SkSurfaceCharacterization.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" #ifdef SK_VULKAN #include "include/gpu/vk/GrVkTypes.h" diff --git a/src/core/SkTextBlob.cpp b/src/core/SkTextBlob.cpp index f40d64571b..9df13a082d 100644 --- a/src/core/SkTextBlob.cpp +++ b/src/core/SkTextBlob.cpp @@ -23,7 +23,7 @@ #include #if SK_SUPPORT_GPU -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" #endif namespace { diff --git a/src/core/SkXfermode.cpp b/src/core/SkXfermode.cpp index 9b1a9a1eff..25c356056e 100644 --- a/src/core/SkXfermode.cpp +++ b/src/core/SkXfermode.cpp @@ -17,9 +17,9 @@ #include "src/core/SkXfermodePriv.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/effects/GrCustomXfermode.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrCustomXfermode.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" #endif /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/effects/BUILD.bazel b/src/effects/BUILD.bazel index 7269405326..66aa705afa 100644 --- a/src/effects/BUILD.bazel +++ b/src/effects/BUILD.bazel @@ -299,7 +299,7 @@ generated_cc_atom( "//include/effects:SkShaderMaskFilter_hdr", "//src/core:SkMaskFilterBase_hdr", "//src/core:SkReadBuffer_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", "//src/shaders:SkShaderBase_hdr", ], ) @@ -322,12 +322,12 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkVM_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", ], ) diff --git a/src/effects/SkShaderMaskFilter.cpp b/src/effects/SkShaderMaskFilter.cpp index b9a361741b..9eacf91cfe 100644 --- a/src/effects/SkShaderMaskFilter.cpp +++ b/src/effects/SkShaderMaskFilter.cpp @@ -111,7 +111,7 @@ bool SkShaderMF::filterMask(SkMask* dst, const SkMask& src, const SkMatrix& ctm, /////////////////////////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" std::unique_ptr SkShaderMF::onAsFragmentProcessor(const GrFPArgs& args) const { return GrFragmentProcessor::MulInputByChildAlpha(as_SB(fShader)->asFragmentProcessor(args)); diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 343ee957fe..a5130032c2 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -103,12 +103,12 @@ sk_sp SkTable_ColorFilter::CreateProc(SkReadBuffer& buffer) { #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" class ColorTableEffect : public GrFragmentProcessor { public: diff --git a/src/effects/imagefilters/BUILD.bazel b/src/effects/imagefilters/BUILD.bazel index 93a6951028..13cbe07853 100644 --- a/src/effects/imagefilters/BUILD.bazel +++ b/src/effects/imagefilters/BUILD.bazel @@ -15,13 +15,13 @@ generated_cc_atom( "//src/core:SkRuntimeEffectPriv_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -41,13 +41,13 @@ generated_cc_atom( "//src/core:SkSpecialImage_hdr", "//src/core:SkSpecialSurface_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", ], ) @@ -68,14 +68,14 @@ generated_cc_atom( "//src/core:SkSpecialImage_hdr", "//src/core:SkSpecialSurface_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", ], ) @@ -99,9 +99,9 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -168,19 +168,19 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -233,19 +233,19 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -264,9 +264,9 @@ generated_cc_atom( "//src/core:SkSpecialImage_hdr", "//src/core:SkValidationUtils_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", ], ) @@ -286,10 +286,10 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrMatrixConvolutionEffect_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrMatrixConvolutionEffect_hdr", ], ) @@ -324,18 +324,18 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) diff --git a/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp b/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp index 7adb776386..69ff5f34df 100644 --- a/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp +++ b/src/effects/imagefilters/SkAlphaThresholdImageFilter.cpp @@ -17,14 +17,14 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #if SK_GPU_V1 -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #endif // SK_GPU_V1 #endif // SK_SUPPORT_GPU diff --git a/src/effects/imagefilters/SkArithmeticImageFilter.cpp b/src/effects/imagefilters/SkArithmeticImageFilter.cpp index 3dcebc4b45..d718a0677d 100644 --- a/src/effects/imagefilters/SkArithmeticImageFilter.cpp +++ b/src/effects/imagefilters/SkArithmeticImageFilter.cpp @@ -18,13 +18,13 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #endif namespace { diff --git a/src/effects/imagefilters/SkBlendImageFilter.cpp b/src/effects/imagefilters/SkBlendImageFilter.cpp index 0b7fcf2711..a4b3e714dc 100644 --- a/src/effects/imagefilters/SkBlendImageFilter.cpp +++ b/src/effects/imagefilters/SkBlendImageFilter.cpp @@ -19,13 +19,13 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #endif namespace { @@ -252,7 +252,7 @@ void SkBlendImageFilter::drawForeground(SkCanvas* canvas, SkSpecialImage* img, #if SK_SUPPORT_GPU -#include "src/gpu/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" sk_sp SkBlendImageFilter::filterImageGPU(const Context& ctx, sk_sp background, diff --git a/src/effects/imagefilters/SkBlurImageFilter.cpp b/src/effects/imagefilters/SkBlurImageFilter.cpp index e8f20bb3f3..5be28320bd 100644 --- a/src/effects/imagefilters/SkBlurImageFilter.cpp +++ b/src/effects/imagefilters/SkBlurImageFilter.cpp @@ -24,10 +24,10 @@ #include "src/core/SkWriteBuffer.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" #if SK_GPU_V1 -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #endif // SK_GPU_V1 #endif // SK_SUPPORT_GPU diff --git a/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp b/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp index eae2d53c77..e97fa8dbac 100644 --- a/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp +++ b/src/effects/imagefilters/SkDisplacementMapImageFilter.cpp @@ -16,19 +16,19 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #endif namespace { diff --git a/src/effects/imagefilters/SkLightingImageFilter.cpp b/src/effects/imagefilters/SkLightingImageFilter.cpp index 7ada217ed0..d46538fa30 100644 --- a/src/effects/imagefilters/SkLightingImageFilter.cpp +++ b/src/effects/imagefilters/SkLightingImageFilter.cpp @@ -18,19 +18,19 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" // For brevity typedef GrGLSLProgramDataManager::UniformHandle UniformHandle; diff --git a/src/effects/imagefilters/SkMagnifierImageFilter.cpp b/src/effects/imagefilters/SkMagnifierImageFilter.cpp index 2175b225ed..af6855d2d0 100644 --- a/src/effects/imagefilters/SkMagnifierImageFilter.cpp +++ b/src/effects/imagefilters/SkMagnifierImageFilter.cpp @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// #if SK_SUPPORT_GPU #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #endif namespace { diff --git a/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp index eb400a5ad0..b6f10afe3d 100644 --- a/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/imagefilters/SkMatrixConvolutionImageFilter.cpp @@ -18,10 +18,10 @@ #include "src/core/SkWriteBuffer.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrMatrixConvolutionEffect.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h" #endif namespace { diff --git a/src/effects/imagefilters/SkMorphologyImageFilter.cpp b/src/effects/imagefilters/SkMorphologyImageFilter.cpp index b5c11abe23..2d04d598e3 100644 --- a/src/effects/imagefilters/SkMorphologyImageFilter.cpp +++ b/src/effects/imagefilters/SkMorphologyImageFilter.cpp @@ -17,18 +17,18 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #endif #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 diff --git a/src/gpu/BUILD.bazel b/src/gpu/BUILD.bazel index 843fbc79a5..45808ab8ed 100644 --- a/src/gpu/BUILD.bazel +++ b/src/gpu/BUILD.bazel @@ -1,410 +1,27 @@ -# https://github.com/bazelbuild/bazel-skylib -load("@bazel_skylib//lib:selects.bzl", "selects") load("//bazel:macros.bzl", "generated_cc_atom") cc_library( name = "core_srcs", deps = [ - ":BaseDevice_src", - ":GrAHardwareBufferImageGenerator_src", - ":GrAHardwareBufferUtils_src", - ":GrAttachment_src", - ":GrAuditTrail_src", - ":GrBackendSemaphore_src", - ":GrBackendSurfaceMutableState_src", - ":GrBackendSurface_src", - ":GrBackendTextureImageGenerator_src", - ":GrBackendUtils_src", - ":GrBlurUtils_src", - ":GrBufferAllocPool_src", - ":GrCaps_src", - ":GrClientMappedBufferManager_src", - ":GrColorInfo_src", - ":GrColorSpaceXform_src", - ":GrContextThreadSafeProxy_src", - ":GrContext_Base_src", - ":GrCopyRenderTask_src", - ":GrDDLContext_src", - ":GrDDLTask_src", - ":GrDataUtils_src", - ":GrDefaultGeoProcFactory_src", - ":GrDirectContextPriv_src", - ":GrDirectContext_src", - ":GrDistanceFieldGenFromVector_src", - ":GrDrawOpAtlas_src", - ":GrDrawOpTest_src", - ":GrDrawingManager_src", - ":GrDriverBugWorkarounds_src", - ":GrDynamicAtlas_src", - ":GrEagerVertexAllocator_src", - ":GrFinishCallbacks_src", - ":GrFixedClip_src", - ":GrFragmentProcessor_src", - ":GrGeometryProcessor_src", - ":GrGpuBuffer_src", - ":GrGpuResource_src", - ":GrGpu_src", - ":GrImageContext_src", - ":GrImageInfo_src", - ":GrManagedResource_src", - ":GrMemoryPool_src", - ":GrMeshDrawTarget_src", - ":GrOnFlushResourceProvider_src", - ":GrOpFlushState_src", - ":GrOpsRenderPass_src", - ":GrPaint_src", - ":GrPersistentCacheUtils_src", - ":GrPipeline_src", - ":GrProcessorAnalysis_src", - ":GrProcessorSet_src", - ":GrProcessorUnitTest_src", - ":GrProcessor_src", - ":GrProgramDesc_src", - ":GrProgramInfo_src", - ":GrProxyProvider_src", - ":GrRecordingContextPriv_src", - ":GrRecordingContext_src", - ":GrRectanizerPow2_src", - ":GrRectanizerSkyline_src", - ":GrRenderTargetProxy_src", - ":GrRenderTarget_src", - ":GrRenderTaskCluster_src", - ":GrRenderTask_src", - ":GrResourceAllocator_src", - ":GrResourceCache_src", - ":GrResourceProvider_src", - ":GrRingBuffer_src", - ":GrSPIRVUniformHandler_src", - ":GrSPIRVVaryingHandler_src", - ":GrSWMaskHelper_src", - ":GrShaderCaps_src", - ":GrShaderVar_src", - ":GrStagingBufferManager_src", - ":GrStencilSettings_src", - ":GrStyle_src", - ":GrSubRunAllocator_src", - ":GrSurfaceInfo_src", - ":GrSurfaceProxy_src", - ":GrSurface_src", - ":GrTestUtils_src", - ":GrTextureProxy_src", - ":GrTextureRenderTargetProxy_src", - ":GrTextureResolveRenderTask_src", - ":GrTexture_src", - ":GrThreadSafeCache_src", - ":GrThreadSafePipelineBuilder_src", - ":GrTransferFromRenderTask_src", - ":GrUniformDataManager_src", - ":GrUtil_src", - ":GrVertexChunkArray_src", - ":GrWaitRenderTask_src", - ":GrWritePixelsRenderTask_src", - ":GrXferProcessor_src", - ":GrYUVABackendTextures_src", - ":GrYUVATextureProxies_src", ":ResourceKey_src", ":ShaderErrorHandler_src", - ":SkGr_src", - ":SurfaceContext_src", - ":SurfaceFillContext_src", ":Swizzle_src", - "//src/gpu/effects:GrBezierEffect_src", - "//src/gpu/effects:GrBicubicEffect_src", - "//src/gpu/effects:GrBitmapTextGeoProc_src", - "//src/gpu/effects:GrBlendFragmentProcessor_src", - "//src/gpu/effects:GrConvexPolyEffect_src", - "//src/gpu/effects:GrCoverageSetOpXP_src", - "//src/gpu/effects:GrCustomXfermode_src", - "//src/gpu/effects:GrDisableColorXP_src", - "//src/gpu/effects:GrDistanceFieldGeoProc_src", - "//src/gpu/effects:GrGaussianConvolutionFragmentProcessor_src", - "//src/gpu/effects:GrMatrixConvolutionEffect_src", - "//src/gpu/effects:GrMatrixEffect_src", - "//src/gpu/effects:GrModulateAtlasCoverageEffect_src", - "//src/gpu/effects:GrOvalEffect_src", - "//src/gpu/effects:GrPorterDuffXferProcessor_src", - "//src/gpu/effects:GrRRectEffect_src", - "//src/gpu/effects:GrShadowGeoProc_src", - "//src/gpu/effects:GrSkSLFP_src", - "//src/gpu/effects:GrTextureEffect_src", - "//src/gpu/effects:GrYUVtoRGBEffect_src", - "//src/gpu/geometry:GrAAConvexTessellator_src", - "//src/gpu/geometry:GrAATriangulator_src", - "//src/gpu/geometry:GrPathUtils_src", - "//src/gpu/geometry:GrQuadUtils_src", - "//src/gpu/geometry:GrQuad_src", - "//src/gpu/geometry:GrShape_src", - "//src/gpu/geometry:GrStyledShape_src", - "//src/gpu/geometry:GrTriangulator_src", - "//src/gpu/glsl:GrGLSLBlend_src", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_src", - "//src/gpu/glsl:GrGLSLProgramBuilder_src", - "//src/gpu/glsl:GrGLSLProgramDataManager_src", - "//src/gpu/glsl:GrGLSLShaderBuilder_src", - "//src/gpu/glsl:GrGLSLUniformHandler_src", - "//src/gpu/glsl:GrGLSLVarying_src", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_src", - "//src/gpu/glsl:GrGLSL_src", - "//src/gpu/gradients:GrGradientBitmapCache_src", - "//src/gpu/gradients:GrGradientShader_src", - "//src/gpu/ops:AAConvexPathRenderer_src", - "//src/gpu/ops:AAHairLinePathRenderer_src", - "//src/gpu/ops:AALinearizingConvexPathRenderer_src", - "//src/gpu/ops:AtlasInstancedHelper_src", - "//src/gpu/ops:AtlasPathRenderer_src", - "//src/gpu/ops:AtlasRenderTask_src", - "//src/gpu/ops:AtlasTextOp_src", - "//src/gpu/ops:ClearOp_src", - "//src/gpu/ops:DashLinePathRenderer_src", - "//src/gpu/ops:DashOp_src", - "//src/gpu/ops:DefaultPathRenderer_src", - "//src/gpu/ops:DrawAtlasOp_src", - "//src/gpu/ops:DrawAtlasPathOp_src", - "//src/gpu/ops:DrawCustomMeshOp_src", - "//src/gpu/ops:DrawableOp_src", - "//src/gpu/ops:FillRRectOp_src", - "//src/gpu/ops:FillRectOp_src", - "//src/gpu/ops:GrMeshDrawOp_src", - "//src/gpu/ops:GrOp_src", - "//src/gpu/ops:GrOvalOpFactory_src", - "//src/gpu/ops:GrSimpleMeshDrawOpHelperWithStencil_src", - "//src/gpu/ops:GrSimpleMeshDrawOpHelper_src", - "//src/gpu/ops:LatticeOp_src", - "//src/gpu/ops:OpsTask_src", - "//src/gpu/ops:PathInnerTriangulateOp_src", - "//src/gpu/ops:PathStencilCoverOp_src", - "//src/gpu/ops:PathTessellateOp_src", - "//src/gpu/ops:PathTessellator_src", - "//src/gpu/ops:QuadPerEdgeAA_src", - "//src/gpu/ops:RegionOp_src", - "//src/gpu/ops:ShadowRRectOp_src", - "//src/gpu/ops:SmallPathAtlasMgr_src", - "//src/gpu/ops:SmallPathRenderer_src", - "//src/gpu/ops:SmallPathShapeData_src", - "//src/gpu/ops:SoftwarePathRenderer_src", - "//src/gpu/ops:StrokeRectOp_src", - "//src/gpu/ops:StrokeTessellateOp_src", - "//src/gpu/ops:StrokeTessellator_src", - "//src/gpu/ops:TessellationPathRenderer_src", - "//src/gpu/ops:TextureOp_src", - "//src/gpu/ops:TriangulatingPathRenderer_src", "//src/gpu/tessellate:FixedCountBufferUtils_src", "//src/gpu/tessellate:Tessellation_src", - "//src/gpu/tessellate/shaders:GrPathTessellationShader_Hardware_src", - "//src/gpu/tessellate/shaders:GrPathTessellationShader_MiddleOut_src", - "//src/gpu/tessellate/shaders:GrPathTessellationShader_src", - "//src/gpu/tessellate/shaders:GrStrokeTessellationShader_HardwareImpl_src", - "//src/gpu/tessellate/shaders:GrStrokeTessellationShader_InstancedImpl_src", - "//src/gpu/tessellate/shaders:GrStrokeTessellationShader_src", - "//src/gpu/tessellate/shaders:GrTessellationShader_src", - "//src/gpu/text:GrAtlasManager_src", - "//src/gpu/text:GrDistanceFieldAdjustTable_src", - "//src/gpu/text:GrGlyphVector_src", - "//src/gpu/text:GrSDFMaskFilter_src", - "//src/gpu/text:GrSDFTControl_src", - "//src/gpu/text:GrSlug_src", - "//src/gpu/text:GrStrikeCache_src", - "//src/gpu/text:GrTextBlobRedrawCoordinator_src", - "//src/gpu/text:GrTextBlob_src", - ], -) - -cc_library( - name = "dawn_srcs", - deps = [ - "//src/gpu/dawn:GrDawnAttachment_src", - "//src/gpu/dawn:GrDawnBuffer_src", - "//src/gpu/dawn:GrDawnCaps_src", - "//src/gpu/dawn:GrDawnGpu_src", - "//src/gpu/dawn:GrDawnOpsRenderPass_src", - "//src/gpu/dawn:GrDawnProgramBuilder_src", - "//src/gpu/dawn:GrDawnProgramDataManager_src", - "//src/gpu/dawn:GrDawnRenderTarget_src", - "//src/gpu/dawn:GrDawnRingBuffer_src", - "//src/gpu/dawn:GrDawnTextureRenderTarget_src", - "//src/gpu/dawn:GrDawnTexture_src", - "//src/gpu/dawn:GrDawnTypesPriv_src", - "//src/gpu/dawn:GrDawnUtil_src", - ], -) - -cc_library( - name = "gl_srcs", - deps = [ - "//src/gpu/gl:GrGLAssembleGLESInterfaceAutogen_src", - "//src/gpu/gl:GrGLAssembleGLInterfaceAutogen_src", - "//src/gpu/gl:GrGLAssembleHelpers_src", - "//src/gpu/gl:GrGLAssembleInterface_src", - "//src/gpu/gl:GrGLAssembleWebGLInterfaceAutogen_src", - "//src/gpu/gl:GrGLAttachment_src", - "//src/gpu/gl:GrGLBuffer_src", - "//src/gpu/gl:GrGLCaps_src", - "//src/gpu/gl:GrGLContext_src", - "//src/gpu/gl:GrGLExtensions_src", - "//src/gpu/gl:GrGLGLSL_src", - "//src/gpu/gl:GrGLGpuProgramCache_src", - "//src/gpu/gl:GrGLGpu_src", - "//src/gpu/gl:GrGLInterfaceAutogen_src", - "//src/gpu/gl:GrGLOpsRenderPass_src", - "//src/gpu/gl:GrGLProgramDataManager_src", - "//src/gpu/gl:GrGLProgram_src", - "//src/gpu/gl:GrGLRenderTarget_src", - "//src/gpu/gl:GrGLSemaphore_src", - "//src/gpu/gl:GrGLTextureRenderTarget_src", - "//src/gpu/gl:GrGLTexture_src", - "//src/gpu/gl:GrGLTypesPriv_src", - "//src/gpu/gl:GrGLUniformHandler_src", - "//src/gpu/gl:GrGLUtil_src", - "//src/gpu/gl:GrGLVertexArray_src", - "//src/gpu/gl/builders:GrGLProgramBuilder_src", - "//src/gpu/gl/builders:GrGLShaderStringBuilder_src", - ], -) - -cc_library( - name = "vulkan_srcs", - deps = [ - "//src/gpu/vk:GrVkAMDMemoryAllocator_src", - "//src/gpu/vk:GrVkBuffer_src", - "//src/gpu/vk:GrVkCaps_src", - "//src/gpu/vk:GrVkCommandBuffer_src", - "//src/gpu/vk:GrVkCommandPool_src", - "//src/gpu/vk:GrVkDescriptorPool_src", - "//src/gpu/vk:GrVkDescriptorSetManager_src", - "//src/gpu/vk:GrVkDescriptorSet_src", - "//src/gpu/vk:GrVkExtensions_src", - "//src/gpu/vk:GrVkFramebuffer_src", - "//src/gpu/vk:GrVkGpu_src", - "//src/gpu/vk:GrVkImageView_src", - "//src/gpu/vk:GrVkImage_src", - "//src/gpu/vk:GrVkInterface_src", - "//src/gpu/vk:GrVkMSAALoadManager_src", - "//src/gpu/vk:GrVkMemory_src", - "//src/gpu/vk:GrVkOpsRenderPass_src", - "//src/gpu/vk:GrVkPipelineStateBuilder_src", - "//src/gpu/vk:GrVkPipelineStateCache_src", - "//src/gpu/vk:GrVkPipelineStateDataManager_src", - "//src/gpu/vk:GrVkPipelineState_src", - "//src/gpu/vk:GrVkPipeline_src", - "//src/gpu/vk:GrVkRenderPass_src", - "//src/gpu/vk:GrVkRenderTarget_src", - "//src/gpu/vk:GrVkResourceProvider_src", - "//src/gpu/vk:GrVkSamplerYcbcrConversion_src", - "//src/gpu/vk:GrVkSampler_src", - "//src/gpu/vk:GrVkSecondaryCBDrawContext_src", - "//src/gpu/vk:GrVkSemaphore_src", - "//src/gpu/vk:GrVkTextureRenderTarget_src", - "//src/gpu/vk:GrVkTexture_src", - "//src/gpu/vk:GrVkTypesPriv_src", - "//src/gpu/vk:GrVkUniformHandler_src", - "//src/gpu/vk:GrVkUtil_src", - "//src/gpu/vk:GrVkVaryingHandler_src", - ], -) - -cc_library( - name = "v1_srcs", - deps = [ - "//src/gpu/v1:ClipStack_src", - "//src/gpu/v1:Device_drawTexture_src", - "//src/gpu/v1:Device_src", - "//src/gpu/v1:PathRendererChain_src", - "//src/gpu/v1:PathRenderer_src", - "//src/gpu/v1:StencilMaskHelper_src", - "//src/gpu/v1:SurfaceDrawContext_src", - "//src/gpu/v1:SurfaceFillContext_v1_src", - ], -) - -cc_library( - name = "glx_srcs", - deps = [ - "//src/gpu/gl/glx:GrGLMakeGLXInterface_src", - "//src/gpu/gl/glx:GrGLMakeNativeInterface_glx_src", - ], -) - -cc_library( - name = "webgl_srcs", - deps = [ - "//src/gpu/gl/webgl:GrGLMakeNativeInterface_webgl_src", - ], -) - -cc_library( - name = "mock_srcs", - visibility = ["//:__subpackages__"], - deps = [ - "//src/gpu/mock:GrMockCaps_src", - "//src/gpu/mock:GrMockGpu_src", - "//src/gpu/mock:GrMockTypes_src", - ], -) - -selects.config_setting_group( - name = "gl_and_linux", - match_all = [ - "//bazel/common_config_settings:gl_standard", - "//bazel/common_config_settings:linux_x64", ], ) cc_library( name = "srcs", - linkopts = select({ - "//bazel/common_config_settings:gl_backend": ["-lGL"], - "//conditions:default": [], - }), visibility = ["//:__subpackages__"], - deps = [":core_srcs"] + select({ - "//bazel/common_config_settings:dawn_backend": [ - ":dawn_srcs", - ":v1_srcs", - ], - "//bazel/common_config_settings:gl_backend": [ - ":gl_srcs", - ":v1_srcs", - ], - "//bazel/common_config_settings:vulkan_backend": [ - ":vulkan_srcs", - ":v1_srcs", - ], - "//conditions:default": [], - }) + select({ - ":gl_and_linux": [":glx_srcs"], - "//bazel/common_config_settings:webgl_standard": [":webgl_srcs"], - "//conditions:default": [], - }) + select({ - "//bazel/common_config_settings:vulkan_with_vma": ["//third_party:vulkanmemoryallocator"], - "//conditions:default": [], - }), + deps = [":core_srcs"], ) generated_cc_atom( - name = "BaseDevice_hdr", - hdrs = ["BaseDevice.h"], + name = "Blend_hdr", + hdrs = ["Blend.h"], visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkImage_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkDevice_hdr", - ], -) - -generated_cc_atom( - name = "BaseDevice_src", - srcs = ["BaseDevice.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":BaseDevice_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrSurfaceProxyView_hdr", - ":SurfaceContext_hdr", - ":SurfaceFillContext_hdr", - "//include/core:SkColorSpace_hdr", - "//include/gpu:GrRecordingContext_hdr", - ], + deps = ["//include/core:SkTypes_hdr"], ) generated_cc_atom( @@ -419,3121 +36,11 @@ generated_cc_atom( ], ) -generated_cc_atom( - name = "GrAHardwareBufferImageGenerator_hdr", - hdrs = ["GrAHardwareBufferImageGenerator.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkImageGenerator_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrAHardwareBufferImageGenerator_src", - srcs = ["GrAHardwareBufferImageGenerator.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAHardwareBufferImageGenerator_hdr", - ":GrAHardwareBufferUtils_hdr", - ":GrDirectContextPriv_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrResourceCache_hdr", - ":GrResourceProviderPriv_hdr", - ":GrResourceProvider_hdr", - ":GrTextureProxy_hdr", - ":GrTexture_hdr", - ":SkGr_hdr", - "//include/core:SkTypes_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//include/gpu/gl:GrGLTypes_hdr", - "//include/gpu/vk:GrVkExtensions_hdr", - "//src/core:SkMessageBus_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - ], -) - generated_cc_atom( name = "GrAHardwareBufferUtils_hdr", hdrs = ["GrAHardwareBufferUtils.h"], visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkTypes_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrAHardwareBufferUtils_src", - srcs = ["GrAHardwareBufferUtils.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAHardwareBufferUtils_hdr", - ":GrDirectContextPriv_hdr", - "//include/core:SkTypes_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu/gl:GrGLTypes_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLUtil_hdr", - "//src/gpu/vk:GrVkCaps_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - ], -) - -generated_cc_atom( - name = "GrAppliedClip_hdr", - hdrs = ["GrAppliedClip.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrFragmentProcessor_hdr", - ":GrScissorState_hdr", - ":GrWindowRectsState_hdr", - "//src/core:SkClipStack_hdr", - ], -) - -generated_cc_atom( - name = "GrAttachment_hdr", - hdrs = ["GrAttachment.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurface_hdr", - "//src/core:SkClipStack_hdr", - ], -) - -generated_cc_atom( - name = "GrAttachment_src", - srcs = ["GrAttachment.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAttachment_hdr", - ":GrBackendUtils_hdr", - ":GrCaps_hdr", - ":GrDataUtils_hdr", - ":GrGpu_hdr", - ], -) - -generated_cc_atom( - name = "GrAuditTrail_hdr", - hdrs = ["GrAuditTrail.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRenderTargetProxy_hdr", - "//include/core:SkRect_hdr", - "//include/core:SkString_hdr", - "//include/gpu:GrConfig_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkTArray_hdr", - "//include/private:SkTHash_hdr", - ], -) - -generated_cc_atom( - name = "GrAuditTrail_src", - srcs = ["GrAuditTrail.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAuditTrail_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrAutoLocaleSetter_hdr", - hdrs = ["GrAutoLocaleSetter.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkString_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkNoncopyable_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendSemaphore_src", - srcs = ["GrBackendSemaphore.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrBackendSemaphore_hdr", - "//include/gpu/d3d:GrD3DTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendSurfaceMutableStateImpl_hdr", - hdrs = ["GrBackendSurfaceMutableStateImpl.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/gpu:GrBackendSurfaceMutableState_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendSurfaceMutableState_src", - srcs = ["GrBackendSurfaceMutableState.cpp"], - visibility = ["//:__subpackages__"], - deps = ["//include/gpu:GrBackendSurfaceMutableState_hdr"], -) - -generated_cc_atom( - name = "GrBackendSurface_src", - srcs = ["GrBackendSurface.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendSurfaceMutableStateImpl_hdr", - "//include/core:SkString_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu/d3d:GrD3DTypes_hdr", - "//include/gpu/dawn:GrDawnTypes_hdr", - "//include/gpu/mtl:GrMtlTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/gpu/d3d:GrD3DResourceState_hdr", - "//src/gpu/d3d:GrD3DUtil_hdr", - "//src/gpu/dawn:GrDawnUtil_hdr", - "//src/gpu/gl:GrGLUtil_hdr", - "//src/gpu/mtl:GrMtlCppUtil_hdr", - "//src/gpu/vk:GrVkImageLayout_hdr", - "//src/gpu/vk:GrVkUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendTextureImageGenerator_hdr", - hdrs = ["GrBackendTextureImageGenerator.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrTexture_hdr", - ":ResourceKey_hdr", - "//include/core:SkImageGenerator_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/private:SkMutex_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendTextureImageGenerator_src", - srcs = ["GrBackendTextureImageGenerator.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendTextureImageGenerator_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpu_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrResourceCache_hdr", - ":GrResourceProviderPriv_hdr", - ":GrResourceProvider_hdr", - ":GrSemaphore_hdr", - ":GrTextureProxyPriv_hdr", - ":GrTexture_hdr", - ":SkGr_hdr", - "//include/core:SkColorSpace_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkMessageBus_hdr", - "//src/gpu/gl:GrGLTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendUtils_hdr", - hdrs = ["GrBackendUtils.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkImage_hdr", - "//include/gpu:GrBackendSurface_hdr", - ], -) - -generated_cc_atom( - name = "GrBackendUtils_src", - srcs = ["GrBackendUtils.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendUtils_hdr", - ":GrDataUtils_hdr", - "//src/gpu/d3d:GrD3DUtil_hdr", - "//src/gpu/dawn:GrDawnUtil_hdr", - "//src/gpu/gl:GrGLUtil_hdr", - "//src/gpu/mtl:GrMtlCppUtil_hdr", - "//src/gpu/vk:GrVkUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrBaseContextPriv_hdr", - hdrs = ["GrBaseContextPriv.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrContextOptions_hdr", - "//include/private:GrContext_Base_hdr", - ], -) - -generated_cc_atom( - name = "GrBlurUtils_hdr", - hdrs = ["GrBlurUtils.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/private:GrTypesPriv_hdr"], -) - -generated_cc_atom( - name = "GrBlurUtils_src", - srcs = ["GrBlurUtils.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBlurUtils_hdr", - ":GrCaps_hdr", - ":GrDirectContextPriv_hdr", - ":GrFixedClip_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrResourceProvider_hdr", - ":GrStyle_hdr", - ":GrTextureProxy_hdr", - ":GrThreadSafeCache_hdr", - ":GrUtil_hdr", - ":SkGr_hdr", - "//include/core:SkBitmap_hdr", - "//include/core:SkColorSpace_hdr", - "//include/core:SkPaint_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkDraw_hdr", - "//src/core:SkMaskFilterBase_hdr", - "//src/core:SkMatrixProvider_hdr", - "//src/core:SkTLazy_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", - ], -) - -generated_cc_atom( - name = "GrBufferAllocPool_hdr", - hdrs = ["GrBufferAllocPool.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCpuBuffer_hdr", - ":GrDrawIndirectCommand_hdr", - ":GrNonAtomicRef_hdr", - "//include/core:SkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkNoncopyable_hdr", - "//include/private:SkTArray_hdr", - "//include/private:SkTDArray_hdr", - ], -) - -generated_cc_atom( - name = "GrBufferAllocPool_src", - srcs = ["GrBufferAllocPool.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBufferAllocPool_hdr", - ":GrCaps_hdr", - ":GrCpuBuffer_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpuBuffer_hdr", - ":GrGpu_hdr", - ":GrResourceProvider_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkMacros_hdr", - "//src/core:SkSafeMath_hdr", - "//src/core:SkTraceEvent_hdr", - ], -) - -generated_cc_atom( - name = "GrBuffer_hdr", - hdrs = ["GrBuffer.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/gpu:GrTypes_hdr"], -) - -generated_cc_atom( - name = "GrCaps_hdr", - hdrs = ["GrCaps.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":Blend_hdr", - ":GrSamplerState_hdr", - ":GrShaderCaps_hdr", - ":GrSurfaceProxy_hdr", - ":Swizzle_hdr", - "//include/core:SkImageInfo_hdr", - "//include/core:SkRefCnt_hdr", - "//include/core:SkString_hdr", - "//include/gpu:GrDriverBugWorkarounds_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkCompressedDataUtils_hdr", - ], -) - -generated_cc_atom( - name = "GrCaps_src", - srcs = ["GrCaps.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendUtils_hdr", - ":GrCaps_hdr", - ":GrRenderTargetProxy_hdr", - ":GrSurfaceProxy_hdr", - ":GrSurface_hdr", - ":GrTestUtils_hdr", - ":GrWindowRectangles_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrContextOptions_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrClientMappedBufferManager_hdr", - hdrs = ["GrClientMappedBufferManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuBuffer_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkMessageBus_hdr", - ], -) - -generated_cc_atom( - name = "GrClientMappedBufferManager_src", - srcs = ["GrClientMappedBufferManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [":GrClientMappedBufferManager_hdr"], -) - -generated_cc_atom( - name = "GrClip_hdr", - hdrs = ["GrClip.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAppliedClip_hdr", - "//include/core:SkRRect_hdr", - "//include/core:SkRect_hdr", - ], -) - -generated_cc_atom( - name = "GrColorInfo_hdr", - hdrs = ["GrColorInfo.h"], - enforce_iwyu = True, - visibility = ["//:__subpackages__"], - deps = [ - ":GrColorSpaceXform_hdr", - "//include/core:SkAlphaType_hdr", - "//include/core:SkRefCnt_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrColorInfo_src", - srcs = ["GrColorInfo.cpp"], - enforce_iwyu = True, - visibility = ["//:__subpackages__"], - deps = [ - ":GrColorInfo_hdr", - "//include/core:SkColorSpace_hdr", - "//include/core:SkImageInfo_hdr", - "//src/core:SkColorSpacePriv_hdr", - ], -) - -generated_cc_atom( - name = "GrColorSpaceXform_hdr", - hdrs = ["GrColorSpaceXform.h"], - enforce_iwyu = True, - visibility = ["//:__subpackages__"], - deps = [ - ":GrFragmentProcessor_hdr", - "//include/core:SkAlphaType_hdr", - "//include/core:SkColor_hdr", - "//include/core:SkRefCnt_hdr", - "//include/private:SkColorData_hdr", - "//src/core:SkColorSpaceXformSteps_hdr", - ], -) - -generated_cc_atom( - name = "GrColorSpaceXform_src", - srcs = ["GrColorSpaceXform.cpp"], - enforce_iwyu = True, - visibility = ["//:__subpackages__"], - deps = [ - ":GrColorInfo_hdr", - ":GrColorSpaceXform_hdr", - ":GrProcessor_hdr", - ":KeyBuilder_hdr", - "//include/core:SkString_hdr", - "//include/third_party/skcms:skcms_hdr", - "//src/core:SkColorSpacePriv_hdr", - "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrColor_hdr", - hdrs = ["GrColor.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":BufferWriter_hdr", - "//include/core:SkColorPriv_hdr", - "//include/core:SkColor_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkColorData_hdr", - "//include/private:SkHalf_hdr", - ], -) - -generated_cc_atom( - name = "GrContextThreadSafeProxyPriv_hdr", - hdrs = ["GrContextThreadSafeProxyPriv.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - "//include/gpu:GrContextThreadSafeProxy_hdr", - "//include/private:GrContext_Base_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", - ], -) - -generated_cc_atom( - name = "GrContextThreadSafeProxy_src", - srcs = ["GrContextThreadSafeProxy.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBaseContextPriv_hdr", - ":GrCaps_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - ":GrThreadSafeCache_hdr", - ":GrThreadSafePipelineBuilder_hdr", - "//include/core:SkSurfaceCharacterization_hdr", - "//include/gpu:GrContextThreadSafeProxy_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/vk:GrVkCaps_hdr", - "//src/image:SkSurface_Gpu_hdr", - ], -) - -generated_cc_atom( - name = "GrContext_Base_src", - srcs = ["GrContext_Base.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBaseContextPriv_hdr", - ":GrCaps_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - "//include/gpu:ShaderErrorHandler_hdr", - "//include/private:GrContext_Base_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - ], -) - -generated_cc_atom( - name = "GrCopyRenderTask_hdr", - hdrs = ["GrCopyRenderTask.h"], - visibility = ["//:__subpackages__"], - deps = [":GrRenderTask_hdr"], -) - -generated_cc_atom( - name = "GrCopyRenderTask_src", - srcs = ["GrCopyRenderTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCopyRenderTask_hdr", - ":GrGpu_hdr", - ":GrOpFlushState_hdr", - ":GrResourceAllocator_hdr", - "//src/gpu/geometry:GrRect_hdr", - ], -) - -generated_cc_atom( - name = "GrCpuBuffer_hdr", - hdrs = ["GrCpuBuffer.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBuffer_hdr", - ":GrNonAtomicRef_hdr", - "//src/core:SkSafeMath_hdr", - ], -) - -generated_cc_atom( - name = "GrDDLContext_src", - srcs = ["GrDDLContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - ":GrProgramDesc_hdr", - ":GrProgramInfo_hdr", - ":GrRecordingContextPriv_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkLRUCache_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - ], -) - -generated_cc_atom( - name = "GrDDLTask_hdr", - hdrs = ["GrDDLTask.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRenderTask_hdr", - "//include/core:SkPoint_hdr", - ], -) - -generated_cc_atom( - name = "GrDDLTask_src", - srcs = ["GrDDLTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDDLTask_hdr", - ":GrResourceAllocator_hdr", - "//include/core:SkDeferredDisplayList_hdr", - "//src/core:SkDeferredDisplayListPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrDataUtils_hdr", - hdrs = ["GrDataUtils.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkColor_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkTArray_hdr", - ], -) - -generated_cc_atom( - name = "GrDataUtils_src", - srcs = ["GrDataUtils.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrColor_hdr", - ":GrDataUtils_hdr", - ":GrImageInfo_hdr", - ":GrPixmap_hdr", - ":Swizzle_hdr", - "//include/core:SkColorSpace_hdr", - "//include/private:SkTPin_hdr", - "//include/third_party/skcms:skcms_hdr", - "//src/core:SkColorSpaceXformSteps_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkConvertPixels_hdr", - "//src/core:SkMathPriv_hdr", - "//src/core:SkMipmap_hdr", - "//src/core:SkRasterPipeline_hdr", - "//src/core:SkTLazy_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/core:SkUtils_hdr", - ], -) - -generated_cc_atom( - name = "GrDefaultGeoProcFactory_hdr", - hdrs = ["GrDefaultGeoProcFactory.h"], - visibility = ["//:__subpackages__"], - deps = [":GrGeometryProcessor_hdr"], -) - -generated_cc_atom( - name = "GrDefaultGeoProcFactory_src", - srcs = ["GrDefaultGeoProcFactory.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDefaultGeoProcFactory_hdr", - ":GrGeometryProcessor_hdr", - ":KeyBuilder_hdr", - "//include/core:SkRefCnt_hdr", - "//src/core:SkArenaAlloc_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrDeferredProxyUploader_hdr", - hdrs = ["GrDeferredProxyUploader.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrOpFlushState_hdr", - ":GrTextureProxyPriv_hdr", - "//include/core:SkRefCnt_hdr", - "//include/private:SkSemaphore_hdr", - "//src/core:SkAutoPixmapStorage_hdr", - ], -) - -generated_cc_atom( - name = "GrDeferredUpload_hdr", - hdrs = ["GrDeferredUpload.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrTypes_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrDirectContextPriv_hdr", - hdrs = ["GrDirectContextPriv.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":BaseDevice_hdr", - ":GrRecordingContextPriv_hdr", - "//include/core:SkSpan_hdr", - "//include/core:SkSurface_hdr", - "//include/gpu:GrDirectContext_hdr", - ], -) - -generated_cc_atom( - name = "GrDirectContextPriv_src", - srcs = ["GrDirectContextPriv.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrContextThreadSafeProxyPriv_hdr", - ":GrDirectContextPriv_hdr", - ":GrDrawingManager_hdr", - ":GrGpu_hdr", - ":GrMemoryPool_hdr", - ":GrRecordingContextPriv_hdr", - ":GrTexture_hdr", - ":GrThreadSafePipelineBuilder_hdr", - ":GrTracing_hdr", - ":SkGr_hdr", - ":SurfaceContext_hdr", - ":SurfaceFillContext_hdr", - "//include/core:SkBitmap_hdr", - "//include/gpu:GrContextThreadSafeProxy_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkRuntimeEffectPriv_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/text:GrAtlasManager_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", - "//src/image:SkImage_Base_hdr", - "//src/image:SkImage_Gpu_hdr", - ], -) - -generated_cc_atom( - name = "GrDirectContext_src", - srcs = ["GrDirectContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendUtils_hdr", - ":GrClientMappedBufferManager_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - ":GrDirectContextPriv_hdr", - ":GrDrawingManager_hdr", - ":GrGpu_hdr", - ":GrResourceProvider_hdr", - ":GrSemaphore_hdr", - ":GrThreadSafePipelineBuilder_hdr", - ":SurfaceContext_hdr", - "//include/core:SkString_hdr", - "//include/core:SkTraceMemoryDump_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - "//include/gpu:GrContextThreadSafeProxy_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu/mtl:GrMtlBackendContext_hdr", - "//include/utils:SkRandom_hdr", - "//src/core:SkAutoMalloc_hdr", - "//src/core:SkTaskGroup_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu/d3d:GrD3DGpu_hdr", - "//src/gpu/dawn:GrDawnGpu_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/mock:GrMockGpu_hdr", - "//src/gpu/mtl:GrMtlTrampoline_hdr", - "//src/gpu/ops:SmallPathAtlasMgr_hdr", - "//src/gpu/text:GrAtlasManager_hdr", - "//src/gpu/text:GrStrikeCache_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/image:SkImage_GpuBase_hdr", - "//src/utils:SkJSONWriter_hdr", - "//src/utils:SkShaderUtils_hdr", - ], -) - -generated_cc_atom( - name = "GrDistanceFieldGenFromVector_hdr", - hdrs = ["GrDistanceFieldGenFromVector.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/core:SkPath_hdr"], -) - -generated_cc_atom( - name = "GrDistanceFieldGenFromVector_src", - srcs = ["GrDistanceFieldGenFromVector.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDistanceFieldGenFromVector_hdr", - "//include/core:SkMatrix_hdr", - "//include/gpu:GrConfig_hdr", - "//include/private:SkTPin_hdr", - "//src/core:SkAutoMalloc_hdr", - "//src/core:SkDistanceFieldGen_hdr", - "//src/core:SkGeometry_hdr", - "//src/core:SkPointPriv_hdr", - "//src/core:SkRectPriv_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - ], -) - -generated_cc_atom( - name = "GrDrawIndirectCommand_hdr", - hdrs = ["GrDrawIndirectCommand.h"], - visibility = ["//:__subpackages__"], -) - -generated_cc_atom( - name = "GrDrawOpAtlas_hdr", - hdrs = ["GrDrawOpAtlas.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDeferredUpload_hdr", - ":GrRectanizerSkyline_hdr", - ":GrSurfaceProxyView_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkIPoint16_hdr", - "//src/core:SkTInternalLList_hdr", - "//src/gpu/geometry:GrRect_hdr", - ], -) - -generated_cc_atom( - name = "GrDrawOpAtlas_src", - srcs = ["GrDrawOpAtlas.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendUtils_hdr", - ":GrDrawOpAtlas_hdr", - ":GrOnFlushResourceProvider_hdr", - ":GrOpFlushState_hdr", - ":GrProxyProvider_hdr", - ":GrResourceProviderPriv_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrTexture_hdr", - ":GrTracing_hdr", - "//include/private:SkTPin_hdr", - "//src/core:SkOpts_hdr", - ], -) - -generated_cc_atom( - name = "GrDrawOpTest_hdr", - hdrs = ["GrDrawOpTest.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrTestUtils_hdr", - "//include/core:SkRefCnt_hdr", - ], -) - -generated_cc_atom( - name = "GrDrawOpTest_src", - srcs = ["GrDrawOpTest.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBaseContextPriv_hdr", - ":GrCaps_hdr", - ":GrDrawOpTest_hdr", - ":GrUserStencilSettings_hdr", - "//include/core:SkTypes_hdr", - "//include/private:GrContext_Base_hdr", - "//include/utils:SkRandom_hdr", - ], -) - -generated_cc_atom( - name = "GrDrawingManager_hdr", - hdrs = ["GrDrawingManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBufferAllocPool_hdr", - ":GrDeferredUpload_hdr", - ":GrHashMapWithCache_hdr", - ":GrResourceCache_hdr", - ":GrSurfaceProxy_hdr", - "//include/core:SkSpan_hdr", - "//include/core:SkSurface_hdr", - "//include/private:SkTArray_hdr", - "//include/private:SkTHash_hdr", - "//src/gpu/v1:PathRendererChain_hdr", - "//src/gpu/v1:PathRenderer_hdr", - ], -) - -generated_cc_atom( - name = "GrDrawingManager_src", - srcs = ["GrDrawingManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrClientMappedBufferManager_hdr", - ":GrCopyRenderTask_hdr", - ":GrDDLTask_hdr", - ":GrDirectContextPriv_hdr", - ":GrDrawingManager_hdr", - ":GrGpu_hdr", - ":GrMemoryPool_hdr", - ":GrOnFlushResourceProvider_hdr", - ":GrOpFlushState_hdr", - ":GrRecordingContextPriv_hdr", - ":GrRenderTargetProxy_hdr", - ":GrRenderTaskCluster_hdr", - ":GrRenderTask_hdr", - ":GrResourceAllocator_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrTTopoSort_hdr", - ":GrTextureProxyPriv_hdr", - ":GrTextureProxy_hdr", - ":GrTextureResolveRenderTask_hdr", - ":GrTexture_hdr", - ":GrTracing_hdr", - ":GrTransferFromRenderTask_hdr", - ":GrWaitRenderTask_hdr", - ":GrWritePixelsRenderTask_hdr", - "//include/core:SkDeferredDisplayList_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkDeferredDisplayListPriv_hdr", - "//src/core:SkTInternalLList_hdr", - "//src/gpu/ops:OpsTask_hdr", - "//src/gpu/ops:SoftwarePathRenderer_hdr", - "//src/gpu/text:GrSDFTControl_hdr", - "//src/image:SkSurface_Gpu_hdr", - ], -) - -generated_cc_atom( - name = "GrDriverBugWorkarounds_src", - srcs = ["GrDriverBugWorkarounds.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkTypes_hdr", - "//include/gpu:GrDriverBugWorkarounds_hdr", - ], -) - -generated_cc_atom( - name = "GrDstProxyView_hdr", - hdrs = ["GrDstProxyView.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurfaceProxyView_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrDynamicAtlas_hdr", - hdrs = ["GrDynamicAtlas.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrTextureProxy_hdr", - "//src/core:SkArenaAlloc_hdr", - ], -) - -generated_cc_atom( - name = "GrDynamicAtlas_src", - srcs = ["GrDynamicAtlas.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDynamicAtlas_hdr", - ":GrOnFlushResourceProvider_hdr", - ":GrProxyProvider_hdr", - ":GrRectanizerPow2_hdr", - ":GrRectanizerSkyline_hdr", - ":GrRenderTarget_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurfaceProxyView_hdr", - "//src/core:SkIPoint16_hdr", - ], -) - -generated_cc_atom( - name = "GrEagerVertexAllocator_hdr", - hdrs = ["GrEagerVertexAllocator.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":BufferWriter_hdr", - ":GrThreadSafeCache_hdr", - ], -) - -generated_cc_atom( - name = "GrEagerVertexAllocator_src", - srcs = ["GrEagerVertexAllocator.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrEagerVertexAllocator_hdr", - ":GrMeshDrawTarget_hdr", - ], -) - -generated_cc_atom( - name = "GrFPArgs_hdr", - hdrs = ["GrFPArgs.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/core:SkMatrix_hdr"], -) - -generated_cc_atom( - name = "GrFinishCallbacks_hdr", - hdrs = ["GrFinishCallbacks.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrTypes_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrFinishCallbacks_src", - srcs = ["GrFinishCallbacks.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrFinishCallbacks_hdr", - ":GrGpu_hdr", - ], -) - -generated_cc_atom( - name = "GrFixedClip_hdr", - hdrs = ["GrFixedClip.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrClip_hdr", - ":GrScissorState_hdr", - ":GrWindowRectsState_hdr", - ], -) - -generated_cc_atom( - name = "GrFixedClip_src", - srcs = ["GrFixedClip.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAppliedClip_hdr", - ":GrFixedClip_hdr", - ], -) - -generated_cc_atom( - name = "GrFragmentProcessor_hdr", - hdrs = ["GrFragmentProcessor.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrProcessor_hdr", - "//include/private:SkMacros_hdr", - "//include/private:SkSLSampleUsage_hdr", - "//include/private:SkSLString_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrFragmentProcessor_src", - srcs = ["GrFragmentProcessor.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrFragmentProcessor_hdr", - ":GrPipeline_hdr", - ":GrProcessorAnalysis_hdr", - ":GrShaderCaps_hdr", - ":KeyBuilder_hdr", - "//src/core:SkRuntimeEffectPriv_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrGeometryProcessor_hdr", - hdrs = ["GrGeometryProcessor.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColor_hdr", - ":GrFragmentProcessor_hdr", - ":GrProcessor_hdr", - ":GrShaderCaps_hdr", - ":GrShaderVar_hdr", - ":Swizzle_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - ], -) - -generated_cc_atom( - name = "GrGeometryProcessor_src", - srcs = ["GrGeometryProcessor.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGeometryProcessor_hdr", - ":GrPipeline_hdr", - ":KeyBuilder_hdr", - "//src/core:SkMatrixPriv_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - ], -) - -generated_cc_atom( - name = "GrGlyph_hdr", - hdrs = ["GrGlyph.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDrawOpAtlas_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkGlyph_hdr", - "//src/core:SkMask_hdr", - ], -) - -generated_cc_atom( - name = "GrGpuBuffer_hdr", - hdrs = ["GrGpuBuffer.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBuffer_hdr", - ":GrGpuResource_hdr", - ], -) - -generated_cc_atom( - name = "GrGpuBuffer_src", - srcs = ["GrGpuBuffer.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrGpuBuffer_hdr", - ":GrGpu_hdr", - ], -) - -generated_cc_atom( - name = "GrGpuResourceCacheAccess_hdr", - hdrs = ["GrGpuResourceCacheAccess.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuResourcePriv_hdr", - ":GrGpuResource_hdr", - ], -) - -generated_cc_atom( - name = "GrGpuResourcePriv_hdr", - hdrs = ["GrGpuResourcePriv.h"], - visibility = ["//:__subpackages__"], - deps = [":GrGpuResource_hdr"], -) - -generated_cc_atom( - name = "GrGpuResource_hdr", - hdrs = ["GrGpuResource.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":ResourceKey_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkNoncopyable_hdr", - ], -) - -generated_cc_atom( - name = "GrGpuResource_src", - srcs = ["GrGpuResource.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDirectContextPriv_hdr", - ":GrGpuResourcePriv_hdr", - ":GrGpuResource_hdr", - ":GrGpu_hdr", - ":GrResourceCache_hdr", - "//include/core:SkTraceMemoryDump_hdr", - "//include/gpu:GrDirectContext_hdr", - ], -) - -generated_cc_atom( - name = "GrGpu_hdr", - hdrs = ["GrGpu.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAttachment_hdr", - ":GrCaps_hdr", - ":GrOpsRenderPass_hdr", - ":GrPixmap_hdr", - ":GrXferProcessor_hdr", - ":RefCntedCallback_hdr", - ":Swizzle_hdr", - "//include/core:SkPath_hdr", - "//include/core:SkSpan_hdr", - "//include/core:SkSurface_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkTInternalLList_hdr", - ], -) - -generated_cc_atom( - name = "GrGpu_src", - srcs = ["GrGpu.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAttachment_hdr", - ":GrBackendUtils_hdr", - ":GrCaps_hdr", - ":GrDataUtils_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpuResourcePriv_hdr", - ":GrGpu_hdr", - ":GrNativeRect_hdr", - ":GrPipeline_hdr", - ":GrRenderTarget_hdr", - ":GrResourceCache_hdr", - ":GrResourceProvider_hdr", - ":GrRingBuffer_hdr", - ":GrSemaphore_hdr", - ":GrStagingBufferManager_hdr", - ":GrStencilSettings_hdr", - ":GrTextureProxyPriv_hdr", - ":GrTracing_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkMathPriv_hdr", - "//src/core:SkMipmap_hdr", - "//src/sksl:SkSLCompiler_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrHashMapWithCache_hdr", - hdrs = ["GrHashMapWithCache.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/private:SkChecksum_hdr", - "//include/private:SkNoncopyable_hdr", - "//include/private:SkTHash_hdr", - ], -) - -generated_cc_atom( - name = "GrImageContextPriv_hdr", - hdrs = ["GrImageContextPriv.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBaseContextPriv_hdr", - "//include/gpu:GrContextThreadSafeProxy_hdr", - "//include/private:GrImageContext_hdr", - ], -) - -generated_cc_atom( - name = "GrImageContext_src", - srcs = ["GrImageContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - ":GrImageContextPriv_hdr", - ":GrProxyProvider_hdr", - "//include/private:GrImageContext_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - ], -) - -generated_cc_atom( - name = "GrImageInfo_hdr", - hdrs = ["GrImageInfo.h"], - enforce_iwyu = True, - visibility = ["//:__subpackages__"], - deps = [ - ":GrColorInfo_hdr", - "//include/core:SkAlphaType_hdr", - "//include/core:SkRefCnt_hdr", - "//include/core:SkSize_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrImageInfo_src", - srcs = ["GrImageInfo.cpp"], - enforce_iwyu = True, - visibility = ["//:__subpackages__"], - deps = [ - ":GrImageInfo_hdr", - "//include/core:SkColorSpace_hdr", - "//include/core:SkImageInfo_hdr", - ], -) - -generated_cc_atom( - name = "GrManagedResource_hdr", - hdrs = ["GrManagedResource.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":RefCntedCallback_hdr", - "//include/private:SkMutex_hdr", - "//include/private:SkTHash_hdr", - "//include/utils:SkRandom_hdr", - ], -) - -generated_cc_atom( - name = "GrManagedResource_src", - srcs = ["GrManagedResource.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuResourcePriv_hdr", - ":GrManagedResource_hdr", - ":GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrMemoryPool_hdr", - hdrs = ["GrMemoryPool.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/private:SkTHash_hdr", - "//src/core:SkBlockAllocator_hdr", - ], -) - -generated_cc_atom( - name = "GrMemoryPool_src", - srcs = ["GrMemoryPool.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrMemoryPool_hdr", - "//include/private:SkTPin_hdr", - "//src/core:SkASAN_hdr", - ], -) - -generated_cc_atom( - name = "GrMeshDrawTarget_hdr", - hdrs = ["GrMeshDrawTarget.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDrawIndirectCommand_hdr", - ":GrSimpleMesh_hdr", - ], -) - -generated_cc_atom( - name = "GrMeshDrawTarget_src", - srcs = ["GrMeshDrawTarget.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":BufferWriter_hdr", - ":GrMeshDrawTarget_hdr", - ":GrResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrNativeRect_hdr", - hdrs = ["GrNativeRect.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRect_hdr", - "//include/gpu:GrTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrNonAtomicRef_hdr", - hdrs = ["GrNonAtomicRef.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/private:SkNoncopyable_hdr", - "//include/private:SkTArray_hdr", - ], -) - -generated_cc_atom( - name = "GrOnFlushResourceProvider_hdr", - hdrs = ["GrOnFlushResourceProvider.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDeferredUpload_hdr", - "//include/core:SkSpan_hdr", - ], -) - -generated_cc_atom( - name = "GrOnFlushResourceProvider_src", - srcs = ["GrOnFlushResourceProvider.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDirectContextPriv_hdr", - ":GrDrawingManager_hdr", - ":GrOnFlushResourceProvider_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurfaceProxy_hdr", - ":GrTextureResolveRenderTask_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - ], -) - -generated_cc_atom( - name = "GrOpFlushState_hdr", - hdrs = ["GrOpFlushState.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAppliedClip_hdr", - ":GrBufferAllocPool_hdr", - ":GrDeferredUpload_hdr", - ":GrMeshDrawTarget_hdr", - ":GrProgramInfo_hdr", - ":GrRenderTargetProxy_hdr", - ":GrSurfaceProxyView_hdr", - "//src/core:SkArenaAllocList_hdr", - "//src/core:SkArenaAlloc_hdr", - ], -) - -generated_cc_atom( - name = "GrOpFlushState_src", - srcs = ["GrOpFlushState.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDataUtils_hdr", - ":GrDirectContextPriv_hdr", - ":GrDrawOpAtlas_hdr", - ":GrGpu_hdr", - ":GrImageInfo_hdr", - ":GrOpFlushState_hdr", - ":GrProgramInfo_hdr", - ":GrResourceProvider_hdr", - ":GrTexture_hdr", - "//include/core:SkColorSpace_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkConvertPixels_hdr", - ], -) - -generated_cc_atom( - name = "GrOpsRenderPass_hdr", - hdrs = ["GrOpsRenderPass.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDeferredUpload_hdr", - ":GrPipeline_hdr", - "//include/core:SkDrawable_hdr", - ], -) - -generated_cc_atom( - name = "GrOpsRenderPass_src", - srcs = ["GrOpsRenderPass.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrCpuBuffer_hdr", - ":GrDrawIndirectCommand_hdr", - ":GrGeometryProcessor_hdr", - ":GrGpu_hdr", - ":GrOpsRenderPass_hdr", - ":GrProgramInfo_hdr", - ":GrRenderTarget_hdr", - ":GrScissorState_hdr", - ":GrSimpleMesh_hdr", - ":GrTexture_hdr", - "//include/core:SkRect_hdr", - ], -) - -generated_cc_atom( - name = "GrOpsTypes_hdr", - hdrs = ["GrOpsTypes.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurfaceProxyView_hdr", - "//include/core:SkMatrix_hdr", - "//include/core:SkRect_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkColorData_hdr", - ], -) - -generated_cc_atom( - name = "GrPaint_hdr", - hdrs = ["GrPaint.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColor_hdr", - ":GrFragmentProcessor_hdr", - "//include/core:SkBlendMode_hdr", - "//include/core:SkRefCnt_hdr", - "//include/core:SkRegion_hdr", - "//src/core:SkTLazy_hdr", - ], -) - -generated_cc_atom( - name = "GrPaint_src", - srcs = ["GrPaint.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrPaint_hdr", - ":GrXferProcessor_hdr", - "//src/gpu/effects:GrCoverageSetOpXP_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - ], -) - -generated_cc_atom( - name = "GrPersistentCacheUtils_hdr", - hdrs = ["GrPersistentCacheUtils.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkData_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/sksl/ir:SkSLProgram_hdr", - ], -) - -generated_cc_atom( - name = "GrPersistentCacheUtils_src", - srcs = ["GrPersistentCacheUtils.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrPersistentCacheUtils_hdr", - "//include/private:SkSLString_hdr", - "//src/core:SkReadBuffer_hdr", - "//src/core:SkWriteBuffer_hdr", - ], -) - -generated_cc_atom( - name = "GrPipeline_hdr", - hdrs = ["GrPipeline.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColor_hdr", - ":GrDstProxyView_hdr", - ":GrFragmentProcessor_hdr", - ":GrProcessorSet_hdr", - ":GrScissorState_hdr", - ":GrSurfaceProxyView_hdr", - ":GrUserStencilSettings_hdr", - ":GrWindowRectsState_hdr", - "//include/core:SkRefCnt_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - ], -) - -generated_cc_atom( - name = "GrPipeline_src", - srcs = ["GrPipeline.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAppliedClip_hdr", - ":GrCaps_hdr", - ":GrPipeline_hdr", - ":GrXferProcessor_hdr", - ":KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrPixmap_hdr", - hdrs = ["GrPixmap.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrImageInfo_hdr", - "//include/core:SkData_hdr", - "//include/core:SkPixmap_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessorAnalysis_hdr", - hdrs = ["GrProcessorAnalysis.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/private:SkColorData_hdr"], -) - -generated_cc_atom( - name = "GrProcessorAnalysis_src", - srcs = ["GrProcessorAnalysis.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrFragmentProcessor_hdr", - ":GrGeometryProcessor_hdr", - ":GrProcessorAnalysis_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessorSet_hdr", - hdrs = ["GrProcessorSet.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrFragmentProcessor_hdr", - ":GrPaint_hdr", - ":GrProcessorAnalysis_hdr", - ":GrXferProcessor_hdr", - "//include/private:SkTemplates_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessorSet_src", - srcs = ["GrProcessorSet.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAppliedClip_hdr", - ":GrCaps_hdr", - ":GrProcessorSet_hdr", - ":GrUserStencilSettings_hdr", - ":GrXferProcessor_hdr", - "//src/core:SkBlendModePriv_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessorUnitTest_hdr", - hdrs = ["GrProcessorUnitTest.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrTestUtils_hdr", - ":GrTextureProxy_hdr", - "//include/core:SkTypes_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkArenaAlloc_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessorUnitTest_src", - srcs = ["GrProcessorUnitTest.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrFragmentProcessor_hdr", - ":GrProcessorUnitTest_hdr", - ":GrRecordingContextPriv_hdr", - ":GrSurfaceProxyView_hdr", - "//include/gpu:GrRecordingContext_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessor_hdr", - hdrs = ["GrProcessor.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColor_hdr", - ":GrGpuBuffer_hdr", - ":GrProcessorUnitTest_hdr", - ":GrProgramDesc_hdr", - ":GrSamplerState_hdr", - ":GrShaderVar_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrTextureProxy_hdr", - "//include/core:SkMath_hdr", - "//include/core:SkString_hdr", - ], -) - -generated_cc_atom( - name = "GrProcessor_src", - srcs = ["GrProcessor.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGeometryProcessor_hdr", - ":GrMemoryPool_hdr", - ":GrProcessor_hdr", - ":GrSamplerState_hdr", - ":GrTextureProxy_hdr", - ":GrXferProcessor_hdr", - "//include/private:SkSpinlock_hdr", - ], -) - -generated_cc_atom( - name = "GrProgramDesc_hdr", - hdrs = ["GrProgramDesc.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkString_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkTArray_hdr", - "//include/private:SkTo_hdr", - ], -) - -generated_cc_atom( - name = "GrProgramDesc_src", - srcs = ["GrProgramDesc.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrFragmentProcessor_hdr", - ":GrGeometryProcessor_hdr", - ":GrPipeline_hdr", - ":GrProcessor_hdr", - ":GrProgramDesc_hdr", - ":GrProgramInfo_hdr", - ":GrRenderTarget_hdr", - ":GrShaderCaps_hdr", - ":GrTexture_hdr", - ":KeyBuilder_hdr", - "//include/private:SkChecksum_hdr", - "//include/private:SkTo_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrProgramInfo_hdr", - hdrs = ["GrProgramInfo.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGeometryProcessor_hdr", - ":GrPipeline_hdr", - "//include/gpu:GrTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrProgramInfo_src", - srcs = ["GrProgramInfo.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrProgramInfo_hdr", - ":GrStencilSettings_hdr", - ":GrTexture_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - ], -) - -generated_cc_atom( - name = "GrProxyProvider_hdr", - hdrs = ["GrProxyProvider.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrTextureProxy_hdr", - ":ResourceKey_hdr", - "//include/gpu:GrTypes_hdr", - "//src/core:SkTDynamicHash_hdr", - ], -) - -generated_cc_atom( - name = "GrProxyProvider_src", - srcs = ["GrProxyProvider.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - ":GrDirectContextPriv_hdr", - ":GrImageContextPriv_hdr", - ":GrProxyProvider_hdr", - ":GrRenderTarget_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurfaceProxy_hdr", - ":GrTextureProxyCacheAccess_hdr", - ":GrTextureRenderTargetProxy_hdr", - ":GrTexture_hdr", - ":SkGr_hdr", - "//include/core:SkBitmap_hdr", - "//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", - "//src/core:SkAutoPixmapStorage_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkImagePriv_hdr", - "//src/core:SkMipmap_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/image:SkImage_Base_hdr", - ], -) - -generated_cc_atom( - name = "GrRecordingContextPriv_hdr", - hdrs = ["GrRecordingContextPriv.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":BaseDevice_hdr", - ":GrImageContextPriv_hdr", - ":RefCntedCallback_hdr", - "//include/core:SkPaint_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/gpu/text:GrSDFTControl_hdr", - ], -) - -generated_cc_atom( - name = "GrRecordingContextPriv_src", - srcs = ["GrRecordingContextPriv.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDrawingManager_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrRenderTargetProxy_hdr", - ":GrSurfaceProxyView_hdr", - "//include/core:SkColorSpace_hdr", - "//src/gpu/v1:Device_v1_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", - "//src/gpu/v1:SurfaceFillContext_v1_hdr", - ], -) - -generated_cc_atom( - name = "GrRecordingContext_src", - srcs = ["GrRecordingContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAuditTrail_hdr", - ":GrCaps_hdr", - ":GrContextThreadSafeProxyPriv_hdr", - ":GrDrawingManager_hdr", - ":GrMemoryPool_hdr", - ":GrProgramDesc_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":SkGr_hdr", - ":SurfaceContext_hdr", - "//include/gpu:GrContextThreadSafeProxy_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkArenaAlloc_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/ops:AtlasTextOp_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", - "//src/gpu/text:GrTextBlob_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrRectanizerPow2_hdr", - hdrs = ["GrRectanizerPow2.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRectanizer_hdr", - "//include/private:SkMalloc_hdr", - "//src/core:SkIPoint16_hdr", - "//src/core:SkMathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrRectanizerPow2_src", - srcs = ["GrRectanizerPow2.cpp"], - visibility = ["//:__subpackages__"], - deps = [":GrRectanizerPow2_hdr"], -) - -generated_cc_atom( - name = "GrRectanizerSkyline_hdr", - hdrs = ["GrRectanizerSkyline.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRectanizer_hdr", - "//include/private:SkTDArray_hdr", - ], -) - -generated_cc_atom( - name = "GrRectanizerSkyline_src", - srcs = ["GrRectanizerSkyline.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRectanizerSkyline_hdr", - "//src/core:SkIPoint16_hdr", - ], -) - -generated_cc_atom( - name = "GrRectanizer_hdr", - hdrs = ["GrRectanizer.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/gpu:GrTypes_hdr"], -) - -generated_cc_atom( - name = "GrRefCnt_hdr", - hdrs = ["GrRefCnt.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuResource_hdr", - ":GrManagedResource_hdr", - "//include/core:SkRefCnt_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTargetContext_hdr", - hdrs = ["GrRenderTargetContext.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkTypes_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTargetProxy_hdr", - hdrs = ["GrRenderTargetProxy.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrNativeRect_hdr", - ":GrSubRunAllocator_hdr", - ":GrSurfaceProxy_hdr", - ":Swizzle_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkArenaAlloc_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTargetProxy_src", - srcs = ["GrRenderTargetProxy.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpuResourcePriv_hdr", - ":GrRenderTargetProxy_hdr", - ":GrRenderTarget_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurface_hdr", - ":GrTextureRenderTargetProxy_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkMathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTarget_hdr", - hdrs = ["GrRenderTarget.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurface_hdr", - "//include/core:SkRect_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTarget_src", - srcs = ["GrRenderTarget.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAttachment_hdr", - ":GrBackendUtils_hdr", - ":GrGpu_hdr", - ":GrRenderTarget_hdr", - ":GrStencilSettings_hdr", - "//src/core:SkRectPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTaskCluster_hdr", - hdrs = ["GrRenderTaskCluster.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/core:SkSpan_hdr", - "//src/core:SkTInternalLList_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTaskCluster_src", - srcs = ["GrRenderTaskCluster.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRenderTaskCluster_hdr", - ":GrRenderTask_hdr", - "//include/private:SkTHash_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTask_hdr", - hdrs = ["GrRenderTask.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurfaceProxyView_hdr", - ":GrTextureProxy_hdr", - ":GrTextureResolveManager_hdr", - "//include/core:SkRefCnt_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkTInternalLList_hdr", - ], -) - -generated_cc_atom( - name = "GrRenderTask_src", - srcs = ["GrRenderTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAttachment_hdr", - ":GrRenderTarget_hdr", - ":GrRenderTask_hdr", - ":GrTextureProxyPriv_hdr", - ":GrTextureResolveRenderTask_hdr", - ], -) - -generated_cc_atom( - name = "GrResourceAllocator_hdr", - hdrs = ["GrResourceAllocator.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrHashMapWithCache_hdr", - ":GrSurfaceProxy_hdr", - ":GrSurface_hdr", - "//include/private:SkTHash_hdr", - "//src/core:SkArenaAlloc_hdr", - "//src/core:SkTMultiMap_hdr", - ], -) - -generated_cc_atom( - name = "GrResourceAllocator_src", - srcs = ["GrResourceAllocator.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDirectContextPriv_hdr", - ":GrGpuResourcePriv_hdr", - ":GrRenderTargetProxy_hdr", - ":GrResourceAllocator_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurfaceProxy_hdr", - ], -) - -generated_cc_atom( - name = "GrResourceCache_hdr", - hdrs = ["GrResourceCache.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuResourceCacheAccess_hdr", - ":GrGpuResourcePriv_hdr", - ":GrGpuResource_hdr", - ":ResourceKey_hdr", - "//include/core:SkRefCnt_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/private:SkTArray_hdr", - "//include/private:SkTHash_hdr", - "//src/core:SkMessageBus_hdr", - "//src/core:SkTDPQueue_hdr", - "//src/core:SkTInternalLList_hdr", - "//src/core:SkTMultiMap_hdr", - ], -) - -generated_cc_atom( - name = "GrResourceCache_src", - srcs = ["GrResourceCache.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpuResourceCacheAccess_hdr", - ":GrProxyProvider_hdr", - ":GrResourceCache_hdr", - ":GrTextureProxyCacheAccess_hdr", - ":GrTexture_hdr", - ":GrThreadSafeCache_hdr", - ":GrTracing_hdr", - ":SkGr_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/private:SingleOwner_hdr", - "//include/private:SkTo_hdr", - "//include/utils:SkRandom_hdr", - "//src/core:SkMessageBus_hdr", - "//src/core:SkOpts_hdr", - "//src/core:SkScopeExit_hdr", - "//src/core:SkTSort_hdr", - ], -) - -generated_cc_atom( - name = "GrResourceHandle_hdr", - hdrs = ["GrResourceHandle.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/core:SkTypes_hdr"], -) - -generated_cc_atom( - name = "GrResourceProviderPriv_hdr", - hdrs = ["GrResourceProviderPriv.h"], - visibility = ["//:__subpackages__"], - deps = [":GrResourceProvider_hdr"], -) - -generated_cc_atom( - name = "GrResourceProvider_hdr", - hdrs = ["GrResourceProvider.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuBuffer_hdr", - ":GrResourceCache_hdr", - "//include/gpu:GrContextOptions_hdr", - "//include/private:SkImageInfoPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrResourceProvider_src", - srcs = ["GrResourceProvider.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":BufferWriter_hdr", - ":GrAttachment_hdr", - ":GrCaps_hdr", - ":GrDataUtils_hdr", - ":GrGpuBuffer_hdr", - ":GrGpu_hdr", - ":GrImageInfo_hdr", - ":GrProxyProvider_hdr", - ":GrRenderTarget_hdr", - ":GrResourceCache_hdr", - ":GrResourceProvider_hdr", - ":GrSemaphore_hdr", - ":GrTexture_hdr", - ":ResourceKey_hdr", - ":SkGr_hdr", - "//include/core:SkColorSpace_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - "//include/private:SingleOwner_hdr", - "//src/core:SkConvertPixels_hdr", - "//src/core:SkMathPriv_hdr", - "//src/core:SkMipmap_hdr", - ], -) - -generated_cc_atom( - name = "GrRingBuffer_hdr", - hdrs = ["GrRingBuffer.h"], - visibility = ["//:__subpackages__"], - deps = [":GrGpuBuffer_hdr"], -) - -generated_cc_atom( - name = "GrRingBuffer_src", - srcs = ["GrRingBuffer.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDirectContextPriv_hdr", - ":GrGpu_hdr", - ":GrResourceProvider_hdr", - ":GrRingBuffer_hdr", - ], -) - -generated_cc_atom( - name = "GrSPIRVUniformHandler_hdr", - hdrs = ["GrSPIRVUniformHandler.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//src/core:SkTBlockList_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrSPIRVUniformHandler_src", - srcs = ["GrSPIRVUniformHandler.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSPIRVUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrSPIRVVaryingHandler_hdr", - hdrs = ["GrSPIRVVaryingHandler.h"], - visibility = ["//:__subpackages__"], - deps = ["//src/gpu/glsl:GrGLSLVarying_hdr"], -) - -generated_cc_atom( - name = "GrSPIRVVaryingHandler_src", - srcs = ["GrSPIRVVaryingHandler.cpp"], - visibility = ["//:__subpackages__"], - deps = [":GrSPIRVVaryingHandler_hdr"], -) - -generated_cc_atom( - name = "GrSWMaskHelper_hdr", - hdrs = ["GrSWMaskHelper.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurfaceProxyView_hdr", - "//include/core:SkMatrix_hdr", - "//include/core:SkRegion_hdr", - "//include/core:SkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkAutoPixmapStorage_hdr", - "//src/core:SkDraw_hdr", - "//src/core:SkRasterClip_hdr", - ], -) - -generated_cc_atom( - name = "GrSWMaskHelper_src", - srcs = ["GrSWMaskHelper.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrSWMaskHelper_hdr", - ":GrTextureProxy_hdr", - ":SkGr_hdr", - ":SurfaceContext_hdr", - "//include/core:SkBitmap_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkMatrixProvider_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - ], -) - -generated_cc_atom( - name = "GrSamplerState_hdr", - hdrs = ["GrSamplerState.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkSamplingOptions_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkTPin_hdr", - "//include/private:SkTo_hdr", - "//src/core:SkMathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrScissorState_hdr", - hdrs = ["GrScissorState.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/core:SkRect_hdr"], -) - -generated_cc_atom( - name = "GrSemaphore_hdr", - hdrs = ["GrSemaphore.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/gpu:GrBackendSemaphore_hdr"], -) - -generated_cc_atom( - name = "GrShaderCaps_hdr", - hdrs = ["GrShaderCaps.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//src/gpu/glsl:GrGLSL_hdr", - "//src/sksl:SkSLUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrShaderCaps_src", - srcs = ["GrShaderCaps.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrShaderCaps_hdr", - "//include/gpu:GrContextOptions_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrShaderVar_hdr", - hdrs = ["GrShaderVar.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkString_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkSLTypeShared_hdr", - ], -) - -generated_cc_atom( - name = "GrShaderVar_src", - srcs = ["GrShaderVar.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrShaderCaps_hdr", - ":GrShaderVar_hdr", - ], -) - -generated_cc_atom( - name = "GrSimpleMesh_hdr", - hdrs = ["GrSimpleMesh.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBuffer_hdr", - ":GrGpuBuffer_hdr", - ":GrOpsRenderPass_hdr", - ], -) - -generated_cc_atom( - name = "GrStagingBufferManager_hdr", - hdrs = ["GrStagingBufferManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuBuffer_hdr", - "//include/core:SkRefCnt_hdr", - ], -) - -generated_cc_atom( - name = "GrStagingBufferManager_src", - srcs = ["GrStagingBufferManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDirectContextPriv_hdr", - ":GrGpu_hdr", - ":GrResourceProvider_hdr", - ":GrStagingBufferManager_hdr", - "//include/gpu:GrDirectContext_hdr", - ], -) - -generated_cc_atom( - name = "GrStencilSettings_hdr", - hdrs = ["GrStencilSettings.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrUserStencilSettings_hdr", - "//include/core:SkRegion_hdr", - ], -) - -generated_cc_atom( - name = "GrStencilSettings_src", - srcs = ["GrStencilSettings.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrProcessor_hdr", - ":GrStencilSettings_hdr", - ":KeyBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrStyle_hdr", - hdrs = ["GrStyle.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkMatrix_hdr", - "//include/core:SkStrokeRec_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkTemplates_hdr", - "//src/core:SkPathEffectBase_hdr", - ], -) - -generated_cc_atom( - name = "GrStyle_src", - srcs = ["GrStyle.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrStyle_hdr", - "//src/utils:SkDashPathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrSubRunAllocator_hdr", - hdrs = ["GrSubRunAllocator.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkMath_hdr", - "//include/core:SkSpan_hdr", - "//src/core:SkArenaAlloc_hdr", - ], -) - -generated_cc_atom( - name = "GrSubRunAllocator_src", - srcs = ["GrSubRunAllocator.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSubRunAllocator_hdr", - "//include/core:SkMath_hdr", - ], -) - -generated_cc_atom( - name = "GrSurfaceInfo_src", - srcs = ["GrSurfaceInfo.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrSurfaceInfo_hdr", - "//include/gpu/d3d:GrD3DTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrSurfaceProxyPriv_hdr", - hdrs = ["GrSurfaceProxyPriv.h"], - visibility = ["//:__subpackages__"], - deps = [":GrSurfaceProxy_hdr"], -) - -generated_cc_atom( - name = "GrSurfaceProxyView_hdr", - hdrs = ["GrSurfaceProxyView.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRenderTargetProxy_hdr", - ":GrSurfaceProxy_hdr", - ":GrTextureProxy_hdr", - ":Swizzle_hdr", - "//include/core:SkRefCnt_hdr", - "//include/gpu:GrTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrSurfaceProxy_hdr", - hdrs = ["GrSurfaceProxy.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuResource_hdr", - ":GrSurface_hdr", - ":GrTexture_hdr", - "//include/core:SkRect_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/private:SkNoncopyable_hdr", - ], -) - -generated_cc_atom( - name = "GrSurfaceProxy_src", - srcs = ["GrSurfaceProxy.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAttachment_hdr", - ":GrCaps_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpuResourcePriv_hdr", - ":GrImageInfo_hdr", - ":GrRecordingContextPriv_hdr", - ":GrRenderTarget_hdr", - ":GrResourceProvider_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurfaceProxy_hdr", - ":GrSurface_hdr", - ":GrTextureRenderTargetProxy_hdr", - ":GrTexture_hdr", - ":SurfaceFillContext_hdr", - "//include/core:SkColorSpace_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkMathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrSurface_hdr", - hdrs = ["GrSurface.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuResource_hdr", - ":RefCntedCallback_hdr", - "//include/core:SkImageInfo_hdr", - "//include/core:SkRect_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrSurface_src", - srcs = ["GrSurface.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrBackendUtils_hdr", - ":GrRenderTarget_hdr", - ":GrResourceProvider_hdr", - ":GrSurface_hdr", - ":GrTexture_hdr", - ":SkGr_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkMathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrTTopoSort_hdr", - hdrs = ["GrTTopoSort.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/private:SkTArray_hdr", - ], -) - -generated_cc_atom( - name = "GrTestUtils_hdr", - hdrs = ["GrTestUtils.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColor_hdr", - ":GrFPArgs_hdr", - ":GrSamplerState_hdr", - "//include/core:SkStrokeRec_hdr", - "//include/core:SkTypes_hdr", - "//include/private:SkMacros_hdr", - "//include/private:SkTemplates_hdr", - "//include/utils:SkRandom_hdr", - "//src/core:SkMatrixProvider_hdr", - "//src/core:SkPathEffectBase_hdr", - "//src/shaders:SkShaderBase_hdr", - ], -) - -generated_cc_atom( - name = "GrTestUtils_src", - srcs = ["GrTestUtils.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColorInfo_hdr", - ":GrProcessorUnitTest_hdr", - ":GrStyle_hdr", - ":GrTestUtils_hdr", - "//include/core:SkColorSpace_hdr", - "//include/core:SkMatrix_hdr", - "//include/core:SkPathBuilder_hdr", - "//include/core:SkRRect_hdr", - "//src/core:SkRectPriv_hdr", - "//src/utils:SkDashPathPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrTextureProxyCacheAccess_hdr", - hdrs = ["GrTextureProxyCacheAccess.h"], - visibility = ["//:__subpackages__"], - deps = [":GrTextureProxy_hdr"], -) - -generated_cc_atom( - name = "GrTextureProxyPriv_hdr", - hdrs = ["GrTextureProxyPriv.h"], - visibility = ["//:__subpackages__"], - deps = [":GrTextureProxy_hdr"], -) - -generated_cc_atom( - name = "GrTextureProxy_hdr", - hdrs = ["GrTextureProxy.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSamplerState_hdr", - ":GrSurfaceProxy_hdr", - "//include/gpu:GrBackendSurface_hdr", - ], -) - -generated_cc_atom( - name = "GrTextureProxy_src", - srcs = ["GrTextureProxy.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDeferredProxyUploader_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpuResourcePriv_hdr", - ":GrProxyProvider_hdr", - ":GrSurface_hdr", - ":GrTextureProxyPriv_hdr", - ":GrTextureProxy_hdr", - ":GrTexture_hdr", - "//include/gpu:GrDirectContext_hdr", - ], -) - -generated_cc_atom( - name = "GrTextureRenderTargetProxy_hdr", - hdrs = ["GrTextureRenderTargetProxy.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRenderTargetProxy_hdr", - ":GrTextureProxy_hdr", - ], -) - -generated_cc_atom( - name = "GrTextureRenderTargetProxy_src", - srcs = ["GrTextureRenderTargetProxy.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDirectContextPriv_hdr", - ":GrRenderTarget_hdr", - ":GrSurfaceProxyPriv_hdr", - ":GrSurface_hdr", - ":GrTextureProxyPriv_hdr", - ":GrTextureRenderTargetProxy_hdr", - ":GrTexture_hdr", - "//include/gpu:GrDirectContext_hdr", - ], -) - -generated_cc_atom( - name = "GrTextureResolveManager_hdr", - hdrs = ["GrTextureResolveManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDrawingManager_hdr", - "//include/core:SkRefCnt_hdr", - ], -) - -generated_cc_atom( - name = "GrTextureResolveRenderTask_hdr", - hdrs = ["GrTextureResolveRenderTask.h"], - visibility = ["//:__subpackages__"], - deps = [":GrRenderTask_hdr"], -) - -generated_cc_atom( - name = "GrTextureResolveRenderTask_src", - srcs = ["GrTextureResolveRenderTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpu_hdr", - ":GrMemoryPool_hdr", - ":GrOpFlushState_hdr", - ":GrRenderTarget_hdr", - ":GrResourceAllocator_hdr", - ":GrTextureResolveRenderTask_hdr", - ":GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrTexture_hdr", - hdrs = ["GrTexture.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurface_hdr", - "//include/core:SkImage_hdr", - "//include/core:SkPoint_hdr", - "//include/core:SkRefCnt_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/private:GrTypesPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrTexture_src", - srcs = ["GrTexture.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrDirectContextPriv_hdr", - ":GrGpu_hdr", - ":GrRenderTarget_hdr", - ":GrResourceCache_hdr", - ":GrTexture_hdr", - "//include/core:SkMath_hdr", - "//include/core:SkTypes_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrTypes_hdr", - "//src/core:SkMipmap_hdr", - ], -) - -generated_cc_atom( - name = "GrThreadSafeCache_hdr", - hdrs = ["GrThreadSafeCache.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpuBuffer_hdr", - ":GrSurfaceProxyView_hdr", - "//include/core:SkRefCnt_hdr", - "//include/private:SkSpinlock_hdr", - "//src/core:SkArenaAlloc_hdr", - "//src/core:SkTDynamicHash_hdr", - "//src/core:SkTInternalLList_hdr", - ], -) - -generated_cc_atom( - name = "GrThreadSafeCache_src", - srcs = ["GrThreadSafeCache.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrDirectContextPriv_hdr", - ":GrGpuBuffer_hdr", - ":GrProxyProvider_hdr", - ":GrResourceCache_hdr", - ":GrThreadSafeCache_hdr", - "//include/gpu:GrDirectContext_hdr", - ], -) - -generated_cc_atom( - name = "GrThreadSafePipelineBuilder_hdr", - hdrs = ["GrThreadSafePipelineBuilder.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/gpu:GrConfig_hdr", - "//include/private:SkTArray_hdr", - ], -) - -generated_cc_atom( - name = "GrThreadSafePipelineBuilder_src", - srcs = ["GrThreadSafePipelineBuilder.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrThreadSafePipelineBuilder_hdr", - "//include/core:SkString_hdr", - ], -) - -generated_cc_atom( - name = "GrTracing_hdr", - hdrs = ["GrTracing.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrAuditTrail_hdr", - "//src/core:SkTraceEvent_hdr", - ], -) - -generated_cc_atom( - name = "GrTransferFromRenderTask_hdr", - hdrs = ["GrTransferFromRenderTask.h"], - visibility = ["//:__subpackages__"], - deps = [":GrRenderTask_hdr"], -) - -generated_cc_atom( - name = "GrTransferFromRenderTask_src", - srcs = ["GrTransferFromRenderTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpu_hdr", - ":GrOpFlushState_hdr", - ":GrResourceAllocator_hdr", - ":GrResourceProvider_hdr", - ":GrTransferFromRenderTask_hdr", - ], -) - -generated_cc_atom( - name = "GrUniformDataManager_hdr", - hdrs = ["GrUniformDataManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/private:GrTypesPriv_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkAutoMalloc_hdr", - "//src/core:SkSLTypeShared_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - ], -) - -generated_cc_atom( - name = "GrUniformDataManager_src", - srcs = ["GrUniformDataManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrShaderVar_hdr", - ":GrUniformDataManager_hdr", - "//include/private:SkHalf_hdr", - ], -) - -generated_cc_atom( - name = "GrUserStencilSettings_hdr", - hdrs = ["GrUserStencilSettings.h"], - visibility = ["//:__subpackages__"], - deps = ["//include/gpu:GrTypes_hdr"], -) - -generated_cc_atom( - name = "GrUtil_hdr", - hdrs = ["GrUtil.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkScalar_hdr", - "//include/core:SkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/core:SkSLTypeShared_hdr", - ], -) - -generated_cc_atom( - name = "GrUtil_src", - srcs = ["GrUtil.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrStyle_hdr", - ":GrUtil_hdr", - "//src/core:SkDrawProcs_hdr", - ], -) - -generated_cc_atom( - name = "GrVertexChunkArray_hdr", - hdrs = ["GrVertexChunkArray.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":BufferWriter_hdr", - ":GrBuffer_hdr", - "//include/core:SkRefCnt_hdr", - "//include/private:SkNoncopyable_hdr", - "//include/private:SkTArray_hdr", - ], -) - -generated_cc_atom( - name = "GrVertexChunkArray_src", - srcs = ["GrVertexChunkArray.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrMeshDrawTarget_hdr", - ":GrVertexChunkArray_hdr", - ], -) - -generated_cc_atom( - name = "GrVx_hdr", - hdrs = ["GrVx.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkTypes_hdr", - "//include/private:SkVx_hdr", - ], -) - -generated_cc_atom( - name = "GrWaitRenderTask_hdr", - hdrs = ["GrWaitRenderTask.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrRenderTask_hdr", - ":GrSemaphore_hdr", - ], -) - -generated_cc_atom( - name = "GrWaitRenderTask_src", - srcs = ["GrWaitRenderTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpu_hdr", - ":GrOpFlushState_hdr", - ":GrResourceAllocator_hdr", - ":GrWaitRenderTask_hdr", - ], -) - -generated_cc_atom( - name = "GrWindowRectangles_hdr", - hdrs = ["GrWindowRectangles.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrNonAtomicRef_hdr", - "//include/core:SkRect_hdr", - ], -) - -generated_cc_atom( - name = "GrWindowRectsState_hdr", - hdrs = ["GrWindowRectsState.h"], - visibility = ["//:__subpackages__"], - deps = [":GrWindowRectangles_hdr"], -) - -generated_cc_atom( - name = "GrWritePixelsRenderTask_hdr", - hdrs = ["GrWritePixelsRenderTask.h"], - visibility = ["//:__subpackages__"], - deps = [":GrRenderTask_hdr"], -) - -generated_cc_atom( - name = "GrWritePixelsRenderTask_src", - srcs = ["GrWritePixelsRenderTask.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGpu_hdr", - ":GrOpFlushState_hdr", - ":GrResourceAllocator_hdr", - ":GrWritePixelsRenderTask_hdr", - ], -) - -generated_cc_atom( - name = "GrXferProcessor_hdr", - hdrs = ["GrXferProcessor.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":Blend_hdr", - ":GrNonAtomicRef_hdr", - ":GrProcessorAnalysis_hdr", - ":GrProcessor_hdr", - ":GrSurfaceProxyView_hdr", - "//include/gpu:GrTypes_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrXferProcessor_src", - srcs = ["GrXferProcessor.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrPipeline_hdr", - ":GrXferProcessor_hdr", - ":KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - ], -) - -generated_cc_atom( - name = "GrYUVABackendTextures_src", - srcs = ["GrYUVABackendTextures.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrYUVABackendTextures_hdr", - "//src/core:SkYUVAInfoLocation_hdr", - ], -) - -generated_cc_atom( - name = "GrYUVATextureProxies_hdr", - hdrs = ["GrYUVATextureProxies.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrSurfaceProxyView_hdr", - ":GrSurfaceProxy_hdr", - "//include/core:SkYUVAInfo_hdr", - "//src/core:SkYUVAInfoLocation_hdr", - ], -) - -generated_cc_atom( - name = "GrYUVATextureProxies_src", - srcs = ["GrYUVATextureProxies.cpp"], - visibility = ["//:__subpackages__"], - deps = [":GrYUVATextureProxies_hdr"], -) - -generated_cc_atom( - name = "SkGr_hdr", - hdrs = ["SkGr.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":Blend_hdr", - ":GrCaps_hdr", - ":GrColor_hdr", - ":GrSamplerState_hdr", - "//include/core:SkBlender_hdr", - "//include/core:SkCanvas_hdr", - "//include/core:SkColor_hdr", - "//include/core:SkImageInfo_hdr", - "//include/core:SkSamplingOptions_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkColorData_hdr", - "//src/core:SkBlendModePriv_hdr", - ], -) - -generated_cc_atom( - name = "SkGr_src", - srcs = ["SkGr.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrCaps_hdr", - ":GrColorInfo_hdr", - ":GrColorSpaceXform_hdr", - ":GrGpuResourcePriv_hdr", - ":GrPaint_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrTextureProxy_hdr", - ":GrXferProcessor_hdr", - ":SkGr_hdr", - "//include/core:SkCanvas_hdr", - "//include/core:SkColorFilter_hdr", - "//include/core:SkData_hdr", - "//include/core:SkPixelRef_hdr", - "//include/effects:SkRuntimeEffect_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//include/private:SkIDChangeListener_hdr", - "//include/private:SkImageInfoPriv_hdr", - "//include/private:SkTPin_hdr", - "//include/private:SkTemplates_hdr", - "//src/core:SkAutoMalloc_hdr", - "//src/core:SkBlendModePriv_hdr", - "//src/core:SkBlenderBase_hdr", - "//src/core:SkColorFilterBase_hdr", - "//src/core:SkColorSpacePriv_hdr", - "//src/core:SkImagePriv_hdr", - "//src/core:SkMaskFilterBase_hdr", - "//src/core:SkMessageBus_hdr", - "//src/core:SkMipmap_hdr", - "//src/core:SkPaintPriv_hdr", - "//src/core:SkResourceCache_hdr", - "//src/core:SkRuntimeEffectPriv_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/image:SkImage_Base_hdr", - "//src/shaders:SkShaderBase_hdr", - ], -) - -generated_cc_atom( - name = "SurfaceContext_hdr", - hdrs = ["SurfaceContext.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrColorInfo_hdr", - ":GrDataUtils_hdr", - ":GrImageInfo_hdr", - ":GrPixmap_hdr", - ":GrRenderTask_hdr", - ":GrSurfaceProxyView_hdr", - ":GrSurfaceProxy_hdr", - "//include/core:SkImage_hdr", - "//include/core:SkRect_hdr", - "//include/core:SkRefCnt_hdr", - "//include/core:SkSamplingOptions_hdr", - "//include/core:SkSurface_hdr", - ], -) - -generated_cc_atom( - name = "SurfaceContext_src", - srcs = ["SurfaceContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrClientMappedBufferManager_hdr", - ":GrColorSpaceXform_hdr", - ":GrDataUtils_hdr", - ":GrDirectContextPriv_hdr", - ":GrDrawingManager_hdr", - ":GrGpu_hdr", - ":GrImageInfo_hdr", - ":GrProxyProvider_hdr", - ":GrRecordingContextPriv_hdr", - ":GrResourceProvider_hdr", - ":GrTracing_hdr", - ":SkGr_hdr", - ":SurfaceContext_hdr", - ":SurfaceFillContext_hdr", - "//include/core:SkColorSpace_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//src/core:SkAutoPixmapStorage_hdr", - "//src/core:SkMipmap_hdr", - "//src/core:SkYUVMath_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - ], -) - -generated_cc_atom( - name = "SurfaceFillContext_hdr", - hdrs = ["SurfaceFillContext.h"], - visibility = ["//:__subpackages__"], - deps = [":SurfaceContext_hdr"], -) - -generated_cc_atom( - name = "SurfaceFillContext_src", - srcs = ["SurfaceFillContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":SurfaceFillContext_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", - ], + deps = ["//src/gpu/ganesh:GrAHardwareBufferUtils_impl_hdr"], ) generated_cc_atom( @@ -3546,6 +53,16 @@ generated_cc_atom( ], ) +generated_cc_atom( + name = "RefCntedCallback_hdr", + hdrs = ["RefCntedCallback.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/gpu:GpuTypes_hdr", + ], +) + generated_cc_atom( name = "ResourceKey_hdr", hdrs = ["ResourceKey.h"], @@ -3600,18 +117,8 @@ generated_cc_atom( ) generated_cc_atom( - name = "Blend_hdr", - hdrs = ["Blend.h"], + name = "GrRectanizer_hdr", + hdrs = ["GrRectanizer.h"], visibility = ["//:__subpackages__"], - deps = ["//include/core:SkTypes_hdr"], -) - -generated_cc_atom( - name = "RefCntedCallback_hdr", - hdrs = ["RefCntedCallback.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/gpu:GpuTypes_hdr", - ], + deps = ["//src/gpu/ganesh:GrRectanizer_impl_hdr"], ) diff --git a/src/gpu/GrAHardwareBufferUtils.h b/src/gpu/GrAHardwareBufferUtils.h index 7f2a6527e7..740a95258f 100644 --- a/src/gpu/GrAHardwareBufferUtils.h +++ b/src/gpu/GrAHardwareBufferUtils.h @@ -4,67 +4,8 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#ifndef GrAHardwareBufferUtils_DEFINED -#define GrAHardwareBufferUtils_DEFINED -#include "include/core/SkTypes.h" +// TODO: Once we can get Android to use the ganesh version of the file we can remove this one. At +// that time we should also rename the ganesh file to drop the _impl. +#include "src/gpu/ganesh/GrAHardwareBufferUtils_impl.h" -#if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 - -#include "include/gpu/GrBackendSurface.h" -#include "include/gpu/GrTypes.h" - -class GrDirectContext; - -extern "C" { - typedef struct AHardwareBuffer AHardwareBuffer; -} - -namespace GrAHardwareBufferUtils { - -SkColorType GetSkColorTypeFromBufferFormat(uint32_t bufferFormat); - -GrBackendFormat GetBackendFormat(GrDirectContext* context, AHardwareBuffer* hardwareBuffer, - uint32_t bufferFormat, bool requireKnownFormat); - -typedef void* TexImageCtx; -typedef void (*DeleteImageProc)(TexImageCtx); -typedef void (*UpdateImageProc)(TexImageCtx, GrDirectContext*); - -/** - * Create a GrBackendTexture from AHardwareBuffer - * - * @param context GPU context - * @param hardwareBuffer AHB - * @param width texture width - * @param height texture height - * @param deleteProc returns a function that deletes the texture and - * other GPU resources. Must be invoked on the same - * thread as MakeBackendTexture - * @param updateProc returns a function, that needs to be invoked, when - * AHB buffer content has changed. Must be invoked on - * the same thread as MakeBackendTexture - * @param imageCtx returns an opaque image context, that is passed as - * first argument to deleteProc and updateProc - * @param isProtectedContent if true, GL backend uses EXT_protected_content - * @param backendFormat backend format, usually created with helper - * function GetBackendFormat - * @param isRenderable true if GrBackendTexture can be used as a color - * attachment - * @return valid GrBackendTexture object on success - */ -GrBackendTexture MakeBackendTexture(GrDirectContext* context, AHardwareBuffer* hardwareBuffer, - int width, int height, - DeleteImageProc* deleteProc, - UpdateImageProc* updateProc, - TexImageCtx* imageCtx, - bool isProtectedContent, - const GrBackendFormat& backendFormat, - bool isRenderable, - bool fromAndroidWindow = false); - -} // GrAHardwareBufferUtils - - -#endif -#endif diff --git a/src/gpu/GrRectanizer.h b/src/gpu/GrRectanizer.h index 0b1fff5334..e00064d226 100644 --- a/src/gpu/GrRectanizer.h +++ b/src/gpu/GrRectanizer.h @@ -5,40 +5,7 @@ * found in the LICENSE file. */ -#ifndef GrRectanizer_DEFINED -#define GrRectanizer_DEFINED +// TODO: Once we can get Flutter to use the ganesh version of the file we can remove this one. At +// that time we should also rename the ganesh file to drop the _impl. +#include "src/gpu/ganesh/GrRectanizer_impl.h" -#include "include/gpu/GrTypes.h" - -struct SkIPoint16; - -class GrRectanizer { -public: - GrRectanizer(int width, int height) : fWidth(width), fHeight(height) { - SkASSERT(width >= 0); - SkASSERT(height >= 0); - } - - virtual ~GrRectanizer() {} - - virtual void reset() = 0; - - int width() const { return fWidth; } - int height() const { return fHeight; } - - // Attempt to add a rect. Return true on success; false on failure. If - // successful the position in the atlas is returned in 'loc'. - virtual bool addRect(int width, int height, SkIPoint16* loc) = 0; - virtual float percentFull() const = 0; - - /** - * Our factory, which returns the subclass du jour - */ - static GrRectanizer* Factory(int width, int height); - -private: - const int fWidth; - const int fHeight; -}; - -#endif diff --git a/src/gpu/ganesh/BUILD.bazel b/src/gpu/ganesh/BUILD.bazel new file mode 100644 index 0000000000..e7d42ac658 --- /dev/null +++ b/src/gpu/ganesh/BUILD.bazel @@ -0,0 +1,3517 @@ +# https://github.com/bazelbuild/bazel-skylib +load("@bazel_skylib//lib:selects.bzl", "selects") +load("//bazel:macros.bzl", "generated_cc_atom") + +cc_library( + name = "core_srcs", + deps = [ + ":BaseDevice_src", + ":GrAHardwareBufferImageGenerator_src", + ":GrAHardwareBufferUtils_src", + ":GrAttachment_src", + ":GrAuditTrail_src", + ":GrBackendSemaphore_src", + ":GrBackendSurfaceMutableState_src", + ":GrBackendSurface_src", + ":GrBackendTextureImageGenerator_src", + ":GrBackendUtils_src", + ":GrBlurUtils_src", + ":GrBufferAllocPool_src", + ":GrCaps_src", + ":GrClientMappedBufferManager_src", + ":GrColorInfo_src", + ":GrColorSpaceXform_src", + ":GrContextThreadSafeProxy_src", + ":GrContext_Base_src", + ":GrCopyRenderTask_src", + ":GrDDLContext_src", + ":GrDDLTask_src", + ":GrDataUtils_src", + ":GrDefaultGeoProcFactory_src", + ":GrDirectContextPriv_src", + ":GrDirectContext_src", + ":GrDistanceFieldGenFromVector_src", + ":GrDrawOpAtlas_src", + ":GrDrawOpTest_src", + ":GrDrawingManager_src", + ":GrDriverBugWorkarounds_src", + ":GrDynamicAtlas_src", + ":GrEagerVertexAllocator_src", + ":GrFinishCallbacks_src", + ":GrFixedClip_src", + ":GrFragmentProcessor_src", + ":GrGeometryProcessor_src", + ":GrGpuBuffer_src", + ":GrGpuResource_src", + ":GrGpu_src", + ":GrImageContext_src", + ":GrImageInfo_src", + ":GrManagedResource_src", + ":GrMemoryPool_src", + ":GrMeshDrawTarget_src", + ":GrOnFlushResourceProvider_src", + ":GrOpFlushState_src", + ":GrOpsRenderPass_src", + ":GrPaint_src", + ":GrPersistentCacheUtils_src", + ":GrPipeline_src", + ":GrProcessorAnalysis_src", + ":GrProcessorSet_src", + ":GrProcessorUnitTest_src", + ":GrProcessor_src", + ":GrProgramDesc_src", + ":GrProgramInfo_src", + ":GrProxyProvider_src", + ":GrRecordingContextPriv_src", + ":GrRecordingContext_src", + ":GrRectanizerPow2_src", + ":GrRectanizerSkyline_src", + ":GrRenderTargetProxy_src", + ":GrRenderTarget_src", + ":GrRenderTaskCluster_src", + ":GrRenderTask_src", + ":GrResourceAllocator_src", + ":GrResourceCache_src", + ":GrResourceProvider_src", + ":GrRingBuffer_src", + ":GrSPIRVUniformHandler_src", + ":GrSPIRVVaryingHandler_src", + ":GrSWMaskHelper_src", + ":GrShaderCaps_src", + ":GrShaderVar_src", + ":GrStagingBufferManager_src", + ":GrStencilSettings_src", + ":GrStyle_src", + ":GrSubRunAllocator_src", + ":GrSurfaceInfo_src", + ":GrSurfaceProxy_src", + ":GrSurface_src", + ":GrTestUtils_src", + ":GrTextureProxy_src", + ":GrTextureRenderTargetProxy_src", + ":GrTextureResolveRenderTask_src", + ":GrTexture_src", + ":GrThreadSafeCache_src", + ":GrThreadSafePipelineBuilder_src", + ":GrTransferFromRenderTask_src", + ":GrUniformDataManager_src", + ":GrUtil_src", + ":GrVertexChunkArray_src", + ":GrWaitRenderTask_src", + ":GrWritePixelsRenderTask_src", + ":GrXferProcessor_src", + ":GrYUVABackendTextures_src", + ":GrYUVATextureProxies_src", + ":SkGr_src", + ":SurfaceContext_src", + ":SurfaceFillContext_src", + "//src/gpu/ganesh/effects:GrBezierEffect_src", + "//src/gpu/ganesh/effects:GrBicubicEffect_src", + "//src/gpu/ganesh/effects:GrBitmapTextGeoProc_src", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_src", + "//src/gpu/ganesh/effects:GrConvexPolyEffect_src", + "//src/gpu/ganesh/effects:GrCoverageSetOpXP_src", + "//src/gpu/ganesh/effects:GrCustomXfermode_src", + "//src/gpu/ganesh/effects:GrDisableColorXP_src", + "//src/gpu/ganesh/effects:GrDistanceFieldGeoProc_src", + "//src/gpu/ganesh/effects:GrGaussianConvolutionFragmentProcessor_src", + "//src/gpu/ganesh/effects:GrMatrixConvolutionEffect_src", + "//src/gpu/ganesh/effects:GrMatrixEffect_src", + "//src/gpu/ganesh/effects:GrModulateAtlasCoverageEffect_src", + "//src/gpu/ganesh/effects:GrOvalEffect_src", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_src", + "//src/gpu/ganesh/effects:GrRRectEffect_src", + "//src/gpu/ganesh/effects:GrShadowGeoProc_src", + "//src/gpu/ganesh/effects:GrSkSLFP_src", + "//src/gpu/ganesh/effects:GrTextureEffect_src", + "//src/gpu/ganesh/effects:GrYUVtoRGBEffect_src", + "//src/gpu/ganesh/geometry:GrAAConvexTessellator_src", + "//src/gpu/ganesh/geometry:GrAATriangulator_src", + "//src/gpu/ganesh/geometry:GrPathUtils_src", + "//src/gpu/ganesh/geometry:GrQuadUtils_src", + "//src/gpu/ganesh/geometry:GrQuad_src", + "//src/gpu/ganesh/geometry:GrShape_src", + "//src/gpu/ganesh/geometry:GrStyledShape_src", + "//src/gpu/ganesh/geometry:GrTriangulator_src", + "//src/gpu/ganesh/glsl:GrGLSLBlend_src", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_src", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_src", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_src", + "//src/gpu/ganesh/glsl:GrGLSLShaderBuilder_src", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_src", + "//src/gpu/ganesh/glsl:GrGLSLVarying_src", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_src", + "//src/gpu/ganesh/glsl:GrGLSL_src", + "//src/gpu/ganesh/gradients:GrGradientBitmapCache_src", + "//src/gpu/ganesh/gradients:GrGradientShader_src", + "//src/gpu/ganesh/ops:AAConvexPathRenderer_src", + "//src/gpu/ganesh/ops:AAHairLinePathRenderer_src", + "//src/gpu/ganesh/ops:AALinearizingConvexPathRenderer_src", + "//src/gpu/ganesh/ops:AtlasInstancedHelper_src", + "//src/gpu/ganesh/ops:AtlasPathRenderer_src", + "//src/gpu/ganesh/ops:AtlasRenderTask_src", + "//src/gpu/ganesh/ops:AtlasTextOp_src", + "//src/gpu/ganesh/ops:ClearOp_src", + "//src/gpu/ganesh/ops:DashLinePathRenderer_src", + "//src/gpu/ganesh/ops:DashOp_src", + "//src/gpu/ganesh/ops:DefaultPathRenderer_src", + "//src/gpu/ganesh/ops:DrawAtlasOp_src", + "//src/gpu/ganesh/ops:DrawAtlasPathOp_src", + "//src/gpu/ganesh/ops:DrawCustomMeshOp_src", + "//src/gpu/ganesh/ops:DrawableOp_src", + "//src/gpu/ganesh/ops:FillRRectOp_src", + "//src/gpu/ganesh/ops:FillRectOp_src", + "//src/gpu/ganesh/ops:GrMeshDrawOp_src", + "//src/gpu/ganesh/ops:GrOp_src", + "//src/gpu/ganesh/ops:GrOvalOpFactory_src", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelperWithStencil_src", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelper_src", + "//src/gpu/ganesh/ops:LatticeOp_src", + "//src/gpu/ganesh/ops:OpsTask_src", + "//src/gpu/ganesh/ops:PathInnerTriangulateOp_src", + "//src/gpu/ganesh/ops:PathStencilCoverOp_src", + "//src/gpu/ganesh/ops:PathTessellateOp_src", + "//src/gpu/ganesh/ops:PathTessellator_src", + "//src/gpu/ganesh/ops:QuadPerEdgeAA_src", + "//src/gpu/ganesh/ops:RegionOp_src", + "//src/gpu/ganesh/ops:ShadowRRectOp_src", + "//src/gpu/ganesh/ops:SmallPathAtlasMgr_src", + "//src/gpu/ganesh/ops:SmallPathRenderer_src", + "//src/gpu/ganesh/ops:SmallPathShapeData_src", + "//src/gpu/ganesh/ops:SoftwarePathRenderer_src", + "//src/gpu/ganesh/ops:StrokeRectOp_src", + "//src/gpu/ganesh/ops:StrokeTessellateOp_src", + "//src/gpu/ganesh/ops:StrokeTessellator_src", + "//src/gpu/ganesh/ops:TessellationPathRenderer_src", + "//src/gpu/ganesh/ops:TextureOp_src", + "//src/gpu/ganesh/ops:TriangulatingPathRenderer_src", + "//src/gpu/ganesh/tessellate/shaders:GrPathTessellationShader_Hardware_src", + "//src/gpu/ganesh/tessellate/shaders:GrPathTessellationShader_MiddleOut_src", + "//src/gpu/ganesh/tessellate/shaders:GrPathTessellationShader_src", + "//src/gpu/ganesh/tessellate/shaders:GrStrokeTessellationShader_HardwareImpl_src", + "//src/gpu/ganesh/tessellate/shaders:GrStrokeTessellationShader_InstancedImpl_src", + "//src/gpu/ganesh/tessellate/shaders:GrStrokeTessellationShader_src", + "//src/gpu/ganesh/tessellate/shaders:GrTessellationShader_src", + "//src/gpu/ganesh/text:GrAtlasManager_src", + "//src/gpu/ganesh/text:GrDistanceFieldAdjustTable_src", + "//src/gpu/ganesh/text:GrGlyphVector_src", + "//src/gpu/ganesh/text:GrSDFMaskFilter_src", + "//src/gpu/ganesh/text:GrSDFTControl_src", + "//src/gpu/ganesh/text:GrSlug_src", + "//src/gpu/ganesh/text:GrStrikeCache_src", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_src", + "//src/gpu/ganesh/text:GrTextBlob_src", + ], +) + +cc_library( + name = "dawn_srcs", + deps = [ + "//src/gpu/ganesh/dawn:GrDawnAttachment_src", + "//src/gpu/ganesh/dawn:GrDawnBuffer_src", + "//src/gpu/ganesh/dawn:GrDawnCaps_src", + "//src/gpu/ganesh/dawn:GrDawnGpu_src", + "//src/gpu/ganesh/dawn:GrDawnOpsRenderPass_src", + "//src/gpu/ganesh/dawn:GrDawnProgramBuilder_src", + "//src/gpu/ganesh/dawn:GrDawnProgramDataManager_src", + "//src/gpu/ganesh/dawn:GrDawnRenderTarget_src", + "//src/gpu/ganesh/dawn:GrDawnRingBuffer_src", + "//src/gpu/ganesh/dawn:GrDawnTextureRenderTarget_src", + "//src/gpu/ganesh/dawn:GrDawnTexture_src", + "//src/gpu/ganesh/dawn:GrDawnTypesPriv_src", + "//src/gpu/ganesh/dawn:GrDawnUtil_src", + ], +) + +cc_library( + name = "gl_srcs", + deps = [ + "//src/gpu/ganesh/gl:GrGLAssembleGLESInterfaceAutogen_src", + "//src/gpu/ganesh/gl:GrGLAssembleGLInterfaceAutogen_src", + "//src/gpu/ganesh/gl:GrGLAssembleHelpers_src", + "//src/gpu/ganesh/gl:GrGLAssembleInterface_src", + "//src/gpu/ganesh/gl:GrGLAssembleWebGLInterfaceAutogen_src", + "//src/gpu/ganesh/gl:GrGLAttachment_src", + "//src/gpu/ganesh/gl:GrGLBuffer_src", + "//src/gpu/ganesh/gl:GrGLCaps_src", + "//src/gpu/ganesh/gl:GrGLContext_src", + "//src/gpu/ganesh/gl:GrGLExtensions_src", + "//src/gpu/ganesh/gl:GrGLGLSL_src", + "//src/gpu/ganesh/gl:GrGLGpuProgramCache_src", + "//src/gpu/ganesh/gl:GrGLGpu_src", + "//src/gpu/ganesh/gl:GrGLInterfaceAutogen_src", + "//src/gpu/ganesh/gl:GrGLOpsRenderPass_src", + "//src/gpu/ganesh/gl:GrGLProgramDataManager_src", + "//src/gpu/ganesh/gl:GrGLProgram_src", + "//src/gpu/ganesh/gl:GrGLRenderTarget_src", + "//src/gpu/ganesh/gl:GrGLSemaphore_src", + "//src/gpu/ganesh/gl:GrGLTextureRenderTarget_src", + "//src/gpu/ganesh/gl:GrGLTexture_src", + "//src/gpu/ganesh/gl:GrGLTypesPriv_src", + "//src/gpu/ganesh/gl:GrGLUniformHandler_src", + "//src/gpu/ganesh/gl:GrGLUtil_src", + "//src/gpu/ganesh/gl:GrGLVertexArray_src", + "//src/gpu/ganesh/gl/builders:GrGLProgramBuilder_src", + "//src/gpu/ganesh/gl/builders:GrGLShaderStringBuilder_src", + ], +) + +cc_library( + name = "vulkan_srcs", + deps = [ + "//src/gpu/ganesh/vk:GrVkAMDMemoryAllocator_src", + "//src/gpu/ganesh/vk:GrVkBuffer_src", + "//src/gpu/ganesh/vk:GrVkCaps_src", + "//src/gpu/ganesh/vk:GrVkCommandBuffer_src", + "//src/gpu/ganesh/vk:GrVkCommandPool_src", + "//src/gpu/ganesh/vk:GrVkDescriptorPool_src", + "//src/gpu/ganesh/vk:GrVkDescriptorSetManager_src", + "//src/gpu/ganesh/vk:GrVkDescriptorSet_src", + "//src/gpu/ganesh/vk:GrVkExtensions_src", + "//src/gpu/ganesh/vk:GrVkFramebuffer_src", + "//src/gpu/ganesh/vk:GrVkGpu_src", + "//src/gpu/ganesh/vk:GrVkImageView_src", + "//src/gpu/ganesh/vk:GrVkImage_src", + "//src/gpu/ganesh/vk:GrVkInterface_src", + "//src/gpu/ganesh/vk:GrVkMSAALoadManager_src", + "//src/gpu/ganesh/vk:GrVkMemory_src", + "//src/gpu/ganesh/vk:GrVkOpsRenderPass_src", + "//src/gpu/ganesh/vk:GrVkPipelineStateBuilder_src", + "//src/gpu/ganesh/vk:GrVkPipelineStateCache_src", + "//src/gpu/ganesh/vk:GrVkPipelineStateDataManager_src", + "//src/gpu/ganesh/vk:GrVkPipelineState_src", + "//src/gpu/ganesh/vk:GrVkPipeline_src", + "//src/gpu/ganesh/vk:GrVkRenderPass_src", + "//src/gpu/ganesh/vk:GrVkRenderTarget_src", + "//src/gpu/ganesh/vk:GrVkResourceProvider_src", + "//src/gpu/ganesh/vk:GrVkSamplerYcbcrConversion_src", + "//src/gpu/ganesh/vk:GrVkSampler_src", + "//src/gpu/ganesh/vk:GrVkSecondaryCBDrawContext_src", + "//src/gpu/ganesh/vk:GrVkSemaphore_src", + "//src/gpu/ganesh/vk:GrVkTextureRenderTarget_src", + "//src/gpu/ganesh/vk:GrVkTexture_src", + "//src/gpu/ganesh/vk:GrVkTypesPriv_src", + "//src/gpu/ganesh/vk:GrVkUniformHandler_src", + "//src/gpu/ganesh/vk:GrVkUtil_src", + "//src/gpu/ganesh/vk:GrVkVaryingHandler_src", + ], +) + +cc_library( + name = "v1_srcs", + deps = [ + "//src/gpu/ganesh/v1:ClipStack_src", + "//src/gpu/ganesh/v1:Device_drawTexture_src", + "//src/gpu/ganesh/v1:Device_src", + "//src/gpu/ganesh/v1:PathRendererChain_src", + "//src/gpu/ganesh/v1:PathRenderer_src", + "//src/gpu/ganesh/v1:StencilMaskHelper_src", + "//src/gpu/ganesh/v1:SurfaceDrawContext_src", + "//src/gpu/ganesh/v1:SurfaceFillContext_v1_src", + ], +) + +cc_library( + name = "glx_srcs", + deps = [ + "//src/gpu/ganesh/gl/glx:GrGLMakeGLXInterface_src", + "//src/gpu/ganesh/gl/glx:GrGLMakeNativeInterface_glx_src", + ], +) + +cc_library( + name = "webgl_srcs", + deps = [ + "//src/gpu/ganesh/gl/webgl:GrGLMakeNativeInterface_webgl_src", + ], +) + +cc_library( + name = "mock_srcs", + visibility = ["//:__subpackages__"], + deps = [ + "//src/gpu/ganesh/mock:GrMockCaps_src", + "//src/gpu/ganesh/mock:GrMockGpu_src", + "//src/gpu/ganesh/mock:GrMockTypes_src", + ], +) + +selects.config_setting_group( + name = "gl_and_linux", + match_all = [ + "//bazel/common_config_settings:gl_standard", + "//bazel/common_config_settings:linux_x64", + ], +) + +cc_library( + name = "srcs", + linkopts = select({ + "//bazel/common_config_settings:gl_backend": ["-lGL"], + "//conditions:default": [], + }), + visibility = ["//:__subpackages__"], + deps = [ + ":core_srcs", + "//src/gpu:srcs", + ] + select({ + "//bazel/common_config_settings:dawn_backend": [ + ":dawn_srcs", + ":v1_srcs", + ], + "//bazel/common_config_settings:gl_backend": [ + ":gl_srcs", + ":v1_srcs", + ], + "//bazel/common_config_settings:vulkan_backend": [ + ":vulkan_srcs", + ":v1_srcs", + ], + "//conditions:default": [], + }) + select({ + ":gl_and_linux": [":glx_srcs"], + "//bazel/common_config_settings:webgl_standard": [":webgl_srcs"], + "//conditions:default": [], + }) + select({ + "//bazel/common_config_settings:vulkan_with_vma": ["//third_party:vulkanmemoryallocator"], + "//conditions:default": [], + }), +) + +generated_cc_atom( + name = "BaseDevice_hdr", + hdrs = ["BaseDevice.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkImage_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkDevice_hdr", + ], +) + +generated_cc_atom( + name = "BaseDevice_src", + srcs = ["BaseDevice.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":BaseDevice_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrSurfaceProxyView_hdr", + ":SurfaceContext_hdr", + ":SurfaceFillContext_hdr", + "//include/core:SkColorSpace_hdr", + "//include/gpu:GrRecordingContext_hdr", + ], +) + +generated_cc_atom( + name = "GrAHardwareBufferImageGenerator_hdr", + hdrs = ["GrAHardwareBufferImageGenerator.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkImageGenerator_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrAHardwareBufferImageGenerator_src", + srcs = ["GrAHardwareBufferImageGenerator.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAHardwareBufferImageGenerator_hdr", + ":GrAHardwareBufferUtils_impl_hdr", + ":GrDirectContextPriv_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrResourceCache_hdr", + ":GrResourceProviderPriv_hdr", + ":GrResourceProvider_hdr", + ":GrTextureProxy_hdr", + ":GrTexture_hdr", + ":SkGr_hdr", + "//include/core:SkTypes_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//include/gpu/gl:GrGLTypes_hdr", + "//include/gpu/vk:GrVkExtensions_hdr", + "//src/core:SkMessageBus_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + ], +) + +generated_cc_atom( + name = "GrAHardwareBufferUtils_src", + srcs = ["GrAHardwareBufferUtils.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAHardwareBufferUtils_impl_hdr", + ":GrDirectContextPriv_hdr", + "//include/core:SkTypes_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu/gl:GrGLTypes_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/vk:GrVkCaps_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + ], +) + +generated_cc_atom( + name = "GrAppliedClip_hdr", + hdrs = ["GrAppliedClip.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFragmentProcessor_hdr", + ":GrScissorState_hdr", + ":GrWindowRectsState_hdr", + "//src/core:SkClipStack_hdr", + ], +) + +generated_cc_atom( + name = "GrAttachment_hdr", + hdrs = ["GrAttachment.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurface_hdr", + "//src/core:SkClipStack_hdr", + ], +) + +generated_cc_atom( + name = "GrAttachment_src", + srcs = ["GrAttachment.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrBackendUtils_hdr", + ":GrCaps_hdr", + ":GrDataUtils_hdr", + ":GrGpu_hdr", + ], +) + +generated_cc_atom( + name = "GrAuditTrail_hdr", + hdrs = ["GrAuditTrail.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRenderTargetProxy_hdr", + "//include/core:SkRect_hdr", + "//include/core:SkString_hdr", + "//include/gpu:GrConfig_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkTArray_hdr", + "//include/private:SkTHash_hdr", + ], +) + +generated_cc_atom( + name = "GrAuditTrail_src", + srcs = ["GrAuditTrail.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAuditTrail_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrAutoLocaleSetter_hdr", + hdrs = ["GrAutoLocaleSetter.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkString_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkNoncopyable_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendSemaphore_src", + srcs = ["GrBackendSemaphore.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrBackendSemaphore_hdr", + "//include/gpu/d3d:GrD3DTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendSurfaceMutableStateImpl_hdr", + hdrs = ["GrBackendSurfaceMutableStateImpl.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/gpu:GrBackendSurfaceMutableState_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendSurfaceMutableState_src", + srcs = ["GrBackendSurfaceMutableState.cpp"], + visibility = ["//:__subpackages__"], + deps = ["//include/gpu:GrBackendSurfaceMutableState_hdr"], +) + +generated_cc_atom( + name = "GrBackendSurface_src", + srcs = ["GrBackendSurface.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendSurfaceMutableStateImpl_hdr", + "//include/core:SkString_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu/d3d:GrD3DTypes_hdr", + "//include/gpu/dawn:GrDawnTypes_hdr", + "//include/gpu/mtl:GrMtlTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/gpu/ganesh/d3d:GrD3DResourceState_hdr", + "//src/gpu/ganesh/d3d:GrD3DUtil_hdr", + "//src/gpu/ganesh/dawn:GrDawnUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/mtl:GrMtlCppUtil_hdr", + "//src/gpu/ganesh/vk:GrVkImageLayout_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendTextureImageGenerator_hdr", + hdrs = ["GrBackendTextureImageGenerator.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrTexture_hdr", + "//include/core:SkImageGenerator_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/private:SkMutex_hdr", + "//src/gpu:ResourceKey_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendTextureImageGenerator_src", + srcs = ["GrBackendTextureImageGenerator.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendTextureImageGenerator_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpu_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrResourceCache_hdr", + ":GrResourceProviderPriv_hdr", + ":GrResourceProvider_hdr", + ":GrSemaphore_hdr", + ":GrTextureProxyPriv_hdr", + ":GrTexture_hdr", + ":SkGr_hdr", + "//include/core:SkColorSpace_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkMessageBus_hdr", + "//src/gpu/ganesh/gl:GrGLTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendUtils_hdr", + hdrs = ["GrBackendUtils.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkImage_hdr", + "//include/gpu:GrBackendSurface_hdr", + ], +) + +generated_cc_atom( + name = "GrBackendUtils_src", + srcs = ["GrBackendUtils.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendUtils_hdr", + ":GrDataUtils_hdr", + "//src/gpu/ganesh/d3d:GrD3DUtil_hdr", + "//src/gpu/ganesh/dawn:GrDawnUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/mtl:GrMtlCppUtil_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrBaseContextPriv_hdr", + hdrs = ["GrBaseContextPriv.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrContextOptions_hdr", + "//include/private:GrContext_Base_hdr", + ], +) + +generated_cc_atom( + name = "GrBlurUtils_hdr", + hdrs = ["GrBlurUtils.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/private:GrTypesPriv_hdr"], +) + +generated_cc_atom( + name = "GrBlurUtils_src", + srcs = ["GrBlurUtils.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBlurUtils_hdr", + ":GrCaps_hdr", + ":GrDirectContextPriv_hdr", + ":GrFixedClip_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrResourceProvider_hdr", + ":GrStyle_hdr", + ":GrTextureProxy_hdr", + ":GrThreadSafeCache_hdr", + ":GrUtil_hdr", + ":SkGr_hdr", + "//include/core:SkBitmap_hdr", + "//include/core:SkColorSpace_hdr", + "//include/core:SkPaint_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkDraw_hdr", + "//src/core:SkMaskFilterBase_hdr", + "//src/core:SkMatrixProvider_hdr", + "//src/core:SkTLazy_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", + ], +) + +generated_cc_atom( + name = "GrBufferAllocPool_hdr", + hdrs = ["GrBufferAllocPool.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCpuBuffer_hdr", + ":GrDrawIndirectCommand_hdr", + ":GrNonAtomicRef_hdr", + "//include/core:SkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkNoncopyable_hdr", + "//include/private:SkTArray_hdr", + "//include/private:SkTDArray_hdr", + ], +) + +generated_cc_atom( + name = "GrBufferAllocPool_src", + srcs = ["GrBufferAllocPool.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBufferAllocPool_hdr", + ":GrCaps_hdr", + ":GrCpuBuffer_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpuBuffer_hdr", + ":GrGpu_hdr", + ":GrResourceProvider_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkMacros_hdr", + "//src/core:SkSafeMath_hdr", + "//src/core:SkTraceEvent_hdr", + ], +) + +generated_cc_atom( + name = "GrBuffer_hdr", + hdrs = ["GrBuffer.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/gpu:GrTypes_hdr"], +) + +generated_cc_atom( + name = "GrCaps_hdr", + hdrs = ["GrCaps.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSamplerState_hdr", + ":GrShaderCaps_hdr", + ":GrSurfaceProxy_hdr", + "//include/core:SkImageInfo_hdr", + "//include/core:SkRefCnt_hdr", + "//include/core:SkString_hdr", + "//include/gpu:GrDriverBugWorkarounds_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/gpu:Blend_hdr", + "//src/gpu:Swizzle_hdr", + ], +) + +generated_cc_atom( + name = "GrCaps_src", + srcs = ["GrCaps.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendUtils_hdr", + ":GrCaps_hdr", + ":GrRenderTargetProxy_hdr", + ":GrSurfaceProxy_hdr", + ":GrSurface_hdr", + ":GrTestUtils_hdr", + ":GrWindowRectangles_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrContextOptions_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrClientMappedBufferManager_hdr", + hdrs = ["GrClientMappedBufferManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuBuffer_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkMessageBus_hdr", + ], +) + +generated_cc_atom( + name = "GrClientMappedBufferManager_src", + srcs = ["GrClientMappedBufferManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [":GrClientMappedBufferManager_hdr"], +) + +generated_cc_atom( + name = "GrClip_hdr", + hdrs = ["GrClip.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAppliedClip_hdr", + "//include/core:SkRRect_hdr", + "//include/core:SkRect_hdr", + ], +) + +generated_cc_atom( + name = "GrColorInfo_hdr", + hdrs = ["GrColorInfo.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColorSpaceXform_hdr", + "//include/core:SkAlphaType_hdr", + "//include/core:SkRefCnt_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrColorInfo_src", + srcs = ["GrColorInfo.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColorInfo_hdr", + "//include/core:SkColorSpace_hdr", + "//include/core:SkImageInfo_hdr", + "//src/core:SkColorSpacePriv_hdr", + ], +) + +generated_cc_atom( + name = "GrColorSpaceXform_hdr", + hdrs = ["GrColorSpaceXform.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFragmentProcessor_hdr", + "//include/core:SkAlphaType_hdr", + "//include/core:SkColor_hdr", + "//include/core:SkRefCnt_hdr", + "//include/private:SkColorData_hdr", + "//src/core:SkColorSpaceXformSteps_hdr", + ], +) + +generated_cc_atom( + name = "GrColorSpaceXform_src", + srcs = ["GrColorSpaceXform.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColorInfo_hdr", + ":GrColorSpaceXform_hdr", + ":GrProcessor_hdr", + "//include/core:SkString_hdr", + "//include/third_party/skcms:skcms_hdr", + "//src/core:SkColorSpacePriv_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLColorSpaceXformHelper_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrColor_hdr", + hdrs = ["GrColor.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkColorPriv_hdr", + "//include/core:SkColor_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkColorData_hdr", + "//include/private:SkHalf_hdr", + "//src/gpu:BufferWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrContextThreadSafeProxyPriv_hdr", + hdrs = ["GrContextThreadSafeProxyPriv.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + "//include/gpu:GrContextThreadSafeProxy_hdr", + "//include/private:GrContext_Base_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", + ], +) + +generated_cc_atom( + name = "GrContextThreadSafeProxy_src", + srcs = ["GrContextThreadSafeProxy.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBaseContextPriv_hdr", + ":GrCaps_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + ":GrThreadSafeCache_hdr", + ":GrThreadSafePipelineBuilder_hdr", + "//include/core:SkSurfaceCharacterization_hdr", + "//include/gpu:GrContextThreadSafeProxy_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/vk:GrVkCaps_hdr", + "//src/image:SkSurface_Gpu_hdr", + ], +) + +generated_cc_atom( + name = "GrContext_Base_src", + srcs = ["GrContext_Base.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBaseContextPriv_hdr", + ":GrCaps_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + "//include/gpu:ShaderErrorHandler_hdr", + "//include/private:GrContext_Base_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + ], +) + +generated_cc_atom( + name = "GrCopyRenderTask_hdr", + hdrs = ["GrCopyRenderTask.h"], + visibility = ["//:__subpackages__"], + deps = [":GrRenderTask_hdr"], +) + +generated_cc_atom( + name = "GrCopyRenderTask_src", + srcs = ["GrCopyRenderTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCopyRenderTask_hdr", + ":GrGpu_hdr", + ":GrOpFlushState_hdr", + ":GrResourceAllocator_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", + ], +) + +generated_cc_atom( + name = "GrCpuBuffer_hdr", + hdrs = ["GrCpuBuffer.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBuffer_hdr", + ":GrNonAtomicRef_hdr", + "//src/core:SkSafeMath_hdr", + ], +) + +generated_cc_atom( + name = "GrDDLContext_src", + srcs = ["GrDDLContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + ":GrProgramDesc_hdr", + ":GrProgramInfo_hdr", + ":GrRecordingContextPriv_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkLRUCache_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + ], +) + +generated_cc_atom( + name = "GrDDLTask_hdr", + hdrs = ["GrDDLTask.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRenderTask_hdr", + "//include/core:SkPoint_hdr", + ], +) + +generated_cc_atom( + name = "GrDDLTask_src", + srcs = ["GrDDLTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDDLTask_hdr", + ":GrResourceAllocator_hdr", + "//include/core:SkDeferredDisplayList_hdr", + "//src/core:SkDeferredDisplayListPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrDataUtils_hdr", + hdrs = ["GrDataUtils.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkColor_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkTArray_hdr", + ], +) + +generated_cc_atom( + name = "GrDataUtils_src", + srcs = ["GrDataUtils.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrColor_hdr", + ":GrDataUtils_hdr", + ":GrImageInfo_hdr", + ":GrPixmap_hdr", + "//include/core:SkColorSpace_hdr", + "//include/private:SkTPin_hdr", + "//include/third_party/skcms:skcms_hdr", + "//src/core:SkColorSpaceXformSteps_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkConvertPixels_hdr", + "//src/core:SkMathPriv_hdr", + "//src/core:SkMipmap_hdr", + "//src/core:SkRasterPipeline_hdr", + "//src/core:SkTLazy_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/core:SkUtils_hdr", + "//src/gpu:Swizzle_hdr", + ], +) + +generated_cc_atom( + name = "GrDefaultGeoProcFactory_hdr", + hdrs = ["GrDefaultGeoProcFactory.h"], + visibility = ["//:__subpackages__"], + deps = [":GrGeometryProcessor_hdr"], +) + +generated_cc_atom( + name = "GrDefaultGeoProcFactory_src", + srcs = ["GrDefaultGeoProcFactory.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDefaultGeoProcFactory_hdr", + ":GrGeometryProcessor_hdr", + "//include/core:SkRefCnt_hdr", + "//src/core:SkArenaAlloc_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrDeferredProxyUploader_hdr", + hdrs = ["GrDeferredProxyUploader.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrOpFlushState_hdr", + ":GrTextureProxyPriv_hdr", + "//include/core:SkRefCnt_hdr", + "//include/private:SkSemaphore_hdr", + "//src/core:SkAutoPixmapStorage_hdr", + ], +) + +generated_cc_atom( + name = "GrDeferredUpload_hdr", + hdrs = ["GrDeferredUpload.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrTypes_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrDirectContextPriv_hdr", + hdrs = ["GrDirectContextPriv.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":BaseDevice_hdr", + ":GrRecordingContextPriv_hdr", + "//include/core:SkSpan_hdr", + "//include/core:SkSurface_hdr", + "//include/gpu:GrDirectContext_hdr", + ], +) + +generated_cc_atom( + name = "GrDirectContextPriv_src", + srcs = ["GrDirectContextPriv.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrContextThreadSafeProxyPriv_hdr", + ":GrDirectContextPriv_hdr", + ":GrDrawingManager_hdr", + ":GrGpu_hdr", + ":GrMemoryPool_hdr", + ":GrRecordingContextPriv_hdr", + ":GrTexture_hdr", + ":GrThreadSafePipelineBuilder_hdr", + ":GrTracing_hdr", + ":SkGr_hdr", + ":SurfaceContext_hdr", + ":SurfaceFillContext_hdr", + "//include/core:SkBitmap_hdr", + "//include/gpu:GrContextThreadSafeProxy_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkRuntimeEffectPriv_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/text:GrAtlasManager_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", + "//src/image:SkImage_Base_hdr", + "//src/image:SkImage_Gpu_hdr", + ], +) + +generated_cc_atom( + name = "GrDirectContext_src", + srcs = ["GrDirectContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendUtils_hdr", + ":GrClientMappedBufferManager_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + ":GrDirectContextPriv_hdr", + ":GrDrawingManager_hdr", + ":GrGpu_hdr", + ":GrResourceProvider_hdr", + ":GrSemaphore_hdr", + ":GrThreadSafePipelineBuilder_hdr", + ":SurfaceContext_hdr", + "//include/core:SkString_hdr", + "//include/core:SkTraceMemoryDump_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + "//include/gpu:GrContextThreadSafeProxy_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu/mtl:GrMtlBackendContext_hdr", + "//include/utils:SkRandom_hdr", + "//src/core:SkAutoMalloc_hdr", + "//src/core:SkTaskGroup_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh/d3d:GrD3DGpu_hdr", + "//src/gpu/ganesh/dawn:GrDawnGpu_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/mock:GrMockGpu_hdr", + "//src/gpu/ganesh/mtl:GrMtlTrampoline_hdr", + "//src/gpu/ganesh/ops:SmallPathAtlasMgr_hdr", + "//src/gpu/ganesh/text:GrAtlasManager_hdr", + "//src/gpu/ganesh/text:GrStrikeCache_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/image:SkImage_GpuBase_hdr", + "//src/utils:SkJSONWriter_hdr", + "//src/utils:SkShaderUtils_hdr", + ], +) + +generated_cc_atom( + name = "GrDistanceFieldGenFromVector_hdr", + hdrs = ["GrDistanceFieldGenFromVector.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/core:SkPath_hdr"], +) + +generated_cc_atom( + name = "GrDistanceFieldGenFromVector_src", + srcs = ["GrDistanceFieldGenFromVector.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDistanceFieldGenFromVector_hdr", + "//include/core:SkMatrix_hdr", + "//include/gpu:GrConfig_hdr", + "//include/private:SkTPin_hdr", + "//src/core:SkAutoMalloc_hdr", + "//src/core:SkDistanceFieldGen_hdr", + "//src/core:SkGeometry_hdr", + "//src/core:SkPointPriv_hdr", + "//src/core:SkRectPriv_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + ], +) + +generated_cc_atom( + name = "GrDrawIndirectCommand_hdr", + hdrs = ["GrDrawIndirectCommand.h"], + visibility = ["//:__subpackages__"], +) + +generated_cc_atom( + name = "GrDrawOpAtlas_hdr", + hdrs = ["GrDrawOpAtlas.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDeferredUpload_hdr", + ":GrRectanizerSkyline_hdr", + ":GrSurfaceProxyView_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkIPoint16_hdr", + "//src/core:SkTInternalLList_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", + ], +) + +generated_cc_atom( + name = "GrDrawOpAtlas_src", + srcs = ["GrDrawOpAtlas.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendUtils_hdr", + ":GrDrawOpAtlas_hdr", + ":GrOnFlushResourceProvider_hdr", + ":GrOpFlushState_hdr", + ":GrProxyProvider_hdr", + ":GrResourceProviderPriv_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrTexture_hdr", + ":GrTracing_hdr", + "//include/private:SkTPin_hdr", + "//src/core:SkOpts_hdr", + ], +) + +generated_cc_atom( + name = "GrDrawOpTest_hdr", + hdrs = ["GrDrawOpTest.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrTestUtils_hdr", + "//include/core:SkRefCnt_hdr", + ], +) + +generated_cc_atom( + name = "GrDrawOpTest_src", + srcs = ["GrDrawOpTest.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBaseContextPriv_hdr", + ":GrCaps_hdr", + ":GrDrawOpTest_hdr", + ":GrUserStencilSettings_hdr", + "//include/core:SkTypes_hdr", + "//include/private:GrContext_Base_hdr", + "//include/utils:SkRandom_hdr", + ], +) + +generated_cc_atom( + name = "GrDrawingManager_hdr", + hdrs = ["GrDrawingManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBufferAllocPool_hdr", + ":GrDeferredUpload_hdr", + ":GrHashMapWithCache_hdr", + ":GrResourceCache_hdr", + ":GrSurfaceProxy_hdr", + "//include/core:SkSpan_hdr", + "//include/core:SkSurface_hdr", + "//include/private:SkTArray_hdr", + "//include/private:SkTHash_hdr", + "//src/gpu/ganesh/v1:PathRendererChain_hdr", + "//src/gpu/ganesh/v1:PathRenderer_hdr", + ], +) + +generated_cc_atom( + name = "GrDrawingManager_src", + srcs = ["GrDrawingManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrClientMappedBufferManager_hdr", + ":GrCopyRenderTask_hdr", + ":GrDDLTask_hdr", + ":GrDirectContextPriv_hdr", + ":GrDrawingManager_hdr", + ":GrGpu_hdr", + ":GrMemoryPool_hdr", + ":GrOnFlushResourceProvider_hdr", + ":GrOpFlushState_hdr", + ":GrRecordingContextPriv_hdr", + ":GrRenderTargetProxy_hdr", + ":GrRenderTaskCluster_hdr", + ":GrRenderTask_hdr", + ":GrResourceAllocator_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrTTopoSort_hdr", + ":GrTextureProxyPriv_hdr", + ":GrTextureProxy_hdr", + ":GrTextureResolveRenderTask_hdr", + ":GrTexture_hdr", + ":GrTracing_hdr", + ":GrTransferFromRenderTask_hdr", + ":GrWaitRenderTask_hdr", + ":GrWritePixelsRenderTask_hdr", + "//include/core:SkDeferredDisplayList_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkDeferredDisplayListPriv_hdr", + "//src/core:SkTInternalLList_hdr", + "//src/gpu/ganesh/ops:OpsTask_hdr", + "//src/gpu/ganesh/ops:SoftwarePathRenderer_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", + "//src/image:SkSurface_Gpu_hdr", + ], +) + +generated_cc_atom( + name = "GrDriverBugWorkarounds_src", + srcs = ["GrDriverBugWorkarounds.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkTypes_hdr", + "//include/gpu:GrDriverBugWorkarounds_hdr", + ], +) + +generated_cc_atom( + name = "GrDstProxyView_hdr", + hdrs = ["GrDstProxyView.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurfaceProxyView_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrDynamicAtlas_hdr", + hdrs = ["GrDynamicAtlas.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrTextureProxy_hdr", + "//src/core:SkArenaAlloc_hdr", + ], +) + +generated_cc_atom( + name = "GrDynamicAtlas_src", + srcs = ["GrDynamicAtlas.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDynamicAtlas_hdr", + ":GrOnFlushResourceProvider_hdr", + ":GrProxyProvider_hdr", + ":GrRectanizerPow2_hdr", + ":GrRectanizerSkyline_hdr", + ":GrRenderTarget_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurfaceProxyView_hdr", + "//src/core:SkIPoint16_hdr", + ], +) + +generated_cc_atom( + name = "GrEagerVertexAllocator_hdr", + hdrs = ["GrEagerVertexAllocator.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrThreadSafeCache_hdr", + "//src/gpu:BufferWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrEagerVertexAllocator_src", + srcs = ["GrEagerVertexAllocator.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrEagerVertexAllocator_hdr", + ":GrMeshDrawTarget_hdr", + ], +) + +generated_cc_atom( + name = "GrFPArgs_hdr", + hdrs = ["GrFPArgs.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/core:SkMatrix_hdr"], +) + +generated_cc_atom( + name = "GrFinishCallbacks_hdr", + hdrs = ["GrFinishCallbacks.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrTypes_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrFinishCallbacks_src", + srcs = ["GrFinishCallbacks.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFinishCallbacks_hdr", + ":GrGpu_hdr", + ], +) + +generated_cc_atom( + name = "GrFixedClip_hdr", + hdrs = ["GrFixedClip.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrClip_hdr", + ":GrScissorState_hdr", + ":GrWindowRectsState_hdr", + ], +) + +generated_cc_atom( + name = "GrFixedClip_src", + srcs = ["GrFixedClip.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAppliedClip_hdr", + ":GrFixedClip_hdr", + ], +) + +generated_cc_atom( + name = "GrFragmentProcessor_hdr", + hdrs = ["GrFragmentProcessor.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrProcessor_hdr", + "//include/private:SkMacros_hdr", + "//include/private:SkSLSampleUsage_hdr", + "//include/private:SkSLString_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrFragmentProcessor_src", + srcs = ["GrFragmentProcessor.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFragmentProcessor_hdr", + ":GrPipeline_hdr", + ":GrProcessorAnalysis_hdr", + ":GrShaderCaps_hdr", + "//src/core:SkRuntimeEffectPriv_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrGeometryProcessor_hdr", + hdrs = ["GrGeometryProcessor.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColor_hdr", + ":GrFragmentProcessor_hdr", + ":GrProcessor_hdr", + ":GrShaderCaps_hdr", + ":GrShaderVar_hdr", + "//src/gpu:Swizzle_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + ], +) + +generated_cc_atom( + name = "GrGeometryProcessor_src", + srcs = ["GrGeometryProcessor.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGeometryProcessor_hdr", + ":GrPipeline_hdr", + "//src/core:SkMatrixPriv_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + ], +) + +generated_cc_atom( + name = "GrGlyph_hdr", + hdrs = ["GrGlyph.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDrawOpAtlas_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkGlyph_hdr", + "//src/core:SkMask_hdr", + ], +) + +generated_cc_atom( + name = "GrGpuBuffer_hdr", + hdrs = ["GrGpuBuffer.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBuffer_hdr", + ":GrGpuResource_hdr", + ], +) + +generated_cc_atom( + name = "GrGpuBuffer_src", + srcs = ["GrGpuBuffer.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrGpuBuffer_hdr", + ":GrGpu_hdr", + ], +) + +generated_cc_atom( + name = "GrGpuResourceCacheAccess_hdr", + hdrs = ["GrGpuResourceCacheAccess.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuResourcePriv_hdr", + ":GrGpuResource_hdr", + ], +) + +generated_cc_atom( + name = "GrGpuResourcePriv_hdr", + hdrs = ["GrGpuResourcePriv.h"], + visibility = ["//:__subpackages__"], + deps = [":GrGpuResource_hdr"], +) + +generated_cc_atom( + name = "GrGpuResource_hdr", + hdrs = ["GrGpuResource.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/private:GrTypesPriv_hdr", + "//include/private:SkNoncopyable_hdr", + "//src/gpu:ResourceKey_hdr", + ], +) + +generated_cc_atom( + name = "GrGpuResource_src", + srcs = ["GrGpuResource.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDirectContextPriv_hdr", + ":GrGpuResourcePriv_hdr", + ":GrGpuResource_hdr", + ":GrGpu_hdr", + ":GrResourceCache_hdr", + "//include/core:SkTraceMemoryDump_hdr", + "//include/gpu:GrDirectContext_hdr", + ], +) + +generated_cc_atom( + name = "GrGpu_hdr", + hdrs = ["GrGpu.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrCaps_hdr", + ":GrOpsRenderPass_hdr", + ":GrPixmap_hdr", + ":GrXferProcessor_hdr", + "//include/core:SkPath_hdr", + "//include/core:SkSpan_hdr", + "//include/core:SkSurface_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkTInternalLList_hdr", + "//src/gpu:RefCntedCallback_hdr", + "//src/gpu:Swizzle_hdr", + ], +) + +generated_cc_atom( + name = "GrGpu_src", + srcs = ["GrGpu.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrBackendUtils_hdr", + ":GrCaps_hdr", + ":GrDataUtils_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpuResourcePriv_hdr", + ":GrGpu_hdr", + ":GrNativeRect_hdr", + ":GrPipeline_hdr", + ":GrRenderTarget_hdr", + ":GrResourceCache_hdr", + ":GrResourceProvider_hdr", + ":GrRingBuffer_hdr", + ":GrSemaphore_hdr", + ":GrStagingBufferManager_hdr", + ":GrStencilSettings_hdr", + ":GrTextureProxyPriv_hdr", + ":GrTracing_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkMathPriv_hdr", + "//src/core:SkMipmap_hdr", + "//src/sksl:SkSLCompiler_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrHashMapWithCache_hdr", + hdrs = ["GrHashMapWithCache.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/private:SkChecksum_hdr", + "//include/private:SkNoncopyable_hdr", + "//include/private:SkTHash_hdr", + ], +) + +generated_cc_atom( + name = "GrImageContextPriv_hdr", + hdrs = ["GrImageContextPriv.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBaseContextPriv_hdr", + "//include/gpu:GrContextThreadSafeProxy_hdr", + "//include/private:GrImageContext_hdr", + ], +) + +generated_cc_atom( + name = "GrImageContext_src", + srcs = ["GrImageContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + ":GrImageContextPriv_hdr", + ":GrProxyProvider_hdr", + "//include/private:GrImageContext_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + ], +) + +generated_cc_atom( + name = "GrImageInfo_hdr", + hdrs = ["GrImageInfo.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColorInfo_hdr", + "//include/core:SkAlphaType_hdr", + "//include/core:SkRefCnt_hdr", + "//include/core:SkSize_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrManagedResource_hdr", + hdrs = ["GrManagedResource.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/private:SkMutex_hdr", + "//include/private:SkTHash_hdr", + "//include/utils:SkRandom_hdr", + "//src/gpu:RefCntedCallback_hdr", + ], +) + +generated_cc_atom( + name = "GrManagedResource_src", + srcs = ["GrManagedResource.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuResourcePriv_hdr", + ":GrManagedResource_hdr", + ":GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrMemoryPool_hdr", + hdrs = ["GrMemoryPool.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/private:SkTHash_hdr", + "//src/core:SkBlockAllocator_hdr", + ], +) + +generated_cc_atom( + name = "GrMemoryPool_src", + srcs = ["GrMemoryPool.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrMemoryPool_hdr", + "//include/private:SkTPin_hdr", + "//src/core:SkASAN_hdr", + ], +) + +generated_cc_atom( + name = "GrMeshDrawTarget_hdr", + hdrs = ["GrMeshDrawTarget.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDrawIndirectCommand_hdr", + ":GrSimpleMesh_hdr", + ], +) + +generated_cc_atom( + name = "GrMeshDrawTarget_src", + srcs = ["GrMeshDrawTarget.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrMeshDrawTarget_hdr", + ":GrResourceProvider_hdr", + "//src/gpu:BufferWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrNativeRect_hdr", + hdrs = ["GrNativeRect.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRect_hdr", + "//include/gpu:GrTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrNonAtomicRef_hdr", + hdrs = ["GrNonAtomicRef.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/private:SkNoncopyable_hdr", + "//include/private:SkTArray_hdr", + ], +) + +generated_cc_atom( + name = "GrOnFlushResourceProvider_hdr", + hdrs = ["GrOnFlushResourceProvider.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDeferredUpload_hdr", + "//include/core:SkSpan_hdr", + ], +) + +generated_cc_atom( + name = "GrOnFlushResourceProvider_src", + srcs = ["GrOnFlushResourceProvider.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDirectContextPriv_hdr", + ":GrDrawingManager_hdr", + ":GrOnFlushResourceProvider_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurfaceProxy_hdr", + ":GrTextureResolveRenderTask_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + ], +) + +generated_cc_atom( + name = "GrOpFlushState_hdr", + hdrs = ["GrOpFlushState.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAppliedClip_hdr", + ":GrBufferAllocPool_hdr", + ":GrDeferredUpload_hdr", + ":GrMeshDrawTarget_hdr", + ":GrProgramInfo_hdr", + ":GrRenderTargetProxy_hdr", + ":GrSurfaceProxyView_hdr", + "//src/core:SkArenaAllocList_hdr", + "//src/core:SkArenaAlloc_hdr", + ], +) + +generated_cc_atom( + name = "GrOpFlushState_src", + srcs = ["GrOpFlushState.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDataUtils_hdr", + ":GrDirectContextPriv_hdr", + ":GrDrawOpAtlas_hdr", + ":GrGpu_hdr", + ":GrImageInfo_hdr", + ":GrOpFlushState_hdr", + ":GrProgramInfo_hdr", + ":GrResourceProvider_hdr", + ":GrTexture_hdr", + "//include/core:SkColorSpace_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkConvertPixels_hdr", + ], +) + +generated_cc_atom( + name = "GrOpsRenderPass_hdr", + hdrs = ["GrOpsRenderPass.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDeferredUpload_hdr", + ":GrPipeline_hdr", + "//include/core:SkDrawable_hdr", + ], +) + +generated_cc_atom( + name = "GrOpsRenderPass_src", + srcs = ["GrOpsRenderPass.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrCpuBuffer_hdr", + ":GrDrawIndirectCommand_hdr", + ":GrGeometryProcessor_hdr", + ":GrGpu_hdr", + ":GrOpsRenderPass_hdr", + ":GrProgramInfo_hdr", + ":GrRenderTarget_hdr", + ":GrScissorState_hdr", + ":GrSimpleMesh_hdr", + ":GrTexture_hdr", + "//include/core:SkRect_hdr", + ], +) + +generated_cc_atom( + name = "GrOpsTypes_hdr", + hdrs = ["GrOpsTypes.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurfaceProxyView_hdr", + "//include/core:SkMatrix_hdr", + "//include/core:SkRect_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkColorData_hdr", + ], +) + +generated_cc_atom( + name = "GrPaint_hdr", + hdrs = ["GrPaint.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColor_hdr", + ":GrFragmentProcessor_hdr", + "//include/core:SkBlendMode_hdr", + "//include/core:SkRefCnt_hdr", + "//include/core:SkRegion_hdr", + "//src/core:SkTLazy_hdr", + ], +) + +generated_cc_atom( + name = "GrPaint_src", + srcs = ["GrPaint.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrPaint_hdr", + ":GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrCoverageSetOpXP_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + ], +) + +generated_cc_atom( + name = "GrPersistentCacheUtils_hdr", + hdrs = ["GrPersistentCacheUtils.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkData_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/sksl/ir:SkSLProgram_hdr", + ], +) + +generated_cc_atom( + name = "GrPersistentCacheUtils_src", + srcs = ["GrPersistentCacheUtils.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrPersistentCacheUtils_hdr", + "//include/private:SkSLString_hdr", + "//src/core:SkReadBuffer_hdr", + "//src/core:SkWriteBuffer_hdr", + ], +) + +generated_cc_atom( + name = "GrPipeline_hdr", + hdrs = ["GrPipeline.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColor_hdr", + ":GrDstProxyView_hdr", + ":GrFragmentProcessor_hdr", + ":GrProcessorSet_hdr", + ":GrScissorState_hdr", + ":GrSurfaceProxyView_hdr", + ":GrUserStencilSettings_hdr", + ":GrWindowRectsState_hdr", + "//include/core:SkRefCnt_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + ], +) + +generated_cc_atom( + name = "GrPipeline_src", + srcs = ["GrPipeline.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAppliedClip_hdr", + ":GrCaps_hdr", + ":GrPipeline_hdr", + ":GrXferProcessor_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrPixmap_hdr", + hdrs = ["GrPixmap.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrImageInfo_hdr", + "//include/core:SkData_hdr", + "//include/core:SkPixmap_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessorAnalysis_hdr", + hdrs = ["GrProcessorAnalysis.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/private:SkColorData_hdr"], +) + +generated_cc_atom( + name = "GrProcessorAnalysis_src", + srcs = ["GrProcessorAnalysis.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrFragmentProcessor_hdr", + ":GrGeometryProcessor_hdr", + ":GrProcessorAnalysis_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessorSet_hdr", + hdrs = ["GrProcessorSet.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFragmentProcessor_hdr", + ":GrPaint_hdr", + ":GrProcessorAnalysis_hdr", + ":GrXferProcessor_hdr", + "//include/private:SkTemplates_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessorSet_src", + srcs = ["GrProcessorSet.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAppliedClip_hdr", + ":GrCaps_hdr", + ":GrProcessorSet_hdr", + ":GrUserStencilSettings_hdr", + ":GrXferProcessor_hdr", + "//src/core:SkBlendModePriv_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessorUnitTest_hdr", + hdrs = ["GrProcessorUnitTest.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrTestUtils_hdr", + ":GrTextureProxy_hdr", + "//include/core:SkTypes_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkArenaAlloc_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessorUnitTest_src", + srcs = ["GrProcessorUnitTest.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFragmentProcessor_hdr", + ":GrProcessorUnitTest_hdr", + ":GrRecordingContextPriv_hdr", + ":GrSurfaceProxyView_hdr", + "//include/gpu:GrRecordingContext_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessor_hdr", + hdrs = ["GrProcessor.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColor_hdr", + ":GrGpuBuffer_hdr", + ":GrProcessorUnitTest_hdr", + ":GrProgramDesc_hdr", + ":GrSamplerState_hdr", + ":GrShaderVar_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrTextureProxy_hdr", + "//include/core:SkMath_hdr", + "//include/core:SkString_hdr", + ], +) + +generated_cc_atom( + name = "GrProcessor_src", + srcs = ["GrProcessor.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGeometryProcessor_hdr", + ":GrMemoryPool_hdr", + ":GrProcessor_hdr", + ":GrSamplerState_hdr", + ":GrTextureProxy_hdr", + ":GrXferProcessor_hdr", + "//include/private:SkSpinlock_hdr", + ], +) + +generated_cc_atom( + name = "GrProgramDesc_hdr", + hdrs = ["GrProgramDesc.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkString_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkTArray_hdr", + "//include/private:SkTo_hdr", + ], +) + +generated_cc_atom( + name = "GrProgramDesc_src", + srcs = ["GrProgramDesc.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrFragmentProcessor_hdr", + ":GrGeometryProcessor_hdr", + ":GrPipeline_hdr", + ":GrProcessor_hdr", + ":GrProgramDesc_hdr", + ":GrProgramInfo_hdr", + ":GrRenderTarget_hdr", + ":GrShaderCaps_hdr", + ":GrTexture_hdr", + "//include/private:SkChecksum_hdr", + "//include/private:SkTo_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrProgramInfo_hdr", + hdrs = ["GrProgramInfo.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGeometryProcessor_hdr", + ":GrPipeline_hdr", + "//include/gpu:GrTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrProgramInfo_src", + srcs = ["GrProgramInfo.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrProgramInfo_hdr", + ":GrStencilSettings_hdr", + ":GrTexture_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + ], +) + +generated_cc_atom( + name = "GrProxyProvider_hdr", + hdrs = ["GrProxyProvider.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrTextureProxy_hdr", + "//include/gpu:GrTypes_hdr", + "//src/core:SkTDynamicHash_hdr", + "//src/gpu:ResourceKey_hdr", + ], +) + +generated_cc_atom( + name = "GrProxyProvider_src", + srcs = ["GrProxyProvider.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + ":GrDirectContextPriv_hdr", + ":GrImageContextPriv_hdr", + ":GrProxyProvider_hdr", + ":GrRenderTarget_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurfaceProxy_hdr", + ":GrTextureProxyCacheAccess_hdr", + ":GrTextureRenderTargetProxy_hdr", + ":GrTexture_hdr", + ":SkGr_hdr", + "//include/core:SkBitmap_hdr", + "//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", + "//src/core:SkAutoPixmapStorage_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkImagePriv_hdr", + "//src/core:SkMipmap_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/image:SkImage_Base_hdr", + ], +) + +generated_cc_atom( + name = "GrRecordingContextPriv_hdr", + hdrs = ["GrRecordingContextPriv.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":BaseDevice_hdr", + ":GrImageContextPriv_hdr", + "//include/core:SkPaint_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/gpu:RefCntedCallback_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", + ], +) + +generated_cc_atom( + name = "GrRecordingContextPriv_src", + srcs = ["GrRecordingContextPriv.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDrawingManager_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrRenderTargetProxy_hdr", + ":GrSurfaceProxyView_hdr", + "//include/core:SkColorSpace_hdr", + "//src/gpu/ganesh/v1:Device_v1_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh/v1:SurfaceFillContext_v1_hdr", + ], +) + +generated_cc_atom( + name = "GrRecordingContext_src", + srcs = ["GrRecordingContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAuditTrail_hdr", + ":GrCaps_hdr", + ":GrContextThreadSafeProxyPriv_hdr", + ":GrDrawingManager_hdr", + ":GrMemoryPool_hdr", + ":GrProgramDesc_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":SkGr_hdr", + ":SurfaceContext_hdr", + "//include/gpu:GrContextThreadSafeProxy_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkArenaAlloc_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/ops:AtlasTextOp_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", + "//src/gpu/ganesh/text:GrTextBlob_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrRectanizerPow2_hdr", + hdrs = ["GrRectanizerPow2.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRectanizer_impl_hdr", + "//include/private:SkMalloc_hdr", + "//src/core:SkIPoint16_hdr", + "//src/core:SkMathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrRectanizerPow2_src", + srcs = ["GrRectanizerPow2.cpp"], + visibility = ["//:__subpackages__"], + deps = [":GrRectanizerPow2_hdr"], +) + +generated_cc_atom( + name = "GrRectanizerSkyline_hdr", + hdrs = ["GrRectanizerSkyline.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRectanizer_impl_hdr", + "//include/private:SkTDArray_hdr", + ], +) + +generated_cc_atom( + name = "GrRectanizerSkyline_src", + srcs = ["GrRectanizerSkyline.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRectanizerSkyline_hdr", + "//src/core:SkIPoint16_hdr", + ], +) + +generated_cc_atom( + name = "GrRefCnt_hdr", + hdrs = ["GrRefCnt.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuResource_hdr", + ":GrManagedResource_hdr", + "//include/core:SkRefCnt_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTargetContext_hdr", + hdrs = ["GrRenderTargetContext.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkTypes_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTargetProxy_hdr", + hdrs = ["GrRenderTargetProxy.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrNativeRect_hdr", + ":GrSubRunAllocator_hdr", + ":GrSurfaceProxy_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkArenaAlloc_hdr", + "//src/gpu:Swizzle_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTargetProxy_src", + srcs = ["GrRenderTargetProxy.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpuResourcePriv_hdr", + ":GrRenderTargetProxy_hdr", + ":GrRenderTarget_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurface_hdr", + ":GrTextureRenderTargetProxy_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkMathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTarget_hdr", + hdrs = ["GrRenderTarget.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurface_hdr", + "//include/core:SkRect_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTarget_src", + srcs = ["GrRenderTarget.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrBackendUtils_hdr", + ":GrGpu_hdr", + ":GrRenderTarget_hdr", + ":GrStencilSettings_hdr", + "//src/core:SkRectPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTaskCluster_hdr", + hdrs = ["GrRenderTaskCluster.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/core:SkSpan_hdr", + "//src/core:SkTInternalLList_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTaskCluster_src", + srcs = ["GrRenderTaskCluster.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRenderTaskCluster_hdr", + ":GrRenderTask_hdr", + "//include/private:SkTHash_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTask_hdr", + hdrs = ["GrRenderTask.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurfaceProxyView_hdr", + ":GrTextureProxy_hdr", + ":GrTextureResolveManager_hdr", + "//include/core:SkRefCnt_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkTInternalLList_hdr", + ], +) + +generated_cc_atom( + name = "GrRenderTask_src", + srcs = ["GrRenderTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrRenderTarget_hdr", + ":GrRenderTask_hdr", + ":GrTextureProxyPriv_hdr", + ":GrTextureResolveRenderTask_hdr", + ], +) + +generated_cc_atom( + name = "GrResourceAllocator_hdr", + hdrs = ["GrResourceAllocator.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrHashMapWithCache_hdr", + ":GrSurfaceProxy_hdr", + ":GrSurface_hdr", + "//include/private:SkTHash_hdr", + "//src/core:SkArenaAlloc_hdr", + "//src/core:SkTMultiMap_hdr", + ], +) + +generated_cc_atom( + name = "GrResourceAllocator_src", + srcs = ["GrResourceAllocator.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDirectContextPriv_hdr", + ":GrGpuResourcePriv_hdr", + ":GrRenderTargetProxy_hdr", + ":GrResourceAllocator_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurfaceProxy_hdr", + ], +) + +generated_cc_atom( + name = "GrResourceCache_hdr", + hdrs = ["GrResourceCache.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuResourceCacheAccess_hdr", + ":GrGpuResourcePriv_hdr", + ":GrGpuResource_hdr", + "//include/core:SkRefCnt_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/private:SkTArray_hdr", + "//include/private:SkTHash_hdr", + "//src/core:SkMessageBus_hdr", + "//src/core:SkTDPQueue_hdr", + "//src/core:SkTInternalLList_hdr", + "//src/core:SkTMultiMap_hdr", + "//src/gpu:ResourceKey_hdr", + ], +) + +generated_cc_atom( + name = "GrResourceCache_src", + srcs = ["GrResourceCache.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpuResourceCacheAccess_hdr", + ":GrProxyProvider_hdr", + ":GrResourceCache_hdr", + ":GrTextureProxyCacheAccess_hdr", + ":GrTexture_hdr", + ":GrThreadSafeCache_hdr", + ":GrTracing_hdr", + ":SkGr_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/private:SingleOwner_hdr", + "//include/private:SkTo_hdr", + "//include/utils:SkRandom_hdr", + "//src/core:SkMessageBus_hdr", + "//src/core:SkOpts_hdr", + "//src/core:SkScopeExit_hdr", + "//src/core:SkTSort_hdr", + ], +) + +generated_cc_atom( + name = "GrResourceHandle_hdr", + hdrs = ["GrResourceHandle.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/core:SkTypes_hdr"], +) + +generated_cc_atom( + name = "GrResourceProviderPriv_hdr", + hdrs = ["GrResourceProviderPriv.h"], + visibility = ["//:__subpackages__"], + deps = [":GrResourceProvider_hdr"], +) + +generated_cc_atom( + name = "GrResourceProvider_hdr", + hdrs = ["GrResourceProvider.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuBuffer_hdr", + ":GrResourceCache_hdr", + "//include/gpu:GrContextOptions_hdr", + "//include/private:SkImageInfoPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrResourceProvider_src", + srcs = ["GrResourceProvider.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrCaps_hdr", + ":GrDataUtils_hdr", + ":GrGpuBuffer_hdr", + ":GrGpu_hdr", + ":GrImageInfo_hdr", + ":GrProxyProvider_hdr", + ":GrRenderTarget_hdr", + ":GrResourceCache_hdr", + ":GrResourceProvider_hdr", + ":GrSemaphore_hdr", + ":GrTexture_hdr", + ":SkGr_hdr", + "//include/core:SkColorSpace_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + "//include/private:SingleOwner_hdr", + "//src/core:SkConvertPixels_hdr", + "//src/core:SkMathPriv_hdr", + "//src/core:SkMipmap_hdr", + "//src/gpu:BufferWriter_hdr", + "//src/gpu:ResourceKey_hdr", + ], +) + +generated_cc_atom( + name = "GrRingBuffer_hdr", + hdrs = ["GrRingBuffer.h"], + visibility = ["//:__subpackages__"], + deps = [":GrGpuBuffer_hdr"], +) + +generated_cc_atom( + name = "GrRingBuffer_src", + srcs = ["GrRingBuffer.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDirectContextPriv_hdr", + ":GrGpu_hdr", + ":GrResourceProvider_hdr", + ":GrRingBuffer_hdr", + ], +) + +generated_cc_atom( + name = "GrSPIRVUniformHandler_hdr", + hdrs = ["GrSPIRVUniformHandler.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//src/core:SkTBlockList_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrSPIRVUniformHandler_src", + srcs = ["GrSPIRVUniformHandler.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSPIRVUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrSPIRVVaryingHandler_hdr", + hdrs = ["GrSPIRVVaryingHandler.h"], + visibility = ["//:__subpackages__"], + deps = ["//src/gpu/ganesh/glsl:GrGLSLVarying_hdr"], +) + +generated_cc_atom( + name = "GrSPIRVVaryingHandler_src", + srcs = ["GrSPIRVVaryingHandler.cpp"], + visibility = ["//:__subpackages__"], + deps = [":GrSPIRVVaryingHandler_hdr"], +) + +generated_cc_atom( + name = "GrSWMaskHelper_hdr", + hdrs = ["GrSWMaskHelper.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurfaceProxyView_hdr", + "//include/core:SkMatrix_hdr", + "//include/core:SkRegion_hdr", + "//include/core:SkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkAutoPixmapStorage_hdr", + "//src/core:SkDraw_hdr", + "//src/core:SkRasterClip_hdr", + ], +) + +generated_cc_atom( + name = "GrSWMaskHelper_src", + srcs = ["GrSWMaskHelper.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrSWMaskHelper_hdr", + ":GrTextureProxy_hdr", + ":SkGr_hdr", + ":SurfaceContext_hdr", + "//include/core:SkBitmap_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkMatrixProvider_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + ], +) + +generated_cc_atom( + name = "GrSamplerState_hdr", + hdrs = ["GrSamplerState.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkSamplingOptions_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkTPin_hdr", + "//include/private:SkTo_hdr", + "//src/core:SkMathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrScissorState_hdr", + hdrs = ["GrScissorState.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/core:SkRect_hdr"], +) + +generated_cc_atom( + name = "GrSemaphore_hdr", + hdrs = ["GrSemaphore.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/gpu:GrBackendSemaphore_hdr"], +) + +generated_cc_atom( + name = "GrShaderCaps_hdr", + hdrs = ["GrShaderCaps.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//src/gpu/ganesh/glsl:GrGLSL_hdr", + "//src/sksl:SkSLUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrShaderCaps_src", + srcs = ["GrShaderCaps.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrShaderCaps_hdr", + "//include/gpu:GrContextOptions_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrShaderVar_hdr", + hdrs = ["GrShaderVar.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkString_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkSLTypeShared_hdr", + ], +) + +generated_cc_atom( + name = "GrShaderVar_src", + srcs = ["GrShaderVar.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrShaderCaps_hdr", + ":GrShaderVar_hdr", + ], +) + +generated_cc_atom( + name = "GrSimpleMesh_hdr", + hdrs = ["GrSimpleMesh.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBuffer_hdr", + ":GrGpuBuffer_hdr", + ":GrOpsRenderPass_hdr", + ], +) + +generated_cc_atom( + name = "GrStagingBufferManager_hdr", + hdrs = ["GrStagingBufferManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuBuffer_hdr", + "//include/core:SkRefCnt_hdr", + ], +) + +generated_cc_atom( + name = "GrStagingBufferManager_src", + srcs = ["GrStagingBufferManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDirectContextPriv_hdr", + ":GrGpu_hdr", + ":GrResourceProvider_hdr", + ":GrStagingBufferManager_hdr", + "//include/gpu:GrDirectContext_hdr", + ], +) + +generated_cc_atom( + name = "GrStencilSettings_hdr", + hdrs = ["GrStencilSettings.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrUserStencilSettings_hdr", + "//include/core:SkRegion_hdr", + ], +) + +generated_cc_atom( + name = "GrStencilSettings_src", + srcs = ["GrStencilSettings.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrProcessor_hdr", + ":GrStencilSettings_hdr", + "//src/gpu:KeyBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrStyle_hdr", + hdrs = ["GrStyle.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkMatrix_hdr", + "//include/core:SkStrokeRec_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkTemplates_hdr", + "//src/core:SkPathEffectBase_hdr", + ], +) + +generated_cc_atom( + name = "GrStyle_src", + srcs = ["GrStyle.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrStyle_hdr", + "//src/utils:SkDashPathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrSubRunAllocator_hdr", + hdrs = ["GrSubRunAllocator.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkMath_hdr", + "//include/core:SkSpan_hdr", + "//src/core:SkArenaAlloc_hdr", + ], +) + +generated_cc_atom( + name = "GrSubRunAllocator_src", + srcs = ["GrSubRunAllocator.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSubRunAllocator_hdr", + "//include/core:SkMath_hdr", + ], +) + +generated_cc_atom( + name = "GrSurfaceInfo_src", + srcs = ["GrSurfaceInfo.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrSurfaceInfo_hdr", + "//include/gpu/d3d:GrD3DTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrSurfaceProxyPriv_hdr", + hdrs = ["GrSurfaceProxyPriv.h"], + visibility = ["//:__subpackages__"], + deps = [":GrSurfaceProxy_hdr"], +) + +generated_cc_atom( + name = "GrSurfaceProxyView_hdr", + hdrs = ["GrSurfaceProxyView.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRenderTargetProxy_hdr", + ":GrSurfaceProxy_hdr", + ":GrTextureProxy_hdr", + "//include/core:SkRefCnt_hdr", + "//include/gpu:GrTypes_hdr", + "//src/gpu:Swizzle_hdr", + ], +) + +generated_cc_atom( + name = "GrSurfaceProxy_hdr", + hdrs = ["GrSurfaceProxy.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuResource_hdr", + ":GrSurface_hdr", + ":GrTexture_hdr", + "//include/core:SkRect_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/private:SkNoncopyable_hdr", + ], +) + +generated_cc_atom( + name = "GrSurfaceProxy_src", + srcs = ["GrSurfaceProxy.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAttachment_hdr", + ":GrCaps_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpuResourcePriv_hdr", + ":GrImageInfo_hdr", + ":GrRecordingContextPriv_hdr", + ":GrRenderTarget_hdr", + ":GrResourceProvider_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurfaceProxy_hdr", + ":GrSurface_hdr", + ":GrTextureRenderTargetProxy_hdr", + ":GrTexture_hdr", + ":SurfaceFillContext_hdr", + "//include/core:SkColorSpace_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkMathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrSurface_hdr", + hdrs = ["GrSurface.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuResource_hdr", + "//include/core:SkImageInfo_hdr", + "//include/core:SkRect_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrTypes_hdr", + "//src/gpu:RefCntedCallback_hdr", + ], +) + +generated_cc_atom( + name = "GrSurface_src", + srcs = ["GrSurface.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBackendUtils_hdr", + ":GrRenderTarget_hdr", + ":GrResourceProvider_hdr", + ":GrSurface_hdr", + ":GrTexture_hdr", + ":SkGr_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkMathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrTTopoSort_hdr", + hdrs = ["GrTTopoSort.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/private:SkTArray_hdr", + ], +) + +generated_cc_atom( + name = "GrTestUtils_hdr", + hdrs = ["GrTestUtils.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColor_hdr", + ":GrFPArgs_hdr", + ":GrSamplerState_hdr", + "//include/core:SkStrokeRec_hdr", + "//include/core:SkTypes_hdr", + "//include/private:SkMacros_hdr", + "//include/private:SkTemplates_hdr", + "//include/utils:SkRandom_hdr", + "//src/core:SkMatrixProvider_hdr", + "//src/core:SkPathEffectBase_hdr", + "//src/shaders:SkShaderBase_hdr", + ], +) + +generated_cc_atom( + name = "GrTestUtils_src", + srcs = ["GrTestUtils.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColorInfo_hdr", + ":GrProcessorUnitTest_hdr", + ":GrStyle_hdr", + ":GrTestUtils_hdr", + "//include/core:SkColorSpace_hdr", + "//include/core:SkMatrix_hdr", + "//include/core:SkPathBuilder_hdr", + "//include/core:SkRRect_hdr", + "//src/core:SkRectPriv_hdr", + "//src/utils:SkDashPathPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrTextureProxyCacheAccess_hdr", + hdrs = ["GrTextureProxyCacheAccess.h"], + visibility = ["//:__subpackages__"], + deps = [":GrTextureProxy_hdr"], +) + +generated_cc_atom( + name = "GrTextureProxyPriv_hdr", + hdrs = ["GrTextureProxyPriv.h"], + visibility = ["//:__subpackages__"], + deps = [":GrTextureProxy_hdr"], +) + +generated_cc_atom( + name = "GrTextureProxy_hdr", + hdrs = ["GrTextureProxy.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSamplerState_hdr", + ":GrSurfaceProxy_hdr", + "//include/gpu:GrBackendSurface_hdr", + ], +) + +generated_cc_atom( + name = "GrTextureProxy_src", + srcs = ["GrTextureProxy.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDeferredProxyUploader_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpuResourcePriv_hdr", + ":GrProxyProvider_hdr", + ":GrSurface_hdr", + ":GrTextureProxyPriv_hdr", + ":GrTextureProxy_hdr", + ":GrTexture_hdr", + "//include/gpu:GrDirectContext_hdr", + ], +) + +generated_cc_atom( + name = "GrTextureRenderTargetProxy_hdr", + hdrs = ["GrTextureRenderTargetProxy.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRenderTargetProxy_hdr", + ":GrTextureProxy_hdr", + ], +) + +generated_cc_atom( + name = "GrTextureRenderTargetProxy_src", + srcs = ["GrTextureRenderTargetProxy.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDirectContextPriv_hdr", + ":GrRenderTarget_hdr", + ":GrSurfaceProxyPriv_hdr", + ":GrSurface_hdr", + ":GrTextureProxyPriv_hdr", + ":GrTextureRenderTargetProxy_hdr", + ":GrTexture_hdr", + "//include/gpu:GrDirectContext_hdr", + ], +) + +generated_cc_atom( + name = "GrTextureResolveManager_hdr", + hdrs = ["GrTextureResolveManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDrawingManager_hdr", + "//include/core:SkRefCnt_hdr", + ], +) + +generated_cc_atom( + name = "GrTextureResolveRenderTask_hdr", + hdrs = ["GrTextureResolveRenderTask.h"], + visibility = ["//:__subpackages__"], + deps = [":GrRenderTask_hdr"], +) + +generated_cc_atom( + name = "GrTextureResolveRenderTask_src", + srcs = ["GrTextureResolveRenderTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpu_hdr", + ":GrMemoryPool_hdr", + ":GrOpFlushState_hdr", + ":GrRenderTarget_hdr", + ":GrResourceAllocator_hdr", + ":GrTextureResolveRenderTask_hdr", + ":GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrTexture_hdr", + hdrs = ["GrTexture.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurface_hdr", + "//include/core:SkImage_hdr", + "//include/core:SkPoint_hdr", + "//include/core:SkRefCnt_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/private:GrTypesPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrTexture_src", + srcs = ["GrTexture.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrDirectContextPriv_hdr", + ":GrGpu_hdr", + ":GrRenderTarget_hdr", + ":GrResourceCache_hdr", + ":GrTexture_hdr", + "//include/core:SkMath_hdr", + "//include/core:SkTypes_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrTypes_hdr", + "//src/core:SkMipmap_hdr", + ], +) + +generated_cc_atom( + name = "GrThreadSafeCache_hdr", + hdrs = ["GrThreadSafeCache.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpuBuffer_hdr", + ":GrSurfaceProxyView_hdr", + "//include/core:SkRefCnt_hdr", + "//include/private:SkSpinlock_hdr", + "//src/core:SkArenaAlloc_hdr", + "//src/core:SkTDynamicHash_hdr", + "//src/core:SkTInternalLList_hdr", + ], +) + +generated_cc_atom( + name = "GrThreadSafeCache_src", + srcs = ["GrThreadSafeCache.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrDirectContextPriv_hdr", + ":GrGpuBuffer_hdr", + ":GrProxyProvider_hdr", + ":GrResourceCache_hdr", + ":GrThreadSafeCache_hdr", + "//include/gpu:GrDirectContext_hdr", + ], +) + +generated_cc_atom( + name = "GrThreadSafePipelineBuilder_hdr", + hdrs = ["GrThreadSafePipelineBuilder.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/gpu:GrConfig_hdr", + "//include/private:SkTArray_hdr", + ], +) + +generated_cc_atom( + name = "GrThreadSafePipelineBuilder_src", + srcs = ["GrThreadSafePipelineBuilder.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrThreadSafePipelineBuilder_hdr", + "//include/core:SkString_hdr", + ], +) + +generated_cc_atom( + name = "GrTracing_hdr", + hdrs = ["GrTracing.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrAuditTrail_hdr", + "//src/core:SkTraceEvent_hdr", + ], +) + +generated_cc_atom( + name = "GrTransferFromRenderTask_hdr", + hdrs = ["GrTransferFromRenderTask.h"], + visibility = ["//:__subpackages__"], + deps = [":GrRenderTask_hdr"], +) + +generated_cc_atom( + name = "GrTransferFromRenderTask_src", + srcs = ["GrTransferFromRenderTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpu_hdr", + ":GrOpFlushState_hdr", + ":GrResourceAllocator_hdr", + ":GrResourceProvider_hdr", + ":GrTransferFromRenderTask_hdr", + ], +) + +generated_cc_atom( + name = "GrUniformDataManager_hdr", + hdrs = ["GrUniformDataManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/private:GrTypesPriv_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkAutoMalloc_hdr", + "//src/core:SkSLTypeShared_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + ], +) + +generated_cc_atom( + name = "GrUniformDataManager_src", + srcs = ["GrUniformDataManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrShaderVar_hdr", + ":GrUniformDataManager_hdr", + "//include/private:SkHalf_hdr", + ], +) + +generated_cc_atom( + name = "GrUserStencilSettings_hdr", + hdrs = ["GrUserStencilSettings.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/gpu:GrTypes_hdr"], +) + +generated_cc_atom( + name = "GrUtil_hdr", + hdrs = ["GrUtil.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkScalar_hdr", + "//include/core:SkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/core:SkSLTypeShared_hdr", + ], +) + +generated_cc_atom( + name = "GrUtil_src", + srcs = ["GrUtil.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrStyle_hdr", + ":GrUtil_hdr", + "//src/core:SkDrawProcs_hdr", + ], +) + +generated_cc_atom( + name = "GrVertexChunkArray_hdr", + hdrs = ["GrVertexChunkArray.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrBuffer_hdr", + "//include/core:SkRefCnt_hdr", + "//include/private:SkNoncopyable_hdr", + "//include/private:SkTArray_hdr", + "//src/gpu:BufferWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrVertexChunkArray_src", + srcs = ["GrVertexChunkArray.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrMeshDrawTarget_hdr", + ":GrVertexChunkArray_hdr", + ], +) + +generated_cc_atom( + name = "GrVx_hdr", + hdrs = ["GrVx.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkTypes_hdr", + "//include/private:SkVx_hdr", + ], +) + +generated_cc_atom( + name = "GrWaitRenderTask_hdr", + hdrs = ["GrWaitRenderTask.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrRenderTask_hdr", + ":GrSemaphore_hdr", + ], +) + +generated_cc_atom( + name = "GrWaitRenderTask_src", + srcs = ["GrWaitRenderTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpu_hdr", + ":GrOpFlushState_hdr", + ":GrResourceAllocator_hdr", + ":GrWaitRenderTask_hdr", + ], +) + +generated_cc_atom( + name = "GrWindowRectangles_hdr", + hdrs = ["GrWindowRectangles.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrNonAtomicRef_hdr", + "//include/core:SkRect_hdr", + ], +) + +generated_cc_atom( + name = "GrWindowRectsState_hdr", + hdrs = ["GrWindowRectsState.h"], + visibility = ["//:__subpackages__"], + deps = [":GrWindowRectangles_hdr"], +) + +generated_cc_atom( + name = "GrWritePixelsRenderTask_hdr", + hdrs = ["GrWritePixelsRenderTask.h"], + visibility = ["//:__subpackages__"], + deps = [":GrRenderTask_hdr"], +) + +generated_cc_atom( + name = "GrWritePixelsRenderTask_src", + srcs = ["GrWritePixelsRenderTask.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGpu_hdr", + ":GrOpFlushState_hdr", + ":GrResourceAllocator_hdr", + ":GrWritePixelsRenderTask_hdr", + ], +) + +generated_cc_atom( + name = "GrXferProcessor_hdr", + hdrs = ["GrXferProcessor.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrNonAtomicRef_hdr", + ":GrProcessorAnalysis_hdr", + ":GrProcessor_hdr", + ":GrSurfaceProxyView_hdr", + "//include/gpu:GrTypes_hdr", + "//src/gpu:Blend_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrXferProcessor_src", + srcs = ["GrXferProcessor.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrPipeline_hdr", + ":GrXferProcessor_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + ], +) + +generated_cc_atom( + name = "GrYUVABackendTextures_src", + srcs = ["GrYUVABackendTextures.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrYUVABackendTextures_hdr", + "//src/core:SkYUVAInfoLocation_hdr", + ], +) + +generated_cc_atom( + name = "GrYUVATextureProxies_hdr", + hdrs = ["GrYUVATextureProxies.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrSurfaceProxyView_hdr", + ":GrSurfaceProxy_hdr", + "//include/core:SkYUVAInfo_hdr", + "//src/core:SkYUVAInfoLocation_hdr", + ], +) + +generated_cc_atom( + name = "GrYUVATextureProxies_src", + srcs = ["GrYUVATextureProxies.cpp"], + visibility = ["//:__subpackages__"], + deps = [":GrYUVATextureProxies_hdr"], +) + +generated_cc_atom( + name = "SkGr_hdr", + hdrs = ["SkGr.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrColor_hdr", + ":GrSamplerState_hdr", + "//include/core:SkBlender_hdr", + "//include/core:SkCanvas_hdr", + "//include/core:SkColor_hdr", + "//include/core:SkImageInfo_hdr", + "//include/core:SkSamplingOptions_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkColorData_hdr", + "//src/core:SkBlendModePriv_hdr", + "//src/gpu:Blend_hdr", + ], +) + +generated_cc_atom( + name = "SkGr_src", + srcs = ["SkGr.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrCaps_hdr", + ":GrColorInfo_hdr", + ":GrColorSpaceXform_hdr", + ":GrGpuResourcePriv_hdr", + ":GrPaint_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrTextureProxy_hdr", + ":GrXferProcessor_hdr", + ":SkGr_hdr", + "//include/core:SkCanvas_hdr", + "//include/core:SkColorFilter_hdr", + "//include/core:SkData_hdr", + "//include/core:SkPixelRef_hdr", + "//include/effects:SkRuntimeEffect_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//include/private:SkIDChangeListener_hdr", + "//include/private:SkImageInfoPriv_hdr", + "//include/private:SkTPin_hdr", + "//include/private:SkTemplates_hdr", + "//src/core:SkAutoMalloc_hdr", + "//src/core:SkBlendModePriv_hdr", + "//src/core:SkBlenderBase_hdr", + "//src/core:SkColorFilterBase_hdr", + "//src/core:SkColorSpacePriv_hdr", + "//src/core:SkImagePriv_hdr", + "//src/core:SkMaskFilterBase_hdr", + "//src/core:SkMessageBus_hdr", + "//src/core:SkMipmap_hdr", + "//src/core:SkPaintPriv_hdr", + "//src/core:SkResourceCache_hdr", + "//src/core:SkRuntimeEffectPriv_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/image:SkImage_Base_hdr", + "//src/shaders:SkShaderBase_hdr", + ], +) + +generated_cc_atom( + name = "SurfaceContext_hdr", + hdrs = ["SurfaceContext.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrColorInfo_hdr", + ":GrDataUtils_hdr", + ":GrImageInfo_hdr", + ":GrPixmap_hdr", + ":GrRenderTask_hdr", + ":GrSurfaceProxyView_hdr", + ":GrSurfaceProxy_hdr", + "//include/core:SkImage_hdr", + "//include/core:SkRect_hdr", + "//include/core:SkRefCnt_hdr", + "//include/core:SkSamplingOptions_hdr", + "//include/core:SkSurface_hdr", + ], +) + +generated_cc_atom( + name = "SurfaceContext_src", + srcs = ["SurfaceContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrClientMappedBufferManager_hdr", + ":GrColorSpaceXform_hdr", + ":GrDataUtils_hdr", + ":GrDirectContextPriv_hdr", + ":GrDrawingManager_hdr", + ":GrGpu_hdr", + ":GrImageInfo_hdr", + ":GrProxyProvider_hdr", + ":GrRecordingContextPriv_hdr", + ":GrResourceProvider_hdr", + ":GrTracing_hdr", + ":SkGr_hdr", + ":SurfaceContext_hdr", + ":SurfaceFillContext_hdr", + "//include/core:SkColorSpace_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//src/core:SkAutoPixmapStorage_hdr", + "//src/core:SkMipmap_hdr", + "//src/core:SkYUVMath_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + ], +) + +generated_cc_atom( + name = "SurfaceFillContext_hdr", + hdrs = ["SurfaceFillContext.h"], + visibility = ["//:__subpackages__"], + deps = [":SurfaceContext_hdr"], +) + +generated_cc_atom( + name = "SurfaceFillContext_src", + srcs = ["SurfaceFillContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", + ], +) + +generated_cc_atom( + name = "GrAHardwareBufferUtils_impl_hdr", + hdrs = ["GrAHardwareBufferUtils_impl.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkTypes_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrImageInfo_src", + srcs = ["GrImageInfo.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrImageInfo_hdr", + "//include/core:SkColorSpace_hdr", + "//include/core:SkImageInfo_hdr", + ], +) + +generated_cc_atom( + name = "GrRectanizer_impl_hdr", + hdrs = ["GrRectanizer_impl.h"], + visibility = ["//:__subpackages__"], + deps = ["//include/gpu:GrTypes_hdr"], +) diff --git a/src/gpu/BaseDevice.cpp b/src/gpu/ganesh/BaseDevice.cpp similarity index 92% rename from src/gpu/BaseDevice.cpp rename to src/gpu/ganesh/BaseDevice.cpp index 7c7d573649..cb898b5544 100644 --- a/src/gpu/BaseDevice.cpp +++ b/src/gpu/ganesh/BaseDevice.cpp @@ -5,15 +5,15 @@ * found in the LICENSE file. */ -#include "src/gpu/BaseDevice.h" +#include "src/gpu/ganesh/BaseDevice.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" #define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(fContext->priv().singleOwner()) diff --git a/src/gpu/BaseDevice.h b/src/gpu/ganesh/BaseDevice.h similarity index 100% rename from src/gpu/BaseDevice.h rename to src/gpu/ganesh/BaseDevice.h diff --git a/src/gpu/GrAHardwareBufferImageGenerator.cpp b/src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp similarity index 93% rename from src/gpu/GrAHardwareBufferImageGenerator.cpp rename to src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp index f220b59712..a2be6ef7e5 100644 --- a/src/gpu/GrAHardwareBufferImageGenerator.cpp +++ b/src/gpu/ganesh/GrAHardwareBufferImageGenerator.cpp @@ -12,7 +12,7 @@ #define EGL_EGLEXT_PROTOTYPES -#include "src/gpu/GrAHardwareBufferImageGenerator.h" +#include "src/gpu/ganesh/GrAHardwareBufferImageGenerator.h" #include @@ -21,17 +21,17 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/gl/GrGLTypes.h" #include "src/core/SkMessageBus.h" -#include "src/gpu/GrAHardwareBufferUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrResourceProviderPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrAHardwareBufferUtils_impl.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include #include @@ -40,7 +40,7 @@ #ifdef SK_VULKAN #include "include/gpu/vk/GrVkExtensions.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" #endif #define PROT_CONTENT_EXT_STR "EGL_EXT_protected_content" diff --git a/src/gpu/GrAHardwareBufferImageGenerator.h b/src/gpu/ganesh/GrAHardwareBufferImageGenerator.h similarity index 100% rename from src/gpu/GrAHardwareBufferImageGenerator.h rename to src/gpu/ganesh/GrAHardwareBufferImageGenerator.h diff --git a/src/gpu/GrAHardwareBufferUtils.cpp b/src/gpu/ganesh/GrAHardwareBufferUtils.cpp similarity index 98% rename from src/gpu/GrAHardwareBufferUtils.cpp rename to src/gpu/ganesh/GrAHardwareBufferUtils.cpp index 2d8430f835..23a4bedbbc 100644 --- a/src/gpu/GrAHardwareBufferUtils.cpp +++ b/src/gpu/ganesh/GrAHardwareBufferUtils.cpp @@ -11,7 +11,7 @@ #define GL_GLEXT_PROTOTYPES #define EGL_EGLEXT_PROTOTYPES -#include "src/gpu/GrAHardwareBufferUtils.h" +#include "src/gpu/ganesh/GrAHardwareBufferUtils_impl.h" #include #include @@ -21,13 +21,13 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/gl/GrGLTypes.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkCaps.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" #endif #define PROT_CONTENT_EXT_STR "EGL_EXT_protected_content" diff --git a/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h b/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h new file mode 100644 index 0000000000..7f2a6527e7 --- /dev/null +++ b/src/gpu/ganesh/GrAHardwareBufferUtils_impl.h @@ -0,0 +1,70 @@ +/* + * Copyright 2019 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ +#ifndef GrAHardwareBufferUtils_DEFINED +#define GrAHardwareBufferUtils_DEFINED + +#include "include/core/SkTypes.h" + +#if defined(SK_BUILD_FOR_ANDROID) && __ANDROID_API__ >= 26 + +#include "include/gpu/GrBackendSurface.h" +#include "include/gpu/GrTypes.h" + +class GrDirectContext; + +extern "C" { + typedef struct AHardwareBuffer AHardwareBuffer; +} + +namespace GrAHardwareBufferUtils { + +SkColorType GetSkColorTypeFromBufferFormat(uint32_t bufferFormat); + +GrBackendFormat GetBackendFormat(GrDirectContext* context, AHardwareBuffer* hardwareBuffer, + uint32_t bufferFormat, bool requireKnownFormat); + +typedef void* TexImageCtx; +typedef void (*DeleteImageProc)(TexImageCtx); +typedef void (*UpdateImageProc)(TexImageCtx, GrDirectContext*); + +/** + * Create a GrBackendTexture from AHardwareBuffer + * + * @param context GPU context + * @param hardwareBuffer AHB + * @param width texture width + * @param height texture height + * @param deleteProc returns a function that deletes the texture and + * other GPU resources. Must be invoked on the same + * thread as MakeBackendTexture + * @param updateProc returns a function, that needs to be invoked, when + * AHB buffer content has changed. Must be invoked on + * the same thread as MakeBackendTexture + * @param imageCtx returns an opaque image context, that is passed as + * first argument to deleteProc and updateProc + * @param isProtectedContent if true, GL backend uses EXT_protected_content + * @param backendFormat backend format, usually created with helper + * function GetBackendFormat + * @param isRenderable true if GrBackendTexture can be used as a color + * attachment + * @return valid GrBackendTexture object on success + */ +GrBackendTexture MakeBackendTexture(GrDirectContext* context, AHardwareBuffer* hardwareBuffer, + int width, int height, + DeleteImageProc* deleteProc, + UpdateImageProc* updateProc, + TexImageCtx* imageCtx, + bool isProtectedContent, + const GrBackendFormat& backendFormat, + bool isRenderable, + bool fromAndroidWindow = false); + +} // GrAHardwareBufferUtils + + +#endif +#endif diff --git a/src/gpu/GrAppliedClip.h b/src/gpu/ganesh/GrAppliedClip.h similarity index 97% rename from src/gpu/GrAppliedClip.h rename to src/gpu/ganesh/GrAppliedClip.h index 8004b0eb91..b876d1dc43 100644 --- a/src/gpu/GrAppliedClip.h +++ b/src/gpu/ganesh/GrAppliedClip.h @@ -8,9 +8,9 @@ #ifndef GrAppliedClip_DEFINED #define GrAppliedClip_DEFINED -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrScissorState.h" -#include "src/gpu/GrWindowRectsState.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrScissorState.h" +#include "src/gpu/ganesh/GrWindowRectsState.h" #include "src/core/SkClipStack.h" diff --git a/src/gpu/GrAttachment.cpp b/src/gpu/ganesh/GrAttachment.cpp similarity index 96% rename from src/gpu/GrAttachment.cpp rename to src/gpu/ganesh/GrAttachment.cpp index cece935612..94ac6c25b3 100644 --- a/src/gpu/GrAttachment.cpp +++ b/src/gpu/ganesh/GrAttachment.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/GrAttachment.h" +#include "src/gpu/ganesh/GrAttachment.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrGpu.h" size_t GrAttachment::onGpuMemorySize() const { // The GrTexture[RenderTarget] is built up by a bunch of attachments each of which are their diff --git a/src/gpu/GrAttachment.h b/src/gpu/ganesh/GrAttachment.h similarity index 99% rename from src/gpu/GrAttachment.h rename to src/gpu/ganesh/GrAttachment.h index 5a1a1b8feb..49738a2f73 100644 --- a/src/gpu/GrAttachment.h +++ b/src/gpu/ganesh/GrAttachment.h @@ -9,7 +9,7 @@ #define GrAttachment_DEFINED #include "src/core/SkClipStack.h" -#include "src/gpu/GrSurface.h" +#include "src/gpu/ganesh/GrSurface.h" class GrRenderTarget; diff --git a/src/gpu/GrAuditTrail.cpp b/src/gpu/ganesh/GrAuditTrail.cpp similarity index 98% rename from src/gpu/GrAuditTrail.cpp rename to src/gpu/ganesh/GrAuditTrail.cpp index d8512578ed..972e301d14 100644 --- a/src/gpu/GrAuditTrail.cpp +++ b/src/gpu/ganesh/GrAuditTrail.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/ops/GrOp.h" const int GrAuditTrail::kGrAuditTrailInvalidID = -1; diff --git a/src/gpu/GrAuditTrail.h b/src/gpu/ganesh/GrAuditTrail.h similarity index 99% rename from src/gpu/GrAuditTrail.h rename to src/gpu/ganesh/GrAuditTrail.h index f2d78dcb10..c4616d0b64 100644 --- a/src/gpu/GrAuditTrail.h +++ b/src/gpu/ganesh/GrAuditTrail.h @@ -17,7 +17,7 @@ #include "include/gpu/GrConfig.h" #include "include/private/SkTArray.h" #include "include/private/SkTHash.h" -#include "src/gpu/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" class GrOp; class SkJSONWriter; diff --git a/src/gpu/GrAutoLocaleSetter.h b/src/gpu/ganesh/GrAutoLocaleSetter.h similarity index 100% rename from src/gpu/GrAutoLocaleSetter.h rename to src/gpu/ganesh/GrAutoLocaleSetter.h diff --git a/src/gpu/GrBackendSemaphore.cpp b/src/gpu/ganesh/GrBackendSemaphore.cpp similarity index 100% rename from src/gpu/GrBackendSemaphore.cpp rename to src/gpu/ganesh/GrBackendSemaphore.cpp diff --git a/src/gpu/GrBackendSurface.cpp b/src/gpu/ganesh/GrBackendSurface.cpp similarity index 98% rename from src/gpu/GrBackendSurface.cpp rename to src/gpu/ganesh/GrBackendSurface.cpp index 6a88effa24..8557cfcbb7 100644 --- a/src/gpu/GrBackendSurface.cpp +++ b/src/gpu/ganesh/GrBackendSurface.cpp @@ -8,27 +8,27 @@ #include "include/gpu/GrBackendSurface.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrBackendSurfaceMutableStateImpl.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #ifdef SK_DAWN #include "include/gpu/dawn/GrDawnTypes.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" #endif #ifdef SK_VULKAN #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkImageLayout.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkImageLayout.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #endif #ifdef SK_METAL #include "include/gpu/mtl/GrMtlTypes.h" -#include "src/gpu/mtl/GrMtlCppUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlCppUtil.h" #endif #ifdef SK_DIRECT3D #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/d3d/GrD3DResourceState.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceState.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #endif GrBackendFormat::GrBackendFormat(const GrBackendFormat& that) @@ -400,10 +400,10 @@ bool GrBackendFormat::operator==(const GrBackendFormat& that) const { #include "include/core/SkString.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #endif SkString GrBackendFormat::toStr() const { diff --git a/src/gpu/GrBackendSurfaceMutableState.cpp b/src/gpu/ganesh/GrBackendSurfaceMutableState.cpp similarity index 100% rename from src/gpu/GrBackendSurfaceMutableState.cpp rename to src/gpu/ganesh/GrBackendSurfaceMutableState.cpp diff --git a/src/gpu/GrBackendSurfaceMutableStateImpl.h b/src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h similarity index 100% rename from src/gpu/GrBackendSurfaceMutableStateImpl.h rename to src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h diff --git a/src/gpu/GrBackendTextureImageGenerator.cpp b/src/gpu/ganesh/GrBackendTextureImageGenerator.cpp similarity index 95% rename from src/gpu/GrBackendTextureImageGenerator.cpp rename to src/gpu/ganesh/GrBackendTextureImageGenerator.cpp index 4855f70d23..e96c7b1275 100644 --- a/src/gpu/GrBackendTextureImageGenerator.cpp +++ b/src/gpu/ganesh/GrBackendTextureImageGenerator.cpp @@ -9,19 +9,19 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkMessageBus.h" -#include "src/gpu/GrBackendTextureImageGenerator.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrResourceProviderPriv.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/gl/GrGLTexture.h" +#include "src/gpu/ganesh/GrBackendTextureImageGenerator.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" GrBackendTextureImageGenerator::RefHelper::RefHelper( GrTexture* texture, diff --git a/src/gpu/GrBackendTextureImageGenerator.h b/src/gpu/ganesh/GrBackendTextureImageGenerator.h similarity index 99% rename from src/gpu/GrBackendTextureImageGenerator.h rename to src/gpu/ganesh/GrBackendTextureImageGenerator.h index 591dffc35d..0f7135a616 100644 --- a/src/gpu/GrBackendTextureImageGenerator.h +++ b/src/gpu/ganesh/GrBackendTextureImageGenerator.h @@ -11,8 +11,8 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "include/private/SkMutex.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/ResourceKey.h" +#include "src/gpu/ganesh/GrTexture.h" class GrSemaphore; diff --git a/src/gpu/GrBackendUtils.cpp b/src/gpu/ganesh/GrBackendUtils.cpp similarity index 95% rename from src/gpu/GrBackendUtils.cpp rename to src/gpu/ganesh/GrBackendUtils.cpp index 5b06ea3b62..13013dc86b 100644 --- a/src/gpu/GrBackendUtils.cpp +++ b/src/gpu/ganesh/GrBackendUtils.cpp @@ -5,28 +5,28 @@ * found in the LICENSE file. */ -#include "src/gpu/GrBackendUtils.h" +#include "src/gpu/ganesh/GrBackendUtils.h" -#include "src/gpu/GrDataUtils.h" +#include "src/gpu/ganesh/GrDataUtils.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #endif #ifdef SK_DIRECT3D -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #endif #ifdef SK_METAL -#include "src/gpu/mtl/GrMtlCppUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlCppUtil.h" #endif #ifdef SK_DAWN -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" #endif SkImage::CompressionType GrBackendFormatToCompressionType(const GrBackendFormat& format) { diff --git a/src/gpu/GrBackendUtils.h b/src/gpu/ganesh/GrBackendUtils.h similarity index 100% rename from src/gpu/GrBackendUtils.h rename to src/gpu/ganesh/GrBackendUtils.h diff --git a/src/gpu/GrBaseContextPriv.h b/src/gpu/ganesh/GrBaseContextPriv.h similarity index 100% rename from src/gpu/GrBaseContextPriv.h rename to src/gpu/ganesh/GrBaseContextPriv.h diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/ganesh/GrBlurUtils.cpp similarity index 97% rename from src/gpu/GrBlurUtils.cpp rename to src/gpu/ganesh/GrBlurUtils.cpp index 5d6317ef66..0ed44b0c7d 100644 --- a/src/gpu/GrBlurUtils.cpp +++ b/src/gpu/ganesh/GrBlurUtils.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrBlurUtils.h" +#include "src/gpu/ganesh/GrBlurUtils.h" #if SK_GPU_V1 @@ -18,20 +18,20 @@ #include "src/core/SkMaskFilterBase.h" #include "src/core/SkMatrixProvider.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFixedClip.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFixedClip.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" static bool clip_bounds_quick_reject(const SkIRect& clipBounds, const SkIRect& rect) { return clipBounds.isEmpty() || rect.isEmpty() || !SkIRect::Intersects(clipBounds, rect); diff --git a/src/gpu/GrBlurUtils.h b/src/gpu/ganesh/GrBlurUtils.h similarity index 100% rename from src/gpu/GrBlurUtils.h rename to src/gpu/ganesh/GrBlurUtils.h diff --git a/src/gpu/GrBuffer.h b/src/gpu/ganesh/GrBuffer.h similarity index 100% rename from src/gpu/GrBuffer.h rename to src/gpu/ganesh/GrBuffer.h diff --git a/src/gpu/GrBufferAllocPool.cpp b/src/gpu/ganesh/GrBufferAllocPool.cpp similarity index 98% rename from src/gpu/GrBufferAllocPool.cpp rename to src/gpu/ganesh/GrBufferAllocPool.cpp index 4ec84c1d8e..ca02ea0472 100644 --- a/src/gpu/GrBufferAllocPool.cpp +++ b/src/gpu/ganesh/GrBufferAllocPool.cpp @@ -10,15 +10,15 @@ #include "include/private/SkMacros.h" #include "src/core/SkSafeMath.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrBufferAllocPool.h" +#include "src/gpu/ganesh/GrBufferAllocPool.h" #include -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrCpuBuffer.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrCpuBuffer.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrResourceProvider.h" sk_sp GrBufferAllocPool::CpuBufferCache::Make( int maxBuffersToCache) { diff --git a/src/gpu/GrBufferAllocPool.h b/src/gpu/ganesh/GrBufferAllocPool.h similarity index 99% rename from src/gpu/GrBufferAllocPool.h rename to src/gpu/ganesh/GrBufferAllocPool.h index ecb9006ae5..da6561ab7d 100644 --- a/src/gpu/GrBufferAllocPool.h +++ b/src/gpu/ganesh/GrBufferAllocPool.h @@ -13,9 +13,9 @@ #include "include/private/SkNoncopyable.h" #include "include/private/SkTArray.h" #include "include/private/SkTDArray.h" -#include "src/gpu/GrCpuBuffer.h" -#include "src/gpu/GrDrawIndirectCommand.h" -#include "src/gpu/GrNonAtomicRef.h" +#include "src/gpu/ganesh/GrCpuBuffer.h" +#include "src/gpu/ganesh/GrDrawIndirectCommand.h" +#include "src/gpu/ganesh/GrNonAtomicRef.h" class GrGpu; diff --git a/src/gpu/GrCaps.cpp b/src/gpu/ganesh/GrCaps.cpp similarity index 98% rename from src/gpu/GrCaps.cpp rename to src/gpu/ganesh/GrCaps.cpp index dc9becc036..18ffea2e23 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/ganesh/GrCaps.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/GrCaps.h" +#include "src/gpu/ganesh/GrCaps.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrContextOptions.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrWindowRectangles.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrWindowRectangles.h" GrCaps::GrCaps(const GrContextOptions& options) { fNPOTTextureTileSupport = false; @@ -166,7 +166,7 @@ void GrCaps::applyOptionsOverrides(const GrContextOptions& options) { #ifdef SK_ENABLE_DUMP_GPU -#include "src/gpu/GrTestUtils.h" +#include "src/gpu/ganesh/GrTestUtils.h" #include "src/utils/SkJSONWriter.h" static SkString map_flags_to_string(uint32_t flags) { diff --git a/src/gpu/GrCaps.h b/src/gpu/ganesh/GrCaps.h similarity index 99% rename from src/gpu/GrCaps.h rename to src/gpu/ganesh/GrCaps.h index 9739d4d478..3a568c0cc4 100644 --- a/src/gpu/GrCaps.h +++ b/src/gpu/ganesh/GrCaps.h @@ -15,10 +15,10 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkCompressedDataUtils.h" #include "src/gpu/Blend.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrSurfaceProxy.h" #include "src/gpu/Swizzle.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" class GrBackendFormat; class GrBackendRenderTarget; diff --git a/src/gpu/GrClientMappedBufferManager.cpp b/src/gpu/ganesh/GrClientMappedBufferManager.cpp similarity index 97% rename from src/gpu/GrClientMappedBufferManager.cpp rename to src/gpu/ganesh/GrClientMappedBufferManager.cpp index 316e47e2c6..c3cbf933ab 100644 --- a/src/gpu/GrClientMappedBufferManager.cpp +++ b/src/gpu/ganesh/GrClientMappedBufferManager.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrClientMappedBufferManager.h" +#include "src/gpu/ganesh/GrClientMappedBufferManager.h" #include diff --git a/src/gpu/GrClientMappedBufferManager.h b/src/gpu/ganesh/GrClientMappedBufferManager.h similarity index 98% rename from src/gpu/GrClientMappedBufferManager.h rename to src/gpu/ganesh/GrClientMappedBufferManager.h index a77e5982c0..92d632fe8e 100644 --- a/src/gpu/GrClientMappedBufferManager.h +++ b/src/gpu/ganesh/GrClientMappedBufferManager.h @@ -11,7 +11,7 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/SkTArray.h" #include "src/core/SkMessageBus.h" -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" #include /** diff --git a/src/gpu/GrClip.h b/src/gpu/ganesh/GrClip.h similarity index 99% rename from src/gpu/GrClip.h rename to src/gpu/ganesh/GrClip.h index c319aaec8b..777c56ca2a 100644 --- a/src/gpu/GrClip.h +++ b/src/gpu/ganesh/GrClip.h @@ -10,7 +10,7 @@ #include "include/core/SkRRect.h" #include "include/core/SkRect.h" -#include "src/gpu/GrAppliedClip.h" +#include "src/gpu/ganesh/GrAppliedClip.h" class GrDrawOp; namespace skgpu { namespace v1 { class SurfaceDrawContext; }} diff --git a/src/gpu/GrColor.h b/src/gpu/ganesh/GrColor.h similarity index 100% rename from src/gpu/GrColor.h rename to src/gpu/ganesh/GrColor.h diff --git a/src/gpu/GrColorInfo.cpp b/src/gpu/ganesh/GrColorInfo.cpp similarity index 97% rename from src/gpu/GrColorInfo.cpp rename to src/gpu/ganesh/GrColorInfo.cpp index e108a7d703..aff8f73537 100644 --- a/src/gpu/GrColorInfo.cpp +++ b/src/gpu/ganesh/GrColorInfo.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrColorInfo.h" +#include "src/gpu/ganesh/GrColorInfo.h" #include "include/core/SkColorSpace.h" #include "include/core/SkImageInfo.h" diff --git a/src/gpu/GrColorInfo.h b/src/gpu/ganesh/GrColorInfo.h similarity index 97% rename from src/gpu/GrColorInfo.h rename to src/gpu/ganesh/GrColorInfo.h index 7ee0410f15..30d21dd3fe 100644 --- a/src/gpu/GrColorInfo.h +++ b/src/gpu/ganesh/GrColorInfo.h @@ -11,7 +11,7 @@ #include "include/core/SkAlphaType.h" #include "include/core/SkRefCnt.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" class SkColorInfo; class SkColorSpace; diff --git a/src/gpu/GrColorSpaceXform.cpp b/src/gpu/ganesh/GrColorSpaceXform.cpp similarity index 96% rename from src/gpu/GrColorSpaceXform.cpp rename to src/gpu/ganesh/GrColorSpaceXform.cpp index 7d00ee3ebf..c5de82f007 100644 --- a/src/gpu/GrColorSpaceXform.cpp +++ b/src/gpu/ganesh/GrColorSpaceXform.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" #include "include/core/SkString.h" #include "include/third_party/skcms/skcms.h" #include "src/core/SkColorSpacePriv.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" #include #include diff --git a/src/gpu/GrColorSpaceXform.h b/src/gpu/ganesh/GrColorSpaceXform.h similarity index 98% rename from src/gpu/GrColorSpaceXform.h rename to src/gpu/ganesh/GrColorSpaceXform.h index ab0ba5a559..35df50e0a4 100644 --- a/src/gpu/GrColorSpaceXform.h +++ b/src/gpu/ganesh/GrColorSpaceXform.h @@ -13,7 +13,7 @@ #include "include/core/SkRefCnt.h" #include "include/private/SkColorData.h" #include "src/core/SkColorSpaceXformSteps.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #include #include diff --git a/src/gpu/GrContextThreadSafeProxy.cpp b/src/gpu/ganesh/GrContextThreadSafeProxy.cpp similarity index 95% rename from src/gpu/GrContextThreadSafeProxy.cpp rename to src/gpu/ganesh/GrContextThreadSafeProxy.cpp index fe5354a00e..2ec8c8ff48 100644 --- a/src/gpu/GrContextThreadSafeProxy.cpp +++ b/src/gpu/ganesh/GrContextThreadSafeProxy.cpp @@ -8,18 +8,18 @@ #include #include "include/gpu/GrContextThreadSafeProxy.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" #include "include/core/SkSurfaceCharacterization.h" -#include "src/gpu/GrBaseContextPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/GrBaseContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" #include "src/image/SkSurface_Gpu.h" #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" #endif static int32_t next_id() { diff --git a/src/gpu/GrContextThreadSafeProxyPriv.h b/src/gpu/ganesh/GrContextThreadSafeProxyPriv.h similarity index 96% rename from src/gpu/GrContextThreadSafeProxyPriv.h rename to src/gpu/ganesh/GrContextThreadSafeProxyPriv.h index 36335603c9..36eee098bb 100644 --- a/src/gpu/GrContextThreadSafeProxyPriv.h +++ b/src/gpu/ganesh/GrContextThreadSafeProxyPriv.h @@ -11,8 +11,8 @@ #include "include/gpu/GrContextThreadSafeProxy.h" #include "include/private/GrContext_Base.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" /** * Class that adds methods to GrContextThreadSafeProxy that are only intended for use internal to diff --git a/src/gpu/GrContext_Base.cpp b/src/gpu/ganesh/GrContext_Base.cpp similarity index 92% rename from src/gpu/GrContext_Base.cpp rename to src/gpu/ganesh/GrContext_Base.cpp index c672d56599..495662e62c 100644 --- a/src/gpu/GrContext_Base.cpp +++ b/src/gpu/ganesh/GrContext_Base.cpp @@ -8,10 +8,10 @@ #include "include/private/GrContext_Base.h" #include "include/gpu/ShaderErrorHandler.h" -#include "src/gpu/GrBaseContextPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/GrBaseContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" GrContext_Base::GrContext_Base(sk_sp proxy) : fThreadSafeProxy(std::move(proxy)) { diff --git a/src/gpu/GrCopyRenderTask.cpp b/src/gpu/ganesh/GrCopyRenderTask.cpp similarity index 94% rename from src/gpu/GrCopyRenderTask.cpp rename to src/gpu/ganesh/GrCopyRenderTask.cpp index 0a8fbdd3b0..098b80d660 100644 --- a/src/gpu/GrCopyRenderTask.cpp +++ b/src/gpu/ganesh/GrCopyRenderTask.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/GrCopyRenderTask.h" +#include "src/gpu/ganesh/GrCopyRenderTask.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrResourceAllocator.h" -#include "src/gpu/geometry/GrRect.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" +#include "src/gpu/ganesh/geometry/GrRect.h" sk_sp GrCopyRenderTask::Make(GrDrawingManager* drawingMgr, sk_sp src, diff --git a/src/gpu/GrCopyRenderTask.h b/src/gpu/ganesh/GrCopyRenderTask.h similarity index 97% rename from src/gpu/GrCopyRenderTask.h rename to src/gpu/ganesh/GrCopyRenderTask.h index 6bfb4db62f..716d46730b 100644 --- a/src/gpu/GrCopyRenderTask.h +++ b/src/gpu/ganesh/GrCopyRenderTask.h @@ -8,7 +8,7 @@ #ifndef GrCopyRenderTask_DEFINED #define GrCopyRenderTask_DEFINED -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" class GrCopyRenderTask final : public GrRenderTask { public: diff --git a/src/gpu/GrCpuBuffer.h b/src/gpu/ganesh/GrCpuBuffer.h similarity index 94% rename from src/gpu/GrCpuBuffer.h rename to src/gpu/ganesh/GrCpuBuffer.h index 5149766676..810714e1f7 100644 --- a/src/gpu/GrCpuBuffer.h +++ b/src/gpu/ganesh/GrCpuBuffer.h @@ -9,8 +9,8 @@ #define GrCpuBuffer_DEFINED #include "src/core/SkSafeMath.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrNonAtomicRef.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrNonAtomicRef.h" class GrCpuBuffer final : public GrNonAtomicRef, public GrBuffer { public: diff --git a/src/gpu/GrDDLContext.cpp b/src/gpu/ganesh/GrDDLContext.cpp similarity index 92% rename from src/gpu/GrDDLContext.cpp rename to src/gpu/ganesh/GrDDLContext.cpp index e3bb42fa1f..82725c23f5 100644 --- a/src/gpu/GrDDLContext.cpp +++ b/src/gpu/ganesh/GrDDLContext.cpp @@ -7,12 +7,12 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkLRUCache.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" /** * The DDL Context is the one in effect during DDL Recording. It isn't backed by a GrGPU and diff --git a/src/gpu/GrDDLTask.cpp b/src/gpu/ganesh/GrDDLTask.cpp similarity index 97% rename from src/gpu/GrDDLTask.cpp rename to src/gpu/ganesh/GrDDLTask.cpp index aeefd5a2ca..df6e95cbd6 100644 --- a/src/gpu/GrDDLTask.cpp +++ b/src/gpu/ganesh/GrDDLTask.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDDLTask.h" +#include "src/gpu/ganesh/GrDDLTask.h" #include "include/core/SkDeferredDisplayList.h" #include "src/core/SkDeferredDisplayListPriv.h" -#include "src/gpu/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" GrDDLTask::GrDDLTask(GrDrawingManager* drawingMgr, sk_sp ddlTarget, diff --git a/src/gpu/GrDDLTask.h b/src/gpu/ganesh/GrDDLTask.h similarity index 98% rename from src/gpu/GrDDLTask.h rename to src/gpu/ganesh/GrDDLTask.h index ba121e4e84..4b492529f2 100644 --- a/src/gpu/GrDDLTask.h +++ b/src/gpu/ganesh/GrDDLTask.h @@ -9,7 +9,7 @@ #define GrDDLTask_DEFINED #include "include/core/SkPoint.h" -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" class GrRenderTargetProxy; diff --git a/src/gpu/GrDataUtils.cpp b/src/gpu/ganesh/GrDataUtils.cpp similarity index 99% rename from src/gpu/GrDataUtils.cpp rename to src/gpu/ganesh/GrDataUtils.cpp index a30434bf5e..709ad5433f 100644 --- a/src/gpu/GrDataUtils.cpp +++ b/src/gpu/ganesh/GrDataUtils.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDataUtils.h" +#include "src/gpu/ganesh/GrDataUtils.h" #include "include/core/SkColorSpace.h" #include "include/private/SkTPin.h" @@ -19,11 +19,11 @@ #include "src/core/SkTLazy.h" #include "src/core/SkTraceEvent.h" #include "src/core/SkUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrPixmap.h" #include "src/gpu/Swizzle.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrPixmap.h" struct ETC1Block { uint32_t fHigh; diff --git a/src/gpu/GrDataUtils.h b/src/gpu/ganesh/GrDataUtils.h similarity index 100% rename from src/gpu/GrDataUtils.h rename to src/gpu/ganesh/GrDataUtils.h diff --git a/src/gpu/GrDefaultGeoProcFactory.cpp b/src/gpu/ganesh/GrDefaultGeoProcFactory.cpp similarity index 97% rename from src/gpu/GrDefaultGeoProcFactory.cpp rename to src/gpu/ganesh/GrDefaultGeoProcFactory.cpp index b2918e5581..13a449ead6 100644 --- a/src/gpu/GrDefaultGeoProcFactory.cpp +++ b/src/gpu/ganesh/GrDefaultGeoProcFactory.cpp @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" #include "include/core/SkRefCnt.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGeometryProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" /* * The default Geometry Processor simply takes position and multiplies it by the uniform view diff --git a/src/gpu/GrDefaultGeoProcFactory.h b/src/gpu/ganesh/GrDefaultGeoProcFactory.h similarity index 98% rename from src/gpu/GrDefaultGeoProcFactory.h rename to src/gpu/ganesh/GrDefaultGeoProcFactory.h index e7c2247ab7..44d8f79dc3 100644 --- a/src/gpu/GrDefaultGeoProcFactory.h +++ b/src/gpu/ganesh/GrDefaultGeoProcFactory.h @@ -8,7 +8,7 @@ #ifndef GrDefaultGeoProcFactory_DEFINED #define GrDefaultGeoProcFactory_DEFINED -#include "src/gpu/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" /* * A factory for creating default Geometry Processors which simply multiply position by the uniform diff --git a/src/gpu/GrDeferredProxyUploader.h b/src/gpu/ganesh/GrDeferredProxyUploader.h similarity index 98% rename from src/gpu/GrDeferredProxyUploader.h rename to src/gpu/ganesh/GrDeferredProxyUploader.h index 34f077c76a..fbdc503589 100644 --- a/src/gpu/GrDeferredProxyUploader.h +++ b/src/gpu/ganesh/GrDeferredProxyUploader.h @@ -12,8 +12,8 @@ #include "include/private/SkSemaphore.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" /** * GrDeferredProxyUploader assists with threaded generation of textures. Currently used by both diff --git a/src/gpu/GrDeferredUpload.h b/src/gpu/ganesh/GrDeferredUpload.h similarity index 100% rename from src/gpu/GrDeferredUpload.h rename to src/gpu/ganesh/GrDeferredUpload.h diff --git a/src/gpu/GrDirectContext.cpp b/src/gpu/ganesh/GrDirectContext.cpp similarity index 97% rename from src/gpu/GrDirectContext.cpp rename to src/gpu/ganesh/GrDirectContext.cpp index 1e6c71a50f..abec1a933e 100644 --- a/src/gpu/GrDirectContext.cpp +++ b/src/gpu/ganesh/GrDirectContext.cpp @@ -14,24 +14,24 @@ #include "src/core/SkAutoMalloc.h" #include "src/core/SkTaskGroup.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrClientMappedBufferManager.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/mock/GrMockGpu.h" -#include "src/gpu/text/GrAtlasManager.h" -#include "src/gpu/text/GrStrikeCache.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrClientMappedBufferManager.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" #include "src/image/SkImage_GpuBase.h" #include "src/utils/SkShaderUtils.h" #if SK_GPU_V1 -#include "src/gpu/ops/SmallPathAtlasMgr.h" +#include "src/gpu/ganesh/ops/SmallPathAtlasMgr.h" #else // A vestigial definition for v2 that will never be instantiated namespace skgpu::v1 { @@ -43,20 +43,20 @@ public: } #endif #ifdef SK_GL -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #endif #ifdef SK_METAL #include "include/gpu/mtl/GrMtlBackendContext.h" -#include "src/gpu/mtl/GrMtlTrampoline.h" +#include "src/gpu/ganesh/mtl/GrMtlTrampoline.h" #endif #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" #endif #ifdef SK_DIRECT3D -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" #endif #ifdef SK_DAWN -#include "src/gpu/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" #endif #include diff --git a/src/gpu/GrDirectContextPriv.cpp b/src/gpu/ganesh/GrDirectContextPriv.cpp similarity index 94% rename from src/gpu/GrDirectContextPriv.cpp rename to src/gpu/ganesh/GrDirectContextPriv.cpp index 04e3736026..fa0c2bcbde 100644 --- a/src/gpu/GrDirectContextPriv.cpp +++ b/src/gpu/ganesh/GrDirectContextPriv.cpp @@ -5,27 +5,27 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "include/core/SkBitmap.h" #include "include/gpu/GrContextThreadSafeProxy.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/text/GrAtlasManager.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" diff --git a/src/gpu/GrDirectContextPriv.h b/src/gpu/ganesh/GrDirectContextPriv.h similarity index 98% rename from src/gpu/GrDirectContextPriv.h rename to src/gpu/ganesh/GrDirectContextPriv.h index 523527c067..97defa671b 100644 --- a/src/gpu/GrDirectContextPriv.h +++ b/src/gpu/ganesh/GrDirectContextPriv.h @@ -11,8 +11,8 @@ #include "include/core/SkSpan.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/BaseDevice.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" class GrAtlasManager; class GrBackendFormat; diff --git a/src/gpu/GrDistanceFieldGenFromVector.cpp b/src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp similarity index 99% rename from src/gpu/GrDistanceFieldGenFromVector.cpp rename to src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp index d6ed1cf34c..f97618aaff 100644 --- a/src/gpu/GrDistanceFieldGenFromVector.cpp +++ b/src/gpu/ganesh/GrDistanceFieldGenFromVector.cpp @@ -6,7 +6,7 @@ */ #include "src/core/SkDistanceFieldGen.h" -#include "src/gpu/GrDistanceFieldGenFromVector.h" +#include "src/gpu/ganesh/GrDistanceFieldGenFromVector.h" #include "include/core/SkMatrix.h" #include "include/gpu/GrConfig.h" @@ -15,7 +15,7 @@ #include "src/core/SkGeometry.h" #include "src/core/SkPointPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" namespace { // TODO: should we make this real (i.e. src/core) and distinguish it from diff --git a/src/gpu/GrDistanceFieldGenFromVector.h b/src/gpu/ganesh/GrDistanceFieldGenFromVector.h similarity index 100% rename from src/gpu/GrDistanceFieldGenFromVector.h rename to src/gpu/ganesh/GrDistanceFieldGenFromVector.h diff --git a/src/gpu/GrDrawIndirectCommand.h b/src/gpu/ganesh/GrDrawIndirectCommand.h similarity index 100% rename from src/gpu/GrDrawIndirectCommand.h rename to src/gpu/ganesh/GrDrawIndirectCommand.h diff --git a/src/gpu/GrDrawOpAtlas.cpp b/src/gpu/ganesh/GrDrawOpAtlas.cpp similarity index 98% rename from src/gpu/GrDrawOpAtlas.cpp rename to src/gpu/ganesh/GrDrawOpAtlas.cpp index 32e4ad785a..6eb42f7f89 100644 --- a/src/gpu/GrDrawOpAtlas.cpp +++ b/src/gpu/ganesh/GrDrawOpAtlas.cpp @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" #include #include "include/private/SkTPin.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrResourceProviderPriv.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTracing.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTracing.h" #ifdef DUMP_ATLAS_DATA static bool gDumpAtlasData = false; diff --git a/src/gpu/GrDrawOpAtlas.h b/src/gpu/ganesh/GrDrawOpAtlas.h similarity index 99% rename from src/gpu/GrDrawOpAtlas.h rename to src/gpu/ganesh/GrDrawOpAtlas.h index 4f4f3e96b9..0b7fc07417 100644 --- a/src/gpu/GrDrawOpAtlas.h +++ b/src/gpu/ganesh/GrDrawOpAtlas.h @@ -15,10 +15,10 @@ #include "include/private/SkTArray.h" #include "src/core/SkIPoint16.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrDeferredUpload.h" -#include "src/gpu/GrRectanizerSkyline.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/geometry/GrRect.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrRectanizerSkyline.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/geometry/GrRect.h" class GrOnFlushResourceProvider; class GrProxyProvider; diff --git a/src/gpu/GrDrawOpTest.cpp b/src/gpu/ganesh/GrDrawOpTest.cpp similarity index 90% rename from src/gpu/GrDrawOpTest.cpp rename to src/gpu/ganesh/GrDrawOpTest.cpp index 2c2e313b4f..3aa6f02d4a 100644 --- a/src/gpu/GrDrawOpTest.cpp +++ b/src/gpu/ganesh/GrDrawOpTest.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" #include "include/core/SkTypes.h" #include "include/private/GrContext_Base.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrBaseContextPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrUserStencilSettings.h" +#include "src/gpu/ganesh/GrBaseContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" #if GR_TEST_UTILS diff --git a/src/gpu/GrDrawOpTest.h b/src/gpu/ganesh/GrDrawOpTest.h similarity index 97% rename from src/gpu/GrDrawOpTest.h rename to src/gpu/ganesh/GrDrawOpTest.h index 9d1fdeb05c..4c54f3a1e0 100644 --- a/src/gpu/GrDrawOpTest.h +++ b/src/gpu/ganesh/GrDrawOpTest.h @@ -9,7 +9,7 @@ #define GrDrawOpTest_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/GrTestUtils.h" +#include "src/gpu/ganesh/GrTestUtils.h" #if GR_TEST_UTILS diff --git a/src/gpu/GrDrawingManager.cpp b/src/gpu/ganesh/GrDrawingManager.cpp similarity index 96% rename from src/gpu/GrDrawingManager.cpp rename to src/gpu/ganesh/GrDrawingManager.cpp index 20663fea36..b728eb470e 100644 --- a/src/gpu/GrDrawingManager.cpp +++ b/src/gpu/ganesh/GrDrawingManager.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDrawingManager.h" +#include "src/gpu/ganesh/GrDrawingManager.h" #include #include @@ -16,36 +16,36 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkDeferredDisplayListPriv.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrClientMappedBufferManager.h" -#include "src/gpu/GrCopyRenderTask.h" -#include "src/gpu/GrDDLTask.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrRenderTask.h" -#include "src/gpu/GrRenderTaskCluster.h" -#include "src/gpu/GrResourceAllocator.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTTopoSort.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/GrTextureResolveRenderTask.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/GrTransferFromRenderTask.h" -#include "src/gpu/GrWaitRenderTask.h" -#include "src/gpu/GrWritePixelsRenderTask.h" -#include "src/gpu/text/GrSDFTControl.h" +#include "src/gpu/ganesh/GrClientMappedBufferManager.h" +#include "src/gpu/ganesh/GrCopyRenderTask.h" +#include "src/gpu/ganesh/GrDDLTask.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTaskCluster.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTTopoSort.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrTextureResolveRenderTask.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/GrTransferFromRenderTask.h" +#include "src/gpu/ganesh/GrWaitRenderTask.h" +#include "src/gpu/ganesh/GrWritePixelsRenderTask.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" #include "src/image/SkSurface_Gpu.h" #if SK_GPU_V1 -#include "src/gpu/ops/OpsTask.h" -#include "src/gpu/ops/SoftwarePathRenderer.h" +#include "src/gpu/ganesh/ops/OpsTask.h" +#include "src/gpu/ganesh/ops/SoftwarePathRenderer.h" #endif /////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/GrDrawingManager.h b/src/gpu/ganesh/GrDrawingManager.h similarity index 97% rename from src/gpu/GrDrawingManager.h rename to src/gpu/ganesh/GrDrawingManager.h index 39510160a8..97390651c0 100644 --- a/src/gpu/GrDrawingManager.h +++ b/src/gpu/ganesh/GrDrawingManager.h @@ -12,15 +12,15 @@ #include "include/core/SkSurface.h" #include "include/private/SkTArray.h" #include "include/private/SkTHash.h" -#include "src/gpu/GrBufferAllocPool.h" -#include "src/gpu/GrDeferredUpload.h" -#include "src/gpu/GrHashMapWithCache.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrBufferAllocPool.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrHashMapWithCache.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" #if SK_GPU_V1 -#include "src/gpu/v1/PathRenderer.h" -#include "src/gpu/v1/PathRendererChain.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRendererChain.h" #endif // Enabling this will print out which path renderers are being chosen diff --git a/src/gpu/GrDriverBugWorkarounds.cpp b/src/gpu/ganesh/GrDriverBugWorkarounds.cpp similarity index 100% rename from src/gpu/GrDriverBugWorkarounds.cpp rename to src/gpu/ganesh/GrDriverBugWorkarounds.cpp diff --git a/src/gpu/GrDstProxyView.h b/src/gpu/ganesh/GrDstProxyView.h similarity index 97% rename from src/gpu/GrDstProxyView.h rename to src/gpu/ganesh/GrDstProxyView.h index 93f9c4a336..c206fdfa98 100644 --- a/src/gpu/GrDstProxyView.h +++ b/src/gpu/ganesh/GrDstProxyView.h @@ -10,7 +10,7 @@ #include "include/gpu/GrTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" /** * GrDstProxyView holds a texture containing the destination pixel values, and an integer-coordinate diff --git a/src/gpu/GrDynamicAtlas.cpp b/src/gpu/ganesh/GrDynamicAtlas.cpp similarity index 94% rename from src/gpu/GrDynamicAtlas.cpp rename to src/gpu/ganesh/GrDynamicAtlas.cpp index 6422d581d2..fb712b600e 100644 --- a/src/gpu/GrDynamicAtlas.cpp +++ b/src/gpu/ganesh/GrDynamicAtlas.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDynamicAtlas.h" +#include "src/gpu/ganesh/GrDynamicAtlas.h" #include "src/core/SkIPoint16.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRectanizerPow2.h" -#include "src/gpu/GrRectanizerSkyline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRectanizerPow2.h" +#include "src/gpu/ganesh/GrRectanizerSkyline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" // Each Node covers a sub-rectangle of the final atlas. When a GrDynamicAtlas runs out of room, we // create a new Node the same size as all combined nodes in the atlas as-is, and then place the new diff --git a/src/gpu/GrDynamicAtlas.h b/src/gpu/ganesh/GrDynamicAtlas.h similarity index 98% rename from src/gpu/GrDynamicAtlas.h rename to src/gpu/ganesh/GrDynamicAtlas.h index 2b076a26ce..c6523f6040 100644 --- a/src/gpu/GrDynamicAtlas.h +++ b/src/gpu/ganesh/GrDynamicAtlas.h @@ -9,7 +9,7 @@ #define GrDynamicAtlas_DEFINED #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" class GrOnFlushResourceProvider; class GrResourceProvider; diff --git a/src/gpu/GrEagerVertexAllocator.cpp b/src/gpu/ganesh/GrEagerVertexAllocator.cpp similarity index 94% rename from src/gpu/GrEagerVertexAllocator.cpp rename to src/gpu/ganesh/GrEagerVertexAllocator.cpp index 86eaf90c7c..4195059ffd 100644 --- a/src/gpu/GrEagerVertexAllocator.cpp +++ b/src/gpu/ganesh/GrEagerVertexAllocator.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" -#include "src/gpu/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" //------------------------------------------------------------------------------------------------- void* GrEagerDynamicVertexAllocator::lock(size_t stride, int eagerCount) { diff --git a/src/gpu/GrEagerVertexAllocator.h b/src/gpu/ganesh/GrEagerVertexAllocator.h similarity index 98% rename from src/gpu/GrEagerVertexAllocator.h rename to src/gpu/ganesh/GrEagerVertexAllocator.h index b6cba664a6..29be9cce22 100644 --- a/src/gpu/GrEagerVertexAllocator.h +++ b/src/gpu/ganesh/GrEagerVertexAllocator.h @@ -9,7 +9,7 @@ #define GrEagerVertexAllocator_DEFINED #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrThreadSafeCache.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" class GrMeshDrawTarget; diff --git a/src/gpu/GrFPArgs.h b/src/gpu/ganesh/GrFPArgs.h similarity index 100% rename from src/gpu/GrFPArgs.h rename to src/gpu/ganesh/GrFPArgs.h diff --git a/src/gpu/GrFinishCallbacks.cpp b/src/gpu/ganesh/GrFinishCallbacks.cpp similarity index 94% rename from src/gpu/GrFinishCallbacks.cpp rename to src/gpu/ganesh/GrFinishCallbacks.cpp index 4c0abf9d3b..5519d2ca63 100644 --- a/src/gpu/GrFinishCallbacks.cpp +++ b/src/gpu/ganesh/GrFinishCallbacks.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "src/gpu/GrFinishCallbacks.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrFinishCallbacks.h" +#include "src/gpu/ganesh/GrGpu.h" GrFinishCallbacks::GrFinishCallbacks(GrGpu* gpu) : fGpu(gpu) {} diff --git a/src/gpu/GrFinishCallbacks.h b/src/gpu/ganesh/GrFinishCallbacks.h similarity index 100% rename from src/gpu/GrFinishCallbacks.h rename to src/gpu/ganesh/GrFinishCallbacks.h diff --git a/src/gpu/GrFixedClip.cpp b/src/gpu/ganesh/GrFixedClip.cpp similarity index 95% rename from src/gpu/GrFixedClip.cpp rename to src/gpu/ganesh/GrFixedClip.cpp index d16f52a946..81ca241ad8 100644 --- a/src/gpu/GrFixedClip.cpp +++ b/src/gpu/ganesh/GrFixedClip.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrFixedClip.h" +#include "src/gpu/ganesh/GrFixedClip.h" -#include "src/gpu/GrAppliedClip.h" +#include "src/gpu/ganesh/GrAppliedClip.h" SkIRect GrFixedClip::getConservativeBounds() const { return fScissorState.rect(); diff --git a/src/gpu/GrFixedClip.h b/src/gpu/ganesh/GrFixedClip.h similarity index 93% rename from src/gpu/GrFixedClip.h rename to src/gpu/ganesh/GrFixedClip.h index d682bee8e5..68341b7fb7 100644 --- a/src/gpu/GrFixedClip.h +++ b/src/gpu/ganesh/GrFixedClip.h @@ -8,9 +8,9 @@ #ifndef GrFixedClip_DEFINED #define GrFixedClip_DEFINED -#include "src/gpu/GrClip.h" -#include "src/gpu/GrScissorState.h" -#include "src/gpu/GrWindowRectsState.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrScissorState.h" +#include "src/gpu/ganesh/GrWindowRectsState.h" /** * Implements GrHardClip with scissor and window rectangles. diff --git a/src/gpu/GrFragmentProcessor.cpp b/src/gpu/ganesh/GrFragmentProcessor.cpp similarity index 98% rename from src/gpu/GrFragmentProcessor.cpp rename to src/gpu/ganesh/GrFragmentProcessor.cpp index fc36e329e4..e230ff1431 100644 --- a/src/gpu/GrFragmentProcessor.cpp +++ b/src/gpu/ganesh/GrFragmentProcessor.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessorAnalysis.h" -#include "src/gpu/GrShaderCaps.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" bool GrFragmentProcessor::isEqual(const GrFragmentProcessor& that) const { if (this->classID() != that.classID()) { diff --git a/src/gpu/GrFragmentProcessor.h b/src/gpu/ganesh/GrFragmentProcessor.h similarity index 99% rename from src/gpu/GrFragmentProcessor.h rename to src/gpu/ganesh/GrFragmentProcessor.h index c191e2f5cc..0f087f020f 100644 --- a/src/gpu/GrFragmentProcessor.h +++ b/src/gpu/ganesh/GrFragmentProcessor.h @@ -11,8 +11,8 @@ #include "include/private/SkMacros.h" #include "include/private/SkSLSampleUsage.h" #include "include/private/SkSLString.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include diff --git a/src/gpu/GrGeometryProcessor.cpp b/src/gpu/ganesh/GrGeometryProcessor.cpp similarity index 98% rename from src/gpu/GrGeometryProcessor.cpp rename to src/gpu/ganesh/GrGeometryProcessor.cpp index f7e6d4a1ed..a5843c1f30 100644 --- a/src/gpu/GrGeometryProcessor.cpp +++ b/src/gpu/ganesh/GrGeometryProcessor.cpp @@ -5,15 +5,15 @@ * found in the LICENSE file. */ -#include "src/gpu/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" #include "src/core/SkMatrixPriv.h" -#include "src/gpu/GrPipeline.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" #include diff --git a/src/gpu/GrGeometryProcessor.h b/src/gpu/ganesh/GrGeometryProcessor.h similarity index 98% rename from src/gpu/GrGeometryProcessor.h rename to src/gpu/ganesh/GrGeometryProcessor.h index 9acca894b3..efd9cb363e 100644 --- a/src/gpu/GrGeometryProcessor.h +++ b/src/gpu/ganesh/GrGeometryProcessor.h @@ -8,15 +8,15 @@ #ifndef GrGeometryProcessor_DEFINED #define GrGeometryProcessor_DEFINED -#include "src/gpu/GrColor.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrShaderVar.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" #include diff --git a/src/gpu/GrGlyph.h b/src/gpu/ganesh/GrGlyph.h similarity index 96% rename from src/gpu/GrGlyph.h rename to src/gpu/ganesh/GrGlyph.h index b50b27daee..a3448a8d06 100644 --- a/src/gpu/GrGlyph.h +++ b/src/gpu/ganesh/GrGlyph.h @@ -11,7 +11,7 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkGlyph.h" #include "src/core/SkMask.h" -#include "src/gpu/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" class GrGlyph { public: diff --git a/src/gpu/GrGpu.cpp b/src/gpu/ganesh/GrGpu.cpp similarity index 97% rename from src/gpu/GrGpu.cpp rename to src/gpu/ganesh/GrGpu.cpp index 9f3bbf73c8..aaf2f2c8c4 100644 --- a/src/gpu/GrGpu.cpp +++ b/src/gpu/ganesh/GrGpu.cpp @@ -6,7 +6,7 @@ */ -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrGpu.h" #include "include/gpu/GrBackendSemaphore.h" #include "include/gpu/GrBackendSurface.h" @@ -14,23 +14,23 @@ #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkMathPriv.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrNativeRect.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrRingBuffer.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrStagingBufferManager.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/GrTracing.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrNativeRect.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrRingBuffer.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrTracing.h" #include "src/sksl/SkSLCompiler.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/GrGpu.h b/src/gpu/ganesh/GrGpu.h similarity index 99% rename from src/gpu/GrGpu.h rename to src/gpu/ganesh/GrGpu.h index 0bcab6a0d4..53147df974 100644 --- a/src/gpu/GrGpu.h +++ b/src/gpu/ganesh/GrGpu.h @@ -14,13 +14,13 @@ #include "include/gpu/GrTypes.h" #include "include/private/SkTArray.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrPixmap.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/RefCntedCallback.h" #include "src/gpu/Swizzle.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrPixmap.h" +#include "src/gpu/ganesh/GrXferProcessor.h" class GrAttachment; class GrBackendRenderTarget; diff --git a/src/gpu/GrGpuBuffer.cpp b/src/gpu/ganesh/GrGpuBuffer.cpp similarity index 95% rename from src/gpu/GrGpuBuffer.cpp rename to src/gpu/ganesh/GrGpuBuffer.cpp index 2f92056252..852d260c3f 100644 --- a/src/gpu/GrGpuBuffer.cpp +++ b/src/gpu/ganesh/GrGpuBuffer.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" GrGpuBuffer::GrGpuBuffer(GrGpu* gpu, size_t sizeInBytes, GrGpuBufferType type, GrAccessPattern pattern, diff --git a/src/gpu/GrGpuBuffer.h b/src/gpu/ganesh/GrGpuBuffer.h similarity index 97% rename from src/gpu/GrGpuBuffer.h rename to src/gpu/ganesh/GrGpuBuffer.h index 176aef0d9d..c936bd57d2 100644 --- a/src/gpu/GrGpuBuffer.h +++ b/src/gpu/ganesh/GrGpuBuffer.h @@ -8,8 +8,8 @@ #ifndef GrGpuBuffer_DEFINED #define GrGpuBuffer_DEFINED -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrGpuResource.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrGpuResource.h" class GrGpu; diff --git a/src/gpu/GrGpuResource.cpp b/src/gpu/ganesh/GrGpuResource.cpp similarity index 97% rename from src/gpu/GrGpuResource.cpp rename to src/gpu/ganesh/GrGpuResource.cpp index e8a3d2afa1..9679921f91 100644 --- a/src/gpu/GrGpuResource.cpp +++ b/src/gpu/ganesh/GrGpuResource.cpp @@ -7,11 +7,11 @@ #include "include/core/SkTraceMemoryDump.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" #include static inline GrResourceCache* get_resource_cache(GrGpu* gpu) { diff --git a/src/gpu/GrGpuResource.h b/src/gpu/ganesh/GrGpuResource.h similarity index 100% rename from src/gpu/GrGpuResource.h rename to src/gpu/ganesh/GrGpuResource.h diff --git a/src/gpu/GrGpuResourceCacheAccess.h b/src/gpu/ganesh/GrGpuResourceCacheAccess.h similarity index 97% rename from src/gpu/GrGpuResourceCacheAccess.h rename to src/gpu/ganesh/GrGpuResourceCacheAccess.h index dcb580ad0b..4feffa836a 100644 --- a/src/gpu/GrGpuResourceCacheAccess.h +++ b/src/gpu/ganesh/GrGpuResourceCacheAccess.h @@ -8,8 +8,8 @@ #ifndef GrGpuResourceCacheAccess_DEFINED #define GrGpuResourceCacheAccess_DEFINED -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" namespace skiatest { class Reporter; diff --git a/src/gpu/GrGpuResourcePriv.h b/src/gpu/ganesh/GrGpuResourcePriv.h similarity index 98% rename from src/gpu/GrGpuResourcePriv.h rename to src/gpu/ganesh/GrGpuResourcePriv.h index 466e1da2e5..c3278f5b69 100644 --- a/src/gpu/GrGpuResourcePriv.h +++ b/src/gpu/ganesh/GrGpuResourcePriv.h @@ -8,7 +8,7 @@ #ifndef GrGpuResourcePriv_DEFINED #define GrGpuResourcePriv_DEFINED -#include "src/gpu/GrGpuResource.h" +#include "src/gpu/ganesh/GrGpuResource.h" /** * This class allows code internal to Skia privileged access to manage the cache keys and budget diff --git a/src/gpu/GrHashMapWithCache.h b/src/gpu/ganesh/GrHashMapWithCache.h similarity index 100% rename from src/gpu/GrHashMapWithCache.h rename to src/gpu/ganesh/GrHashMapWithCache.h diff --git a/src/gpu/GrImageContext.cpp b/src/gpu/ganesh/GrImageContext.cpp similarity index 75% rename from src/gpu/GrImageContext.cpp rename to src/gpu/ganesh/GrImageContext.cpp index dbbf1e66e8..50bbbaa41a 100644 --- a/src/gpu/GrImageContext.cpp +++ b/src/gpu/ganesh/GrImageContext.cpp @@ -9,11 +9,11 @@ #include "include/private/GrImageContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" GrImageContext::GrImageContext(sk_sp proxy) : INHERITED(std::move(proxy)) { diff --git a/src/gpu/GrImageContextPriv.h b/src/gpu/ganesh/GrImageContextPriv.h similarity index 97% rename from src/gpu/GrImageContextPriv.h rename to src/gpu/ganesh/GrImageContextPriv.h index 272a858908..7bd4a0eb0e 100644 --- a/src/gpu/GrImageContextPriv.h +++ b/src/gpu/ganesh/GrImageContextPriv.h @@ -11,7 +11,7 @@ #include "include/private/GrImageContext.h" #include "include/gpu/GrContextThreadSafeProxy.h" -#include "src/gpu/GrBaseContextPriv.h" +#include "src/gpu/ganesh/GrBaseContextPriv.h" /** Class that exposes methods on GrImageContext that are only intended for use internal to Skia. This class is purely a privileged window into GrImageContext. It should never have diff --git a/src/gpu/GrImageInfo.cpp b/src/gpu/ganesh/GrImageInfo.cpp similarity index 98% rename from src/gpu/GrImageInfo.cpp rename to src/gpu/ganesh/GrImageInfo.cpp index 7ddc1d2ecc..768b024b30 100644 --- a/src/gpu/GrImageInfo.cpp +++ b/src/gpu/ganesh/GrImageInfo.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrImageInfo.h" +#include "src/gpu/ganesh/GrImageInfo.h" #include "include/core/SkColorSpace.h" #include "include/core/SkImageInfo.h" diff --git a/src/gpu/GrImageInfo.h b/src/gpu/ganesh/GrImageInfo.h similarity index 98% rename from src/gpu/GrImageInfo.h rename to src/gpu/ganesh/GrImageInfo.h index cb9c3662a2..315d9c944c 100644 --- a/src/gpu/GrImageInfo.h +++ b/src/gpu/ganesh/GrImageInfo.h @@ -12,7 +12,7 @@ #include "include/core/SkRefCnt.h" #include "include/core/SkSize.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrColorInfo.h" +#include "src/gpu/ganesh/GrColorInfo.h" #include diff --git a/src/gpu/GrManagedResource.cpp b/src/gpu/ganesh/GrManagedResource.cpp similarity index 65% rename from src/gpu/GrManagedResource.cpp rename to src/gpu/ganesh/GrManagedResource.cpp index c88728bff4..d6e656f5b2 100644 --- a/src/gpu/GrManagedResource.cpp +++ b/src/gpu/ganesh/GrManagedResource.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrTexture.h" #ifdef SK_TRACE_MANAGED_RESOURCES diff --git a/src/gpu/GrManagedResource.h b/src/gpu/ganesh/GrManagedResource.h similarity index 100% rename from src/gpu/GrManagedResource.h rename to src/gpu/ganesh/GrManagedResource.h diff --git a/src/gpu/GrMemoryPool.cpp b/src/gpu/ganesh/GrMemoryPool.cpp similarity index 99% rename from src/gpu/GrMemoryPool.cpp rename to src/gpu/ganesh/GrMemoryPool.cpp index 60b5316738..f96af5f460 100644 --- a/src/gpu/GrMemoryPool.cpp +++ b/src/gpu/ganesh/GrMemoryPool.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrMemoryPool.h" +#include "src/gpu/ganesh/GrMemoryPool.h" #include "include/private/SkTPin.h" #include "src/core/SkASAN.h" diff --git a/src/gpu/GrMemoryPool.h b/src/gpu/ganesh/GrMemoryPool.h similarity index 100% rename from src/gpu/GrMemoryPool.h rename to src/gpu/ganesh/GrMemoryPool.h diff --git a/src/gpu/GrMeshDrawTarget.cpp b/src/gpu/ganesh/GrMeshDrawTarget.cpp similarity index 95% rename from src/gpu/GrMeshDrawTarget.cpp rename to src/gpu/ganesh/GrMeshDrawTarget.cpp index 3a2491b296..5ede604859 100644 --- a/src/gpu/GrMeshDrawTarget.cpp +++ b/src/gpu/ganesh/GrMeshDrawTarget.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" uint32_t GrMeshDrawTarget::contextUniqueID() const { return this->resourceProvider()->contextUniqueID(); diff --git a/src/gpu/GrMeshDrawTarget.h b/src/gpu/ganesh/GrMeshDrawTarget.h similarity index 98% rename from src/gpu/GrMeshDrawTarget.h rename to src/gpu/ganesh/GrMeshDrawTarget.h index 9ba4389b0d..a5da44bd42 100644 --- a/src/gpu/GrMeshDrawTarget.h +++ b/src/gpu/ganesh/GrMeshDrawTarget.h @@ -8,8 +8,8 @@ #ifndef GrMeshDrawTarget_DEFINED #define GrMeshDrawTarget_DEFINED -#include "src/gpu/GrDrawIndirectCommand.h" -#include "src/gpu/GrSimpleMesh.h" +#include "src/gpu/ganesh/GrDrawIndirectCommand.h" +#include "src/gpu/ganesh/GrSimpleMesh.h" class GrAtlasManager; class GrStrikeCache; diff --git a/src/gpu/GrNativeRect.h b/src/gpu/ganesh/GrNativeRect.h similarity index 100% rename from src/gpu/GrNativeRect.h rename to src/gpu/ganesh/GrNativeRect.h diff --git a/src/gpu/GrNonAtomicRef.h b/src/gpu/ganesh/GrNonAtomicRef.h similarity index 100% rename from src/gpu/GrNonAtomicRef.h rename to src/gpu/ganesh/GrNonAtomicRef.h diff --git a/src/gpu/GrOnFlushResourceProvider.cpp b/src/gpu/ganesh/GrOnFlushResourceProvider.cpp similarity index 66% rename from src/gpu/GrOnFlushResourceProvider.cpp rename to src/gpu/ganesh/GrOnFlushResourceProvider.cpp index b5ff040db0..d4317475ec 100644 --- a/src/gpu/GrOnFlushResourceProvider.cpp +++ b/src/gpu/ganesh/GrOnFlushResourceProvider.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTextureResolveRenderTask.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTextureResolveRenderTask.h" bool GrOnFlushResourceProvider::instatiateProxy(GrSurfaceProxy* proxy) { SkASSERT(proxy->canSkipResourceAllocator()); diff --git a/src/gpu/GrOnFlushResourceProvider.h b/src/gpu/ganesh/GrOnFlushResourceProvider.h similarity index 97% rename from src/gpu/GrOnFlushResourceProvider.h rename to src/gpu/ganesh/GrOnFlushResourceProvider.h index 0a5ab31474..ce6f6cb2fe 100644 --- a/src/gpu/GrOnFlushResourceProvider.h +++ b/src/gpu/ganesh/GrOnFlushResourceProvider.h @@ -9,7 +9,7 @@ #define GrOnFlushResourceProvider_DEFINED #include "include/core/SkSpan.h" -#include "src/gpu/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" class GrCaps; class GrDrawingManager; diff --git a/src/gpu/GrOpFlushState.cpp b/src/gpu/ganesh/GrOpFlushState.cpp similarity index 96% rename from src/gpu/GrOpFlushState.cpp rename to src/gpu/ganesh/GrOpFlushState.cpp index 302b752cc5..1e825e417f 100644 --- a/src/gpu/GrOpFlushState.cpp +++ b/src/gpu/ganesh/GrOpFlushState.cpp @@ -5,19 +5,19 @@ * found in the LICENSE file. */ -#include "src/gpu/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpFlushState.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/GrOpFlushState.h b/src/gpu/ganesh/GrOpFlushState.h similarity index 97% rename from src/gpu/GrOpFlushState.h rename to src/gpu/ganesh/GrOpFlushState.h index 5a0dc29930..1914aaacb2 100644 --- a/src/gpu/GrOpFlushState.h +++ b/src/gpu/ganesh/GrOpFlushState.h @@ -11,13 +11,13 @@ #include #include "src/core/SkArenaAlloc.h" #include "src/core/SkArenaAllocList.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrBufferAllocPool.h" -#include "src/gpu/GrDeferredUpload.h" -#include "src/gpu/GrMeshDrawTarget.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrBufferAllocPool.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" class GrGpu; class GrOpsRenderPass; diff --git a/src/gpu/GrOpsRenderPass.cpp b/src/gpu/ganesh/GrOpsRenderPass.cpp similarity index 96% rename from src/gpu/GrOpsRenderPass.cpp rename to src/gpu/ganesh/GrOpsRenderPass.cpp index f408b3fff0..7b757de1e0 100644 --- a/src/gpu/GrOpsRenderPass.cpp +++ b/src/gpu/ganesh/GrOpsRenderPass.cpp @@ -5,19 +5,19 @@ * found in the LICENSE file. */ -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" #include "include/core/SkRect.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrCpuBuffer.h" -#include "src/gpu/GrDrawIndirectCommand.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrScissorState.h" -#include "src/gpu/GrSimpleMesh.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrCpuBuffer.h" +#include "src/gpu/ganesh/GrDrawIndirectCommand.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrScissorState.h" +#include "src/gpu/ganesh/GrSimpleMesh.h" +#include "src/gpu/ganesh/GrTexture.h" void GrOpsRenderPass::begin() { fDrawPipelineStatus = DrawPipelineStatus::kNotConfigured; diff --git a/src/gpu/GrOpsRenderPass.h b/src/gpu/ganesh/GrOpsRenderPass.h similarity index 99% rename from src/gpu/GrOpsRenderPass.h rename to src/gpu/ganesh/GrOpsRenderPass.h index 523b76c9fe..924a0c5d97 100644 --- a/src/gpu/GrOpsRenderPass.h +++ b/src/gpu/ganesh/GrOpsRenderPass.h @@ -9,8 +9,8 @@ #define GrOpsRenderPass_DEFINED #include "include/core/SkDrawable.h" -#include "src/gpu/GrDeferredUpload.h" -#include "src/gpu/GrPipeline.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrPipeline.h" class GrOpFlushState; class GrGpu; diff --git a/src/gpu/GrOpsTypes.h b/src/gpu/ganesh/GrOpsTypes.h similarity index 95% rename from src/gpu/GrOpsTypes.h rename to src/gpu/ganesh/GrOpsTypes.h index f692841f51..6954401277 100644 --- a/src/gpu/GrOpsTypes.h +++ b/src/gpu/ganesh/GrOpsTypes.h @@ -12,7 +12,7 @@ #include "include/core/SkRect.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" /** Used by SDC::drawQuadSet and FillRectOp */ struct GrQuadSetEntry { diff --git a/src/gpu/GrPaint.cpp b/src/gpu/ganesh/GrPaint.cpp similarity index 86% rename from src/gpu/GrPaint.cpp rename to src/gpu/ganesh/GrPaint.cpp index 4249543491..a1290d9965 100644 --- a/src/gpu/GrPaint.cpp +++ b/src/gpu/ganesh/GrPaint.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrCoverageSetOpXP.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrCoverageSetOpXP.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" GrPaint::GrPaint(const GrPaint& that) : fXPFactory(that.fXPFactory) diff --git a/src/gpu/GrPaint.h b/src/gpu/ganesh/GrPaint.h similarity index 98% rename from src/gpu/GrPaint.h rename to src/gpu/ganesh/GrPaint.h index 9c247c901c..070f7af698 100644 --- a/src/gpu/GrPaint.h +++ b/src/gpu/ganesh/GrPaint.h @@ -14,8 +14,8 @@ #include "include/core/SkRefCnt.h" #include "include/core/SkRegion.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" class GrTextureProxy; class GrXPFactory; diff --git a/src/gpu/GrPersistentCacheUtils.cpp b/src/gpu/ganesh/GrPersistentCacheUtils.cpp similarity index 98% rename from src/gpu/GrPersistentCacheUtils.cpp rename to src/gpu/ganesh/GrPersistentCacheUtils.cpp index 5750226f7c..284e84922d 100644 --- a/src/gpu/GrPersistentCacheUtils.cpp +++ b/src/gpu/ganesh/GrPersistentCacheUtils.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" #include "include/private/SkSLString.h" #include "src/core/SkReadBuffer.h" diff --git a/src/gpu/GrPersistentCacheUtils.h b/src/gpu/ganesh/GrPersistentCacheUtils.h similarity index 100% rename from src/gpu/GrPersistentCacheUtils.h rename to src/gpu/ganesh/GrPersistentCacheUtils.h diff --git a/src/gpu/GrPipeline.cpp b/src/gpu/ganesh/GrPipeline.cpp similarity index 94% rename from src/gpu/GrPipeline.cpp rename to src/gpu/ganesh/GrPipeline.cpp index 325d6e878c..23f741a253 100644 --- a/src/gpu/GrPipeline.cpp +++ b/src/gpu/ganesh/GrPipeline.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/GrPipeline.h" +#include "src/gpu/ganesh/GrPipeline.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" GrPipeline::GrPipeline(const InitArgs& args, sk_sp xferProcessor, diff --git a/src/gpu/GrPipeline.h b/src/gpu/ganesh/GrPipeline.h similarity index 95% rename from src/gpu/GrPipeline.h rename to src/gpu/ganesh/GrPipeline.h index 085b90260f..7957d6852f 100644 --- a/src/gpu/GrPipeline.h +++ b/src/gpu/ganesh/GrPipeline.h @@ -9,15 +9,15 @@ #define GrPipeline_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrDstProxyView.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrScissorState.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/GrWindowRectsState.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrDstProxyView.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrScissorState.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/GrWindowRectsState.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" class GrAppliedClip; class GrAppliedHardClip; diff --git a/src/gpu/GrPixmap.h b/src/gpu/ganesh/GrPixmap.h similarity index 99% rename from src/gpu/GrPixmap.h rename to src/gpu/ganesh/GrPixmap.h index ff49b06d52..87d0d07867 100644 --- a/src/gpu/GrPixmap.h +++ b/src/gpu/ganesh/GrPixmap.h @@ -10,7 +10,7 @@ #include "include/core/SkData.h" #include "include/core/SkPixmap.h" -#include "src/gpu/GrImageInfo.h" +#include "src/gpu/ganesh/GrImageInfo.h" template class GrPixmapBase { public: diff --git a/src/gpu/GrProcessor.cpp b/src/gpu/ganesh/GrProcessor.cpp similarity index 86% rename from src/gpu/GrProcessor.cpp rename to src/gpu/ganesh/GrProcessor.cpp index 2dd6a500c6..64409b0bc3 100644 --- a/src/gpu/GrProcessor.cpp +++ b/src/gpu/ganesh/GrProcessor.cpp @@ -6,12 +6,12 @@ */ #include "include/private/SkSpinlock.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrXferProcessor.h" // We use a global pool protected by a mutex(spinlock). Chrome may use the same GrContext on // different threads. The GrContext is not used concurrently on different threads and there is a diff --git a/src/gpu/GrProcessor.h b/src/gpu/ganesh/GrProcessor.h similarity index 93% rename from src/gpu/GrProcessor.h rename to src/gpu/ganesh/GrProcessor.h index 8617644337..f00a7fe513 100644 --- a/src/gpu/GrProcessor.h +++ b/src/gpu/ganesh/GrProcessor.h @@ -10,14 +10,14 @@ #include "include/core/SkMath.h" #include "include/core/SkString.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrProcessorUnitTest.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrProcessorUnitTest.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" class GrResourceProvider; diff --git a/src/gpu/GrProcessorAnalysis.cpp b/src/gpu/ganesh/GrProcessorAnalysis.cpp similarity index 91% rename from src/gpu/GrProcessorAnalysis.cpp rename to src/gpu/ganesh/GrProcessorAnalysis.cpp index a1624bd449..7e1c84560a 100644 --- a/src/gpu/GrProcessorAnalysis.cpp +++ b/src/gpu/ganesh/GrProcessorAnalysis.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" GrColorFragmentProcessorAnalysis::GrColorFragmentProcessorAnalysis( const GrProcessorAnalysisColor& input, diff --git a/src/gpu/GrProcessorAnalysis.h b/src/gpu/ganesh/GrProcessorAnalysis.h similarity index 100% rename from src/gpu/GrProcessorAnalysis.h rename to src/gpu/ganesh/GrProcessorAnalysis.h diff --git a/src/gpu/GrProcessorSet.cpp b/src/gpu/ganesh/GrProcessorSet.cpp similarity index 96% rename from src/gpu/GrProcessorSet.cpp rename to src/gpu/ganesh/GrProcessorSet.cpp index e2726b2870..9554a00604 100644 --- a/src/gpu/GrProcessorSet.cpp +++ b/src/gpu/ganesh/GrProcessorSet.cpp @@ -6,12 +6,12 @@ */ #include "src/core/SkBlendModePriv.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" const GrProcessorSet& GrProcessorSet::EmptySet() { static GrProcessorSet gEmpty(GrProcessorSet::Empty::kEmpty); diff --git a/src/gpu/GrProcessorSet.h b/src/gpu/ganesh/GrProcessorSet.h similarity index 97% rename from src/gpu/GrProcessorSet.h rename to src/gpu/ganesh/GrProcessorSet.h index 7f29a588cf..5087d5189f 100644 --- a/src/gpu/GrProcessorSet.h +++ b/src/gpu/ganesh/GrProcessorSet.h @@ -9,10 +9,10 @@ #define GrProcessorSet_DEFINED #include "include/private/SkTemplates.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProcessorAnalysis.h" -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrXferProcessor.h" struct GrUserStencilSettings; class GrAppliedClip; diff --git a/src/gpu/GrProcessorUnitTest.cpp b/src/gpu/ganesh/GrProcessorUnitTest.cpp similarity index 97% rename from src/gpu/GrProcessorUnitTest.cpp rename to src/gpu/ganesh/GrProcessorUnitTest.cpp index 5e1fe10d76..813918ae6b 100644 --- a/src/gpu/GrProcessorUnitTest.cpp +++ b/src/gpu/ganesh/GrProcessorUnitTest.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/GrProcessorUnitTest.h" +#include "src/gpu/ganesh/GrProcessorUnitTest.h" #include #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" #if GR_TEST_UTILS diff --git a/src/gpu/GrProcessorUnitTest.h b/src/gpu/ganesh/GrProcessorUnitTest.h similarity index 98% rename from src/gpu/GrProcessorUnitTest.h rename to src/gpu/ganesh/GrProcessorUnitTest.h index 412fd9ed45..d3c647220a 100644 --- a/src/gpu/GrProcessorUnitTest.h +++ b/src/gpu/ganesh/GrProcessorUnitTest.h @@ -14,8 +14,8 @@ #include "include/private/SkTArray.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrTestUtils.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTestUtils.h" +#include "src/gpu/ganesh/GrTextureProxy.h" #include diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/ganesh/GrProgramDesc.cpp similarity index 92% rename from src/gpu/GrProgramDesc.cpp rename to src/gpu/ganesh/GrProgramDesc.cpp index a74c05c8c5..992583be08 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/ganesh/GrProgramDesc.cpp @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProgramDesc.h" #include "include/private/SkChecksum.h" #include "include/private/SkTo.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" enum { kSamplerOrImageTypeKeyBits = 4 diff --git a/src/gpu/GrProgramDesc.h b/src/gpu/ganesh/GrProgramDesc.h similarity index 100% rename from src/gpu/GrProgramDesc.h rename to src/gpu/ganesh/GrProgramDesc.h diff --git a/src/gpu/GrProgramInfo.cpp b/src/gpu/ganesh/GrProgramInfo.cpp similarity index 88% rename from src/gpu/GrProgramInfo.cpp rename to src/gpu/ganesh/GrProgramInfo.cpp index 091d1133ee..47c3b99618 100644 --- a/src/gpu/GrProgramInfo.cpp +++ b/src/gpu/ganesh/GrProgramInfo.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrProgramInfo.h" +#include "src/gpu/ganesh/GrProgramInfo.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" GrStencilSettings GrProgramInfo::nonGLStencilSettings() const { GrStencilSettings stencil; @@ -21,7 +21,7 @@ GrStencilSettings GrProgramInfo::nonGLStencilSettings() const { } #ifdef SK_DEBUG -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrTexture.h" void GrProgramInfo::validate(bool flushTime) const { if (flushTime) { diff --git a/src/gpu/GrProgramInfo.h b/src/gpu/ganesh/GrProgramInfo.h similarity index 98% rename from src/gpu/GrProgramInfo.h rename to src/gpu/ganesh/GrProgramInfo.h index 9f1f602b56..8ddc8d4759 100644 --- a/src/gpu/GrProgramInfo.h +++ b/src/gpu/ganesh/GrProgramInfo.h @@ -9,8 +9,8 @@ #define GrProgramInfo_DEFINED #include "include/gpu/GrTypes.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPipeline.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" class GrStencilSettings; diff --git a/src/gpu/GrProxyProvider.cpp b/src/gpu/ganesh/GrProxyProvider.cpp similarity index 98% rename from src/gpu/GrProxyProvider.cpp rename to src/gpu/ganesh/GrProxyProvider.cpp index eb699ac115..a957ae55bc 100644 --- a/src/gpu/GrProxyProvider.cpp +++ b/src/gpu/ganesh/GrProxyProvider.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrProxyProvider.h" +#include "src/gpu/ganesh/GrProxyProvider.h" #include "include/core/SkBitmap.h" #include "include/core/SkImage.h" @@ -18,18 +18,18 @@ #include "src/core/SkImagePriv.h" #include "src/core/SkMipmap.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxyCacheAccess.h" -#include "src/gpu/GrTextureRenderTargetProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxyCacheAccess.h" +#include "src/gpu/ganesh/GrTextureRenderTargetProxy.h" +#include "src/gpu/ganesh/SkGr.h" #include "src/image/SkImage_Base.h" #ifdef SK_VULKAN diff --git a/src/gpu/GrProxyProvider.h b/src/gpu/ganesh/GrProxyProvider.h similarity index 99% rename from src/gpu/GrProxyProvider.h rename to src/gpu/ganesh/GrProxyProvider.h index 5678bb79c1..ceab2bfd94 100644 --- a/src/gpu/GrProxyProvider.h +++ b/src/gpu/ganesh/GrProxyProvider.h @@ -10,8 +10,8 @@ #include "include/gpu/GrTypes.h" #include "src/core/SkTDynamicHash.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/ResourceKey.h" +#include "src/gpu/ganesh/GrTextureProxy.h" class GrImageContext; class GrBackendRenderTarget; diff --git a/src/gpu/GrRecordingContext.cpp b/src/gpu/ganesh/GrRecordingContext.cpp similarity index 92% rename from src/gpu/GrRecordingContext.cpp rename to src/gpu/ganesh/GrRecordingContext.cpp index 0b893efd9b..6a2ff648c0 100644 --- a/src/gpu/GrRecordingContext.cpp +++ b/src/gpu/ganesh/GrRecordingContext.cpp @@ -9,22 +9,22 @@ #include "include/gpu/GrContextThreadSafeProxy.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/text/GrTextBlob.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" #if SK_GPU_V1 -#include "src/gpu/ops/AtlasTextOp.h" +#include "src/gpu/ganesh/ops/AtlasTextOp.h" #endif GrRecordingContext::ProgramData::ProgramData(std::unique_ptr desc, diff --git a/src/gpu/GrRecordingContextPriv.cpp b/src/gpu/ganesh/GrRecordingContextPriv.cpp similarity index 97% rename from src/gpu/GrRecordingContextPriv.cpp rename to src/gpu/ganesh/GrRecordingContextPriv.cpp index 396e173cc2..5589aeece4 100644 --- a/src/gpu/GrRecordingContextPriv.cpp +++ b/src/gpu/ganesh/GrRecordingContextPriv.cpp @@ -5,19 +5,19 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "include/core/SkColorSpace.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" #if SK_GPU_V1 -#include "src/gpu/v1/Device_v1.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" -#include "src/gpu/v1/SurfaceFillContext_v1.h" +#include "src/gpu/ganesh/v1/Device_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceFillContext_v1.h" #endif void GrRecordingContextPriv::addOnFlushCallbackObject(GrOnFlushCallbackObject* onFlushCBObject) { diff --git a/src/gpu/GrRecordingContextPriv.h b/src/gpu/ganesh/GrRecordingContextPriv.h similarity index 98% rename from src/gpu/GrRecordingContextPriv.h rename to src/gpu/ganesh/GrRecordingContextPriv.h index c76b79d22d..930f1053ce 100644 --- a/src/gpu/GrRecordingContextPriv.h +++ b/src/gpu/ganesh/GrRecordingContextPriv.h @@ -10,10 +10,10 @@ #include "include/core/SkPaint.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/BaseDevice.h" -#include "src/gpu/GrImageContextPriv.h" #include "src/gpu/RefCntedCallback.h" -#include "src/gpu/text/GrSDFTControl.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" class GrImageInfo; class SkDeferredDisplayList; diff --git a/src/gpu/GrRectanizerPow2.cpp b/src/gpu/ganesh/GrRectanizerPow2.cpp similarity index 97% rename from src/gpu/GrRectanizerPow2.cpp rename to src/gpu/ganesh/GrRectanizerPow2.cpp index 9a35bf298d..ced066c4b1 100644 --- a/src/gpu/GrRectanizerPow2.cpp +++ b/src/gpu/ganesh/GrRectanizerPow2.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRectanizerPow2.h" +#include "src/gpu/ganesh/GrRectanizerPow2.h" bool GrRectanizerPow2::addRect(int width, int height, SkIPoint16* loc) { if ((unsigned)width > (unsigned)this->width() || diff --git a/src/gpu/GrRectanizerPow2.h b/src/gpu/ganesh/GrRectanizerPow2.h similarity index 98% rename from src/gpu/GrRectanizerPow2.h rename to src/gpu/ganesh/GrRectanizerPow2.h index 76cf4c43f1..747ca75bec 100644 --- a/src/gpu/GrRectanizerPow2.h +++ b/src/gpu/ganesh/GrRectanizerPow2.h @@ -11,7 +11,7 @@ #include "include/private/SkMalloc.h" #include "src/core/SkIPoint16.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrRectanizer.h" +#include "src/gpu/ganesh/GrRectanizer_impl.h" // This Rectanizer quantizes the incoming rects to powers of 2. Each power // of two can have, at most, one active row/shelf. Once a row/shelf for diff --git a/src/gpu/GrRectanizerSkyline.cpp b/src/gpu/ganesh/GrRectanizerSkyline.cpp similarity index 98% rename from src/gpu/GrRectanizerSkyline.cpp rename to src/gpu/ganesh/GrRectanizerSkyline.cpp index f36b733d1d..aa4828c64d 100644 --- a/src/gpu/GrRectanizerSkyline.cpp +++ b/src/gpu/ganesh/GrRectanizerSkyline.cpp @@ -6,7 +6,7 @@ */ #include "src/core/SkIPoint16.h" -#include "src/gpu/GrRectanizerSkyline.h" +#include "src/gpu/ganesh/GrRectanizerSkyline.h" #include diff --git a/src/gpu/GrRectanizerSkyline.h b/src/gpu/ganesh/GrRectanizerSkyline.h similarity index 97% rename from src/gpu/GrRectanizerSkyline.h rename to src/gpu/ganesh/GrRectanizerSkyline.h index fc629514b6..c9d402015a 100644 --- a/src/gpu/GrRectanizerSkyline.h +++ b/src/gpu/ganesh/GrRectanizerSkyline.h @@ -9,7 +9,7 @@ #define GrRectanizerSkyline_DEFINED #include "include/private/SkTDArray.h" -#include "src/gpu/GrRectanizer.h" +#include "src/gpu/ganesh/GrRectanizer_impl.h" // Pack rectangles and track the current silhouette // Based, in part, on Jukka Jylanki's work at http://clb.demon.fi diff --git a/src/gpu/ganesh/GrRectanizer_impl.h b/src/gpu/ganesh/GrRectanizer_impl.h new file mode 100644 index 0000000000..0b1fff5334 --- /dev/null +++ b/src/gpu/ganesh/GrRectanizer_impl.h @@ -0,0 +1,44 @@ +/* + * Copyright 2010 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef GrRectanizer_DEFINED +#define GrRectanizer_DEFINED + +#include "include/gpu/GrTypes.h" + +struct SkIPoint16; + +class GrRectanizer { +public: + GrRectanizer(int width, int height) : fWidth(width), fHeight(height) { + SkASSERT(width >= 0); + SkASSERT(height >= 0); + } + + virtual ~GrRectanizer() {} + + virtual void reset() = 0; + + int width() const { return fWidth; } + int height() const { return fHeight; } + + // Attempt to add a rect. Return true on success; false on failure. If + // successful the position in the atlas is returned in 'loc'. + virtual bool addRect(int width, int height, SkIPoint16* loc) = 0; + virtual float percentFull() const = 0; + + /** + * Our factory, which returns the subclass du jour + */ + static GrRectanizer* Factory(int width, int height); + +private: + const int fWidth; + const int fHeight; +}; + +#endif diff --git a/src/gpu/GrRefCnt.h b/src/gpu/ganesh/GrRefCnt.h similarity index 98% rename from src/gpu/GrRefCnt.h rename to src/gpu/ganesh/GrRefCnt.h index 8ef7814d04..bf8b6ed329 100644 --- a/src/gpu/GrRefCnt.h +++ b/src/gpu/ganesh/GrRefCnt.h @@ -9,8 +9,8 @@ #define GrRefCnt_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" // We have to use auto for the function pointers here because if the actual functions live on the // base class of T we need the function here to be a pointer to a function of the base class and not diff --git a/src/gpu/GrRenderTarget.cpp b/src/gpu/ganesh/GrRenderTarget.cpp similarity index 90% rename from src/gpu/GrRenderTarget.cpp rename to src/gpu/ganesh/GrRenderTarget.cpp index 5cfe64dfd1..d613287aeb 100644 --- a/src/gpu/GrRenderTarget.cpp +++ b/src/gpu/ganesh/GrRenderTarget.cpp @@ -6,13 +6,13 @@ */ -#include "src/gpu/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTarget.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrStencilSettings.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrStencilSettings.h" GrRenderTarget::GrRenderTarget(GrGpu* gpu, const SkISize& dimensions, diff --git a/src/gpu/GrRenderTarget.h b/src/gpu/ganesh/GrRenderTarget.h similarity index 98% rename from src/gpu/GrRenderTarget.h rename to src/gpu/ganesh/GrRenderTarget.h index 053dd13d54..ec73d8e856 100644 --- a/src/gpu/GrRenderTarget.h +++ b/src/gpu/ganesh/GrRenderTarget.h @@ -9,7 +9,7 @@ #define GrRenderTarget_DEFINED #include "include/core/SkRect.h" -#include "src/gpu/GrSurface.h" +#include "src/gpu/ganesh/GrSurface.h" class GrCaps; class GrAttachment; diff --git a/src/gpu/GrRenderTargetContext.h b/src/gpu/ganesh/GrRenderTargetContext.h similarity index 90% rename from src/gpu/GrRenderTargetContext.h rename to src/gpu/ganesh/GrRenderTargetContext.h index 30764a6e12..ac224915ad 100644 --- a/src/gpu/GrRenderTargetContext.h +++ b/src/gpu/ganesh/GrRenderTargetContext.h @@ -12,7 +12,7 @@ #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" // Android Framework is relying on this header existing and the old name // of skgpu::v1::SurfaceDrawContext. diff --git a/src/gpu/GrRenderTargetProxy.cpp b/src/gpu/ganesh/GrRenderTargetProxy.cpp similarity index 95% rename from src/gpu/GrRenderTargetProxy.cpp rename to src/gpu/ganesh/GrRenderTargetProxy.cpp index 8fd61e9603..c4a07335f5 100644 --- a/src/gpu/GrRenderTargetProxy.cpp +++ b/src/gpu/ganesh/GrRenderTargetProxy.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTextureRenderTargetProxy.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTextureRenderTargetProxy.h" #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif // Deferred version diff --git a/src/gpu/GrRenderTargetProxy.h b/src/gpu/ganesh/GrRenderTargetProxy.h similarity index 97% rename from src/gpu/GrRenderTargetProxy.h rename to src/gpu/ganesh/GrRenderTargetProxy.h index 3f80846ad8..52a5402bc2 100644 --- a/src/gpu/GrRenderTargetProxy.h +++ b/src/gpu/ganesh/GrRenderTargetProxy.h @@ -10,11 +10,11 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrNativeRect.h" -#include "src/gpu/GrSubRunAllocator.h" -#include "src/gpu/GrSurfaceProxy.h" #include "src/gpu/Swizzle.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrNativeRect.h" +#include "src/gpu/ganesh/GrSubRunAllocator.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" class GrResourceProvider; diff --git a/src/gpu/GrRenderTask.cpp b/src/gpu/ganesh/GrRenderTask.cpp similarity index 98% rename from src/gpu/GrRenderTask.cpp rename to src/gpu/ganesh/GrRenderTask.cpp index 22a7604ffa..d8bbbfe12b 100644 --- a/src/gpu/GrRenderTask.cpp +++ b/src/gpu/ganesh/GrRenderTask.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/GrTextureResolveRenderTask.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrTextureResolveRenderTask.h" uint32_t GrRenderTask::CreateUniqueID() { static std::atomic nextID{1}; diff --git a/src/gpu/GrRenderTask.h b/src/gpu/ganesh/GrRenderTask.h similarity index 98% rename from src/gpu/GrRenderTask.h rename to src/gpu/ganesh/GrRenderTask.h index f9b3825add..9c78ab2974 100644 --- a/src/gpu/GrRenderTask.h +++ b/src/gpu/ganesh/GrRenderTask.h @@ -11,9 +11,9 @@ #include "include/core/SkRefCnt.h" #include "include/private/SkTArray.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrTextureResolveManager.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureResolveManager.h" class GrMockRenderTask; class GrOpFlushState; diff --git a/src/gpu/GrRenderTaskCluster.cpp b/src/gpu/ganesh/GrRenderTaskCluster.cpp similarity index 98% rename from src/gpu/GrRenderTaskCluster.cpp rename to src/gpu/ganesh/GrRenderTaskCluster.cpp index b56364796e..1f2c842b3c 100644 --- a/src/gpu/GrRenderTaskCluster.cpp +++ b/src/gpu/ganesh/GrRenderTaskCluster.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRenderTaskCluster.h" +#include "src/gpu/ganesh/GrRenderTaskCluster.h" #include "include/private/SkTHash.h" -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" // Uncomment to get lots of logging. #define CLUSTER_DEBUGF(...) //SkDebugf(__VA_ARGS__) diff --git a/src/gpu/GrRenderTaskCluster.h b/src/gpu/ganesh/GrRenderTaskCluster.h similarity index 100% rename from src/gpu/GrRenderTaskCluster.h rename to src/gpu/ganesh/GrRenderTaskCluster.h diff --git a/src/gpu/GrResourceAllocator.cpp b/src/gpu/ganesh/GrResourceAllocator.cpp similarity index 98% rename from src/gpu/GrResourceAllocator.cpp rename to src/gpu/ganesh/GrResourceAllocator.cpp index 84b3bf7122..bf6272e488 100644 --- a/src/gpu/GrResourceAllocator.cpp +++ b/src/gpu/ganesh/GrResourceAllocator.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" #ifdef SK_DEBUG #include diff --git a/src/gpu/GrResourceAllocator.h b/src/gpu/ganesh/GrResourceAllocator.h similarity index 98% rename from src/gpu/GrResourceAllocator.h rename to src/gpu/ganesh/GrResourceAllocator.h index 5e3673c88c..254e21b629 100644 --- a/src/gpu/GrResourceAllocator.h +++ b/src/gpu/ganesh/GrResourceAllocator.h @@ -10,9 +10,9 @@ #include "include/private/SkTHash.h" -#include "src/gpu/GrHashMapWithCache.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrHashMapWithCache.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" #include "src/core/SkArenaAlloc.h" #include "src/core/SkTMultiMap.h" diff --git a/src/gpu/GrResourceCache.cpp b/src/gpu/ganesh/GrResourceCache.cpp similarity index 98% rename from src/gpu/GrResourceCache.cpp rename to src/gpu/ganesh/GrResourceCache.cpp index c8abcf3046..989c365747 100644 --- a/src/gpu/GrResourceCache.cpp +++ b/src/gpu/ganesh/GrResourceCache.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceCache.h" #include #include #include "include/gpu/GrDirectContext.h" @@ -16,15 +16,15 @@ #include "src/core/SkOpts.h" #include "src/core/SkScopeExit.h" #include "src/core/SkTSort.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourceCacheAccess.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxyCacheAccess.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourceCacheAccess.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxyCacheAccess.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/SkGr.h" DECLARE_SKMESSAGEBUS_MESSAGE(skgpu::UniqueKeyInvalidatedMessage, uint32_t, true); diff --git a/src/gpu/GrResourceCache.h b/src/gpu/ganesh/GrResourceCache.h similarity index 99% rename from src/gpu/GrResourceCache.h rename to src/gpu/ganesh/GrResourceCache.h index 783de5922b..12ab4a9f75 100644 --- a/src/gpu/GrResourceCache.h +++ b/src/gpu/ganesh/GrResourceCache.h @@ -16,10 +16,10 @@ #include "src/core/SkTDPQueue.h" #include "src/core/SkTInternalLList.h" #include "src/core/SkTMultiMap.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrGpuResourceCacheAccess.h" -#include "src/gpu/GrGpuResourcePriv.h" #include "src/gpu/ResourceKey.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrGpuResourceCacheAccess.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" class GrCaps; class GrProxyProvider; diff --git a/src/gpu/GrResourceHandle.h b/src/gpu/ganesh/GrResourceHandle.h similarity index 100% rename from src/gpu/GrResourceHandle.h rename to src/gpu/ganesh/GrResourceHandle.h diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/ganesh/GrResourceProvider.cpp similarity index 98% rename from src/gpu/GrResourceProvider.cpp rename to src/gpu/ganesh/GrResourceProvider.cpp index af5d8a1556..4163972aa3 100644 --- a/src/gpu/GrResourceProvider.cpp +++ b/src/gpu/ganesh/GrResourceProvider.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrBackendSemaphore.h" @@ -14,19 +14,19 @@ #include "src/core/SkMathPriv.h" #include "src/core/SkMipmap.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/ResourceKey.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" const int GrResourceProvider::kMinScratchTextureSize = 16; diff --git a/src/gpu/GrResourceProvider.h b/src/gpu/ganesh/GrResourceProvider.h similarity index 99% rename from src/gpu/GrResourceProvider.h rename to src/gpu/ganesh/GrResourceProvider.h index c769a7a620..fdba804974 100644 --- a/src/gpu/GrResourceProvider.h +++ b/src/gpu/ganesh/GrResourceProvider.h @@ -10,8 +10,8 @@ #include "include/gpu/GrContextOptions.h" #include "include/private/SkImageInfoPriv.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrResourceCache.h" class GrAttachment; class GrBackendRenderTarget; diff --git a/src/gpu/GrResourceProviderPriv.h b/src/gpu/ganesh/GrResourceProviderPriv.h similarity index 96% rename from src/gpu/GrResourceProviderPriv.h rename to src/gpu/ganesh/GrResourceProviderPriv.h index 7800c20e81..012084e33e 100644 --- a/src/gpu/GrResourceProviderPriv.h +++ b/src/gpu/ganesh/GrResourceProviderPriv.h @@ -8,7 +8,7 @@ #ifndef GrResourceProviderPriv_DEFINED #define GrResourceProviderPriv_DEFINED -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" /** Class that adds methods to GrResourceProvider that are only intended for use internal to Skia. This class is purely a privileged window into GrResourceProvider. It should never have diff --git a/src/gpu/GrRingBuffer.cpp b/src/gpu/ganesh/GrRingBuffer.cpp similarity index 95% rename from src/gpu/GrRingBuffer.cpp rename to src/gpu/ganesh/GrRingBuffer.cpp index 8f1f6fd1a1..1e2d32d187 100644 --- a/src/gpu/GrRingBuffer.cpp +++ b/src/gpu/ganesh/GrRingBuffer.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRingBuffer.h" +#include "src/gpu/ganesh/GrRingBuffer.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrResourceProvider.h" // Get offset into buffer that has enough space for size // Returns fTotalSize if no space diff --git a/src/gpu/GrRingBuffer.h b/src/gpu/ganesh/GrRingBuffer.h similarity index 97% rename from src/gpu/GrRingBuffer.h rename to src/gpu/ganesh/GrRingBuffer.h index 1b91bfeebc..43934a383c 100644 --- a/src/gpu/GrRingBuffer.h +++ b/src/gpu/ganesh/GrRingBuffer.h @@ -8,7 +8,7 @@ #ifndef GrRingBuffer_DEFINED #define GrRingBuffer_DEFINED -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" #include diff --git a/src/gpu/GrSPIRVUniformHandler.cpp b/src/gpu/ganesh/GrSPIRVUniformHandler.cpp similarity index 99% rename from src/gpu/GrSPIRVUniformHandler.cpp rename to src/gpu/ganesh/GrSPIRVUniformHandler.cpp index 42ab5e4bf1..71b4ee50e4 100644 --- a/src/gpu/GrSPIRVUniformHandler.cpp +++ b/src/gpu/ganesh/GrSPIRVUniformHandler.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrSPIRVUniformHandler.h" +#include "src/gpu/ganesh/GrSPIRVUniformHandler.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" GrSPIRVUniformHandler::GrSPIRVUniformHandler(GrGLSLProgramBuilder* program) : INHERITED(program) diff --git a/src/gpu/GrSPIRVUniformHandler.h b/src/gpu/ganesh/GrSPIRVUniformHandler.h similarity index 98% rename from src/gpu/GrSPIRVUniformHandler.h rename to src/gpu/ganesh/GrSPIRVUniformHandler.h index c88a979d7e..7c5a388c67 100644 --- a/src/gpu/GrSPIRVUniformHandler.h +++ b/src/gpu/ganesh/GrSPIRVUniformHandler.h @@ -9,7 +9,7 @@ #define GrSPIRVUniformHandler_DEFINED #include "src/core/SkTBlockList.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" /* * This class can be used for basic SPIR-V uniform handling. It will make a single uniform buffer diff --git a/src/gpu/GrSPIRVVaryingHandler.cpp b/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp similarity index 98% rename from src/gpu/GrSPIRVVaryingHandler.cpp rename to src/gpu/ganesh/GrSPIRVVaryingHandler.cpp index 3b942f2527..9f2cad1665 100644 --- a/src/gpu/GrSPIRVVaryingHandler.cpp +++ b/src/gpu/ganesh/GrSPIRVVaryingHandler.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrSPIRVVaryingHandler.h" +#include "src/gpu/ganesh/GrSPIRVVaryingHandler.h" /** Returns the number of locations take up by a given SkSLType. We assume that all scalar values are 32 bits. */ diff --git a/src/gpu/GrSPIRVVaryingHandler.h b/src/gpu/ganesh/GrSPIRVVaryingHandler.h similarity index 93% rename from src/gpu/GrSPIRVVaryingHandler.h rename to src/gpu/ganesh/GrSPIRVVaryingHandler.h index c96ec8b5cd..86899d9278 100644 --- a/src/gpu/GrSPIRVVaryingHandler.h +++ b/src/gpu/ganesh/GrSPIRVVaryingHandler.h @@ -8,7 +8,7 @@ #ifndef GrSPIRVVaryingHandler_DEFINED #define GrSPIRVVaryingHandler_DEFINED -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" /* * This class can be used for basic SPIR-V varying handling. Each added varying just takes the diff --git a/src/gpu/GrSWMaskHelper.cpp b/src/gpu/ganesh/GrSWMaskHelper.cpp similarity index 94% rename from src/gpu/GrSWMaskHelper.cpp rename to src/gpu/ganesh/GrSWMaskHelper.cpp index b8a901bc1f..a04fa6823e 100644 --- a/src/gpu/GrSWMaskHelper.cpp +++ b/src/gpu/ganesh/GrSWMaskHelper.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/GrSWMaskHelper.h" +#include "src/gpu/ganesh/GrSWMaskHelper.h" #include "include/core/SkBitmap.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkMatrixProvider.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" /* * Convert a boolean operation into a transfer mode code diff --git a/src/gpu/GrSWMaskHelper.h b/src/gpu/ganesh/GrSWMaskHelper.h similarity index 98% rename from src/gpu/GrSWMaskHelper.h rename to src/gpu/ganesh/GrSWMaskHelper.h index 5023300185..158ceb259e 100644 --- a/src/gpu/GrSWMaskHelper.h +++ b/src/gpu/ganesh/GrSWMaskHelper.h @@ -15,7 +15,7 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkDraw.h" #include "src/core/SkRasterClip.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" class GrShape; class GrStyledShape; diff --git a/src/gpu/GrSamplerState.h b/src/gpu/ganesh/GrSamplerState.h similarity index 100% rename from src/gpu/GrSamplerState.h rename to src/gpu/ganesh/GrSamplerState.h diff --git a/src/gpu/GrScissorState.h b/src/gpu/ganesh/GrScissorState.h similarity index 100% rename from src/gpu/GrScissorState.h rename to src/gpu/ganesh/GrScissorState.h diff --git a/src/gpu/GrSemaphore.h b/src/gpu/ganesh/GrSemaphore.h similarity index 100% rename from src/gpu/GrSemaphore.h rename to src/gpu/ganesh/GrSemaphore.h diff --git a/src/gpu/GrShaderCaps.cpp b/src/gpu/ganesh/GrShaderCaps.cpp similarity index 99% rename from src/gpu/GrShaderCaps.cpp rename to src/gpu/ganesh/GrShaderCaps.cpp index fe9e092f5f..c6e1caa1e7 100644 --- a/src/gpu/GrShaderCaps.cpp +++ b/src/gpu/ganesh/GrShaderCaps.cpp @@ -6,7 +6,7 @@ */ -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "include/gpu/GrContextOptions.h" diff --git a/src/gpu/GrShaderCaps.h b/src/gpu/ganesh/GrShaderCaps.h similarity index 99% rename from src/gpu/GrShaderCaps.h rename to src/gpu/ganesh/GrShaderCaps.h index 593121e39d..795bab5471 100644 --- a/src/gpu/GrShaderCaps.h +++ b/src/gpu/ganesh/GrShaderCaps.h @@ -9,7 +9,7 @@ #define GrShaderCaps_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/glsl/GrGLSL.h" +#include "src/gpu/ganesh/glsl/GrGLSL.h" #include "src/sksl/SkSLUtil.h" struct GrContextOptions; diff --git a/src/gpu/GrShaderVar.cpp b/src/gpu/ganesh/GrShaderVar.cpp similarity index 94% rename from src/gpu/GrShaderVar.cpp rename to src/gpu/ganesh/GrShaderVar.cpp index 271c13a321..a22c1731eb 100644 --- a/src/gpu/GrShaderVar.cpp +++ b/src/gpu/ganesh/GrShaderVar.cpp @@ -6,8 +6,8 @@ */ -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrShaderVar.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderVar.h" static const char* type_modifier_string(GrShaderVar::TypeModifier t) { switch (t) { diff --git a/src/gpu/GrShaderVar.h b/src/gpu/ganesh/GrShaderVar.h similarity index 100% rename from src/gpu/GrShaderVar.h rename to src/gpu/ganesh/GrShaderVar.h diff --git a/src/gpu/GrSimpleMesh.h b/src/gpu/ganesh/GrSimpleMesh.h similarity index 96% rename from src/gpu/GrSimpleMesh.h rename to src/gpu/ganesh/GrSimpleMesh.h index cd246beccb..c96efa4d07 100644 --- a/src/gpu/GrSimpleMesh.h +++ b/src/gpu/ganesh/GrSimpleMesh.h @@ -8,9 +8,9 @@ #ifndef GrSimpleMesh_DEFINED #define GrSimpleMesh_DEFINED -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" class GrGeometryProcessor; diff --git a/src/gpu/GrStagingBufferManager.cpp b/src/gpu/ganesh/GrStagingBufferManager.cpp similarity index 91% rename from src/gpu/GrStagingBufferManager.cpp rename to src/gpu/ganesh/GrStagingBufferManager.cpp index 4714a10051..8d0c0b6a44 100644 --- a/src/gpu/GrStagingBufferManager.cpp +++ b/src/gpu/ganesh/GrStagingBufferManager.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/GrStagingBufferManager.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrResourceProvider.h" GrStagingBufferManager::Slice GrStagingBufferManager::allocateStagingBufferSlice( size_t size, size_t requiredAlignment) { diff --git a/src/gpu/GrStagingBufferManager.h b/src/gpu/ganesh/GrStagingBufferManager.h similarity index 97% rename from src/gpu/GrStagingBufferManager.h rename to src/gpu/ganesh/GrStagingBufferManager.h index ead901441e..315dbbca18 100644 --- a/src/gpu/GrStagingBufferManager.h +++ b/src/gpu/ganesh/GrStagingBufferManager.h @@ -9,7 +9,7 @@ #define GrStagingBufferManager_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" #include class GrGpu; diff --git a/src/gpu/GrStencilSettings.cpp b/src/gpu/ganesh/GrStencilSettings.cpp similarity index 99% rename from src/gpu/GrStencilSettings.cpp rename to src/gpu/ganesh/GrStencilSettings.cpp index c2572ae4dd..0b5fcfcf5f 100644 --- a/src/gpu/GrStencilSettings.cpp +++ b/src/gpu/ganesh/GrStencilSettings.cpp @@ -6,10 +6,10 @@ */ -#include "src/gpu/GrStencilSettings.h" +#include "src/gpu/ganesh/GrStencilSettings.h" -#include "src/gpu/GrProcessor.h" #include "src/gpu/KeyBuilder.h" +#include "src/gpu/ganesh/GrProcessor.h" constexpr const GrUserStencilSettings gUnused( GrUserStencilSettings::StaticInit< diff --git a/src/gpu/GrStencilSettings.h b/src/gpu/ganesh/GrStencilSettings.h similarity index 98% rename from src/gpu/GrStencilSettings.h rename to src/gpu/ganesh/GrStencilSettings.h index 6790f8fe33..a0b60385d2 100644 --- a/src/gpu/GrStencilSettings.h +++ b/src/gpu/ganesh/GrStencilSettings.h @@ -10,7 +10,7 @@ #define GrStencilSettings_DEFINED #include "include/core/SkRegion.h" -#include "src/gpu/GrUserStencilSettings.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" namespace skgpu { class KeyBuilder; diff --git a/src/gpu/GrStyle.cpp b/src/gpu/ganesh/GrStyle.cpp similarity index 99% rename from src/gpu/GrStyle.cpp rename to src/gpu/ganesh/GrStyle.cpp index 1d5a48b8b4..c034129b24 100644 --- a/src/gpu/GrStyle.cpp +++ b/src/gpu/ganesh/GrStyle.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrStyle.h" +#include "src/gpu/ganesh/GrStyle.h" #include "src/utils/SkDashPathPriv.h" int GrStyle::KeySize(const GrStyle &style, Apply apply, uint32_t flags) { diff --git a/src/gpu/GrStyle.h b/src/gpu/ganesh/GrStyle.h similarity index 100% rename from src/gpu/GrStyle.h rename to src/gpu/ganesh/GrStyle.h diff --git a/src/gpu/GrSubRunAllocator.cpp b/src/gpu/ganesh/GrSubRunAllocator.cpp similarity index 98% rename from src/gpu/GrSubRunAllocator.cpp rename to src/gpu/ganesh/GrSubRunAllocator.cpp index 9f08f64321..93cffd50ab 100644 --- a/src/gpu/GrSubRunAllocator.cpp +++ b/src/gpu/ganesh/GrSubRunAllocator.cpp @@ -6,7 +6,7 @@ */ #include "include/core/SkMath.h" -#include "src/gpu/GrSubRunAllocator.h" +#include "src/gpu/ganesh/GrSubRunAllocator.h" #include #include diff --git a/src/gpu/GrSubRunAllocator.h b/src/gpu/ganesh/GrSubRunAllocator.h similarity index 100% rename from src/gpu/GrSubRunAllocator.h rename to src/gpu/ganesh/GrSubRunAllocator.h diff --git a/src/gpu/GrSurface.cpp b/src/gpu/ganesh/GrSurface.cpp similarity index 88% rename from src/gpu/GrSurface.cpp rename to src/gpu/ganesh/GrSurface.cpp index 6a8bd3212d..30b69411b4 100644 --- a/src/gpu/GrSurface.cpp +++ b/src/gpu/ganesh/GrSurface.cpp @@ -6,14 +6,14 @@ */ #include "src/core/SkCompressedDataUtils.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrTexture.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/SkGr.h" size_t GrSurface::ComputeSize(const GrBackendFormat& format, SkISize dimensions, diff --git a/src/gpu/GrSurface.h b/src/gpu/ganesh/GrSurface.h similarity index 99% rename from src/gpu/GrSurface.h rename to src/gpu/ganesh/GrSurface.h index 3d37d0d3f8..7315517707 100644 --- a/src/gpu/GrSurface.h +++ b/src/gpu/ganesh/GrSurface.h @@ -12,8 +12,8 @@ #include "include/core/SkRect.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/GrGpuResource.h" #include "src/gpu/RefCntedCallback.h" +#include "src/gpu/ganesh/GrGpuResource.h" class GrRenderTarget; class GrTexture; diff --git a/src/gpu/GrSurfaceInfo.cpp b/src/gpu/ganesh/GrSurfaceInfo.cpp similarity index 100% rename from src/gpu/GrSurfaceInfo.cpp rename to src/gpu/ganesh/GrSurfaceInfo.cpp diff --git a/src/gpu/GrSurfaceProxy.cpp b/src/gpu/ganesh/GrSurfaceProxy.cpp similarity index 96% rename from src/gpu/GrSurfaceProxy.cpp rename to src/gpu/ganesh/GrSurfaceProxy.cpp index 7b840cdad5..ba7adebbab 100644 --- a/src/gpu/GrSurfaceProxy.cpp +++ b/src/gpu/ganesh/GrSurfaceProxy.cpp @@ -5,27 +5,27 @@ * found in the LICENSE file. */ -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureRenderTargetProxy.h" -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureRenderTargetProxy.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRenderTarget.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" static bool is_valid_lazy(const SkISize& dimensions, SkBackingFit fit) { // A "fully" lazy proxy's width and height are not known until instantiation time. diff --git a/src/gpu/GrSurfaceProxy.h b/src/gpu/ganesh/GrSurfaceProxy.h similarity index 99% rename from src/gpu/GrSurfaceProxy.h rename to src/gpu/ganesh/GrSurfaceProxy.h index 01a1d21efe..34442d1e4e 100644 --- a/src/gpu/GrSurfaceProxy.h +++ b/src/gpu/ganesh/GrSurfaceProxy.h @@ -11,9 +11,9 @@ #include "include/core/SkRect.h" #include "include/gpu/GrBackendSurface.h" #include "include/private/SkNoncopyable.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrTexture.h" class GrCaps; class GrContext_Base; diff --git a/src/gpu/GrSurfaceProxyPriv.h b/src/gpu/ganesh/GrSurfaceProxyPriv.h similarity index 98% rename from src/gpu/GrSurfaceProxyPriv.h rename to src/gpu/ganesh/GrSurfaceProxyPriv.h index be57b701eb..f715af761b 100644 --- a/src/gpu/GrSurfaceProxyPriv.h +++ b/src/gpu/ganesh/GrSurfaceProxyPriv.h @@ -8,7 +8,7 @@ #ifndef GrSurfaceProxyPriv_DEFINED #define GrSurfaceProxyPriv_DEFINED -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" class GrResourceProvider; diff --git a/src/gpu/GrSurfaceProxyView.h b/src/gpu/ganesh/GrSurfaceProxyView.h similarity index 97% rename from src/gpu/GrSurfaceProxyView.h rename to src/gpu/ganesh/GrSurfaceProxyView.h index 98e2a052a4..a9bff34972 100644 --- a/src/gpu/GrSurfaceProxyView.h +++ b/src/gpu/ganesh/GrSurfaceProxyView.h @@ -10,10 +10,10 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/Swizzle.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" class GrSurfaceProxyView { public: diff --git a/src/gpu/GrTTopoSort.h b/src/gpu/ganesh/GrTTopoSort.h similarity index 100% rename from src/gpu/GrTTopoSort.h rename to src/gpu/ganesh/GrTTopoSort.h diff --git a/src/gpu/GrTestUtils.cpp b/src/gpu/ganesh/GrTestUtils.cpp similarity index 98% rename from src/gpu/GrTestUtils.cpp rename to src/gpu/ganesh/GrTestUtils.cpp index 3e7e7b0548..a22d92656e 100644 --- a/src/gpu/GrTestUtils.cpp +++ b/src/gpu/ganesh/GrTestUtils.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/GrTestUtils.h" +#include "src/gpu/ganesh/GrTestUtils.h" #include "include/core/SkColorSpace.h" #include "include/core/SkMatrix.h" #include "include/core/SkPathBuilder.h" #include "include/core/SkRRect.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrProcessorUnitTest.h" -#include "src/gpu/GrStyle.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrProcessorUnitTest.h" +#include "src/gpu/ganesh/GrStyle.h" #include "src/utils/SkDashPathPriv.h" #if GR_TEST_UTILS diff --git a/src/gpu/GrTestUtils.h b/src/gpu/ganesh/GrTestUtils.h similarity index 96% rename from src/gpu/GrTestUtils.h rename to src/gpu/ganesh/GrTestUtils.h index bc6e457a40..bb18cae603 100644 --- a/src/gpu/GrTestUtils.h +++ b/src/gpu/ganesh/GrTestUtils.h @@ -18,9 +18,9 @@ #include "include/utils/SkRandom.h" #include "src/core/SkMatrixProvider.h" #include "src/core/SkPathEffectBase.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrFPArgs.h" -#include "src/gpu/GrSamplerState.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrFPArgs.h" +#include "src/gpu/ganesh/GrSamplerState.h" #include "src/shaders/SkShaderBase.h" class GrColorInfo; diff --git a/src/gpu/GrTexture.cpp b/src/gpu/ganesh/GrTexture.cpp similarity index 95% rename from src/gpu/GrTexture.cpp rename to src/gpu/ganesh/GrTexture.cpp index 48535ffab5..274ff19462 100644 --- a/src/gpu/GrTexture.cpp +++ b/src/gpu/ganesh/GrTexture.cpp @@ -9,15 +9,15 @@ #include "include/core/SkTypes.h" #include "include/gpu/GrTypes.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrTexture.h" #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif void GrTexture::markMipmapsDirty() { diff --git a/src/gpu/GrTexture.h b/src/gpu/ganesh/GrTexture.h similarity index 98% rename from src/gpu/GrTexture.h rename to src/gpu/ganesh/GrTexture.h index a5fbb05023..5d8e6b567b 100644 --- a/src/gpu/GrTexture.h +++ b/src/gpu/ganesh/GrTexture.h @@ -14,7 +14,7 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrBackendSurface.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrSurface.h" +#include "src/gpu/ganesh/GrSurface.h" class GrTexture : virtual public GrSurface { public: diff --git a/src/gpu/GrTextureProxy.cpp b/src/gpu/ganesh/GrTextureProxy.cpp similarity index 96% rename from src/gpu/GrTextureProxy.cpp rename to src/gpu/ganesh/GrTextureProxy.cpp index 1309559547..8c0a646328 100644 --- a/src/gpu/GrTextureProxy.cpp +++ b/src/gpu/ganesh/GrTextureProxy.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDeferredProxyUploader.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrDeferredProxyUploader.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrTexture.h" // Deferred version - no data GrTextureProxy::GrTextureProxy(const GrBackendFormat& format, diff --git a/src/gpu/GrTextureProxy.h b/src/gpu/ganesh/GrTextureProxy.h similarity index 99% rename from src/gpu/GrTextureProxy.h rename to src/gpu/ganesh/GrTextureProxy.h index 6879501bcf..f59f161af7 100644 --- a/src/gpu/GrTextureProxy.h +++ b/src/gpu/ganesh/GrTextureProxy.h @@ -9,8 +9,8 @@ #define GrTextureProxy_DEFINED #include "include/gpu/GrBackendSurface.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" class GrCaps; class GrDeferredProxyUploader; diff --git a/src/gpu/GrTextureProxyCacheAccess.h b/src/gpu/ganesh/GrTextureProxyCacheAccess.h similarity index 96% rename from src/gpu/GrTextureProxyCacheAccess.h rename to src/gpu/ganesh/GrTextureProxyCacheAccess.h index 2748b51b00..fea713a101 100644 --- a/src/gpu/GrTextureProxyCacheAccess.h +++ b/src/gpu/ganesh/GrTextureProxyCacheAccess.h @@ -8,7 +8,7 @@ #ifndef GrTextureProxyCacheAccess_DEFINED #define GrTextureProxyCacheAccess_DEFINED -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" /** * This class allows GrResourceCache increased privileged access to GrTextureProxy objects. diff --git a/src/gpu/GrTextureProxyPriv.h b/src/gpu/ganesh/GrTextureProxyPriv.h similarity index 97% rename from src/gpu/GrTextureProxyPriv.h rename to src/gpu/ganesh/GrTextureProxyPriv.h index 6b48b1b669..7b6fbcbef6 100644 --- a/src/gpu/GrTextureProxyPriv.h +++ b/src/gpu/ganesh/GrTextureProxyPriv.h @@ -8,7 +8,7 @@ #ifndef GrTextureProxyPriv_DEFINED #define GrTextureProxyPriv_DEFINED -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" class GrDeferredProxyUploader; class GrOpFlushState; diff --git a/src/gpu/GrTextureRenderTargetProxy.cpp b/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp similarity index 96% rename from src/gpu/GrTextureRenderTargetProxy.cpp rename to src/gpu/ganesh/GrTextureRenderTargetProxy.cpp index f31ced5784..e16615d4c0 100644 --- a/src/gpu/GrTextureRenderTargetProxy.cpp +++ b/src/gpu/ganesh/GrTextureRenderTargetProxy.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/GrTextureRenderTargetProxy.h" +#include "src/gpu/ganesh/GrTextureRenderTargetProxy.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif // Deferred version diff --git a/src/gpu/GrTextureRenderTargetProxy.h b/src/gpu/ganesh/GrTextureRenderTargetProxy.h similarity index 96% rename from src/gpu/GrTextureRenderTargetProxy.h rename to src/gpu/ganesh/GrTextureRenderTargetProxy.h index 6cefe82c85..7542c91423 100644 --- a/src/gpu/GrTextureRenderTargetProxy.h +++ b/src/gpu/ganesh/GrTextureRenderTargetProxy.h @@ -8,8 +8,8 @@ #ifndef GrTextureRenderTargetProxy_DEFINED #define GrTextureRenderTargetProxy_DEFINED -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" #ifdef SK_BUILD_FOR_WIN // Windows gives warnings about inheriting asTextureProxy/asRenderTargetProxy via dominance. diff --git a/src/gpu/GrTextureResolveManager.h b/src/gpu/ganesh/GrTextureResolveManager.h similarity index 95% rename from src/gpu/GrTextureResolveManager.h rename to src/gpu/ganesh/GrTextureResolveManager.h index 46d35ca603..86e57c9bf9 100644 --- a/src/gpu/GrTextureResolveManager.h +++ b/src/gpu/ganesh/GrTextureResolveManager.h @@ -9,7 +9,7 @@ #define GrTextureResolveManager_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/GrDrawingManager.h" +#include "src/gpu/ganesh/GrDrawingManager.h" class GrCaps; class GrDrawingManager; diff --git a/src/gpu/GrTextureResolveRenderTask.cpp b/src/gpu/ganesh/GrTextureResolveRenderTask.cpp similarity index 92% rename from src/gpu/GrTextureResolveRenderTask.cpp rename to src/gpu/ganesh/GrTextureResolveRenderTask.cpp index f079994279..1b5dd1300c 100644 --- a/src/gpu/GrTextureResolveRenderTask.cpp +++ b/src/gpu/ganesh/GrTextureResolveRenderTask.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/GrTextureResolveRenderTask.h" +#include "src/gpu/ganesh/GrTextureResolveRenderTask.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceAllocator.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrTexture.h" void GrTextureResolveRenderTask::addProxy(GrDrawingManager* drawingMgr, sk_sp proxyRef, diff --git a/src/gpu/GrTextureResolveRenderTask.h b/src/gpu/ganesh/GrTextureResolveRenderTask.h similarity index 96% rename from src/gpu/GrTextureResolveRenderTask.h rename to src/gpu/ganesh/GrTextureResolveRenderTask.h index df2de81c34..83cd4c1b4e 100644 --- a/src/gpu/GrTextureResolveRenderTask.h +++ b/src/gpu/ganesh/GrTextureResolveRenderTask.h @@ -8,7 +8,7 @@ #ifndef GrTextureResolveRenderTask_DEFINED #define GrTextureResolveRenderTask_DEFINED -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" class GrTextureResolveRenderTask final : public GrRenderTask { public: diff --git a/src/gpu/GrThreadSafeCache.cpp b/src/gpu/ganesh/GrThreadSafeCache.cpp similarity index 98% rename from src/gpu/GrThreadSafeCache.cpp rename to src/gpu/ganesh/GrThreadSafeCache.cpp index 03f54663bf..4e503c455d 100644 --- a/src/gpu/GrThreadSafeCache.cpp +++ b/src/gpu/ganesh/GrThreadSafeCache.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/GrThreadSafeCache.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceCache.h" GrThreadSafeCache::VertexData::~VertexData () { this->reset(); diff --git a/src/gpu/GrThreadSafeCache.h b/src/gpu/ganesh/GrThreadSafeCache.h similarity index 99% rename from src/gpu/GrThreadSafeCache.h rename to src/gpu/ganesh/GrThreadSafeCache.h index 61a8664ae1..da2788e2c7 100644 --- a/src/gpu/GrThreadSafeCache.h +++ b/src/gpu/ganesh/GrThreadSafeCache.h @@ -13,8 +13,8 @@ #include "src/core/SkArenaAlloc.h" #include "src/core/SkTDynamicHash.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" // Ganesh creates a lot of utility textures (e.g., blurred-rrect masks) that need to be shared // between the direct context and all the DDL recording contexts. This thread-safe cache diff --git a/src/gpu/GrThreadSafePipelineBuilder.cpp b/src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp similarity index 97% rename from src/gpu/GrThreadSafePipelineBuilder.cpp rename to src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp index 1a522cefef..4b4d3a811e 100644 --- a/src/gpu/GrThreadSafePipelineBuilder.cpp +++ b/src/gpu/ganesh/GrThreadSafePipelineBuilder.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" #if GR_GPU_STATS #if GR_TEST_UTILS diff --git a/src/gpu/GrThreadSafePipelineBuilder.h b/src/gpu/ganesh/GrThreadSafePipelineBuilder.h similarity index 100% rename from src/gpu/GrThreadSafePipelineBuilder.h rename to src/gpu/ganesh/GrThreadSafePipelineBuilder.h diff --git a/src/gpu/GrTracing.h b/src/gpu/ganesh/GrTracing.h similarity index 93% rename from src/gpu/GrTracing.h rename to src/gpu/ganesh/GrTracing.h index 8b5dbf1146..8b9f207b5f 100644 --- a/src/gpu/GrTracing.h +++ b/src/gpu/ganesh/GrTracing.h @@ -10,7 +10,7 @@ #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAuditTrail.h" +#include "src/gpu/ganesh/GrAuditTrail.h" /** * Context level GrTracing macros, classname and op are const char*, context is GrContext diff --git a/src/gpu/GrTransferFromRenderTask.cpp b/src/gpu/ganesh/GrTransferFromRenderTask.cpp similarity index 83% rename from src/gpu/GrTransferFromRenderTask.cpp rename to src/gpu/ganesh/GrTransferFromRenderTask.cpp index ca44accd75..6184e40875 100644 --- a/src/gpu/GrTransferFromRenderTask.cpp +++ b/src/gpu/ganesh/GrTransferFromRenderTask.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/GrTransferFromRenderTask.h" +#include "src/gpu/ganesh/GrTransferFromRenderTask.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrResourceAllocator.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrResourceProvider.h" void GrTransferFromRenderTask::gatherProxyIntervals(GrResourceAllocator* alloc) const { // This renderTask doesn't have "normal" ops. In this case we still need to add an interval (so diff --git a/src/gpu/GrTransferFromRenderTask.h b/src/gpu/ganesh/GrTransferFromRenderTask.h similarity index 97% rename from src/gpu/GrTransferFromRenderTask.h rename to src/gpu/ganesh/GrTransferFromRenderTask.h index cdcdb29b74..dba60ed013 100644 --- a/src/gpu/GrTransferFromRenderTask.h +++ b/src/gpu/ganesh/GrTransferFromRenderTask.h @@ -8,7 +8,7 @@ #ifndef GrTransferFromRenderTask_DEFINED #define GrTransferFromRenderTask_DEFINED -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" class GrTransferFromRenderTask final : public GrRenderTask { public: diff --git a/src/gpu/GrUniformDataManager.cpp b/src/gpu/ganesh/GrUniformDataManager.cpp similarity index 99% rename from src/gpu/GrUniformDataManager.cpp rename to src/gpu/ganesh/GrUniformDataManager.cpp index 19a7df530d..04cfc7fb54 100644 --- a/src/gpu/GrUniformDataManager.cpp +++ b/src/gpu/ganesh/GrUniformDataManager.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrUniformDataManager.h" +#include "src/gpu/ganesh/GrUniformDataManager.h" #include "include/private/SkHalf.h" -#include "src/gpu/GrShaderVar.h" +#include "src/gpu/ganesh/GrShaderVar.h" // ensure that these types are the sizes the uniform data is expecting static_assert(sizeof(int32_t) == 4); diff --git a/src/gpu/GrUniformDataManager.h b/src/gpu/ganesh/GrUniformDataManager.h similarity index 98% rename from src/gpu/GrUniformDataManager.h rename to src/gpu/ganesh/GrUniformDataManager.h index 69eb17b7c5..982aa270cb 100644 --- a/src/gpu/GrUniformDataManager.h +++ b/src/gpu/ganesh/GrUniformDataManager.h @@ -8,7 +8,7 @@ #ifndef GrUniformDataManager_DEFINED #define GrUniformDataManager_DEFINED -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkTArray.h" diff --git a/src/gpu/GrUserStencilSettings.h b/src/gpu/ganesh/GrUserStencilSettings.h similarity index 100% rename from src/gpu/GrUserStencilSettings.h rename to src/gpu/ganesh/GrUserStencilSettings.h diff --git a/src/gpu/GrUtil.cpp b/src/gpu/ganesh/GrUtil.cpp similarity index 97% rename from src/gpu/GrUtil.cpp rename to src/gpu/ganesh/GrUtil.cpp index 3e35e84173..e24490a7b7 100644 --- a/src/gpu/GrUtil.cpp +++ b/src/gpu/ganesh/GrUtil.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrUtil.h" +#include "src/gpu/ganesh/GrUtil.h" #include "src/core/SkDrawProcs.h" -#include "src/gpu/GrStyle.h" +#include "src/gpu/ganesh/GrStyle.h" GrIntelGpuFamily GrGetIntelGpuFamily(uint32_t deviceID) { // https://en.wikipedia.org/wiki/List_of_Intel_graphics_processing_units diff --git a/src/gpu/GrUtil.h b/src/gpu/ganesh/GrUtil.h similarity index 100% rename from src/gpu/GrUtil.h rename to src/gpu/ganesh/GrUtil.h diff --git a/src/gpu/GrVertexChunkArray.cpp b/src/gpu/ganesh/GrVertexChunkArray.cpp similarity index 94% rename from src/gpu/GrVertexChunkArray.cpp rename to src/gpu/ganesh/GrVertexChunkArray.cpp index 5a43227eb2..d0a0dd6cfa 100644 --- a/src/gpu/GrVertexChunkArray.cpp +++ b/src/gpu/ganesh/GrVertexChunkArray.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrVertexChunkArray.h" +#include "src/gpu/ganesh/GrVertexChunkArray.h" -#include "src/gpu/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" GrVertexChunkBuilder::~GrVertexChunkBuilder() { if (!fChunks->empty()) { diff --git a/src/gpu/GrVertexChunkArray.h b/src/gpu/ganesh/GrVertexChunkArray.h similarity index 98% rename from src/gpu/GrVertexChunkArray.h rename to src/gpu/ganesh/GrVertexChunkArray.h index a44daa3b6e..8e77eea9ff 100644 --- a/src/gpu/GrVertexChunkArray.h +++ b/src/gpu/ganesh/GrVertexChunkArray.h @@ -12,7 +12,7 @@ #include "include/private/SkNoncopyable.h" #include "include/private/SkTArray.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrBuffer.h" +#include "src/gpu/ganesh/GrBuffer.h" class GrMeshDrawTarget; diff --git a/src/gpu/GrVx.h b/src/gpu/ganesh/GrVx.h similarity index 100% rename from src/gpu/GrVx.h rename to src/gpu/ganesh/GrVx.h diff --git a/src/gpu/GrWaitRenderTask.cpp b/src/gpu/ganesh/GrWaitRenderTask.cpp similarity index 87% rename from src/gpu/GrWaitRenderTask.cpp rename to src/gpu/ganesh/GrWaitRenderTask.cpp index 9eadd89231..c11a5d108d 100644 --- a/src/gpu/GrWaitRenderTask.cpp +++ b/src/gpu/ganesh/GrWaitRenderTask.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/GrWaitRenderTask.h" +#include "src/gpu/ganesh/GrWaitRenderTask.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" void GrWaitRenderTask::gatherProxyIntervals(GrResourceAllocator* alloc) const { // This renderTask doesn't have "normal" ops. In this case we still need to add an interval (so diff --git a/src/gpu/GrWaitRenderTask.h b/src/gpu/ganesh/GrWaitRenderTask.h similarity index 95% rename from src/gpu/GrWaitRenderTask.h rename to src/gpu/ganesh/GrWaitRenderTask.h index ca89b7f627..cefeab6e1f 100644 --- a/src/gpu/GrWaitRenderTask.h +++ b/src/gpu/ganesh/GrWaitRenderTask.h @@ -8,8 +8,8 @@ #ifndef GrWaitRenderTask_DEFINED #define GrWaitRenderTask_DEFINED -#include "src/gpu/GrRenderTask.h" -#include "src/gpu/GrSemaphore.h" +#include "src/gpu/ganesh/GrRenderTask.h" +#include "src/gpu/ganesh/GrSemaphore.h" class GrWaitRenderTask final : public GrRenderTask { public: diff --git a/src/gpu/GrWindowRectangles.h b/src/gpu/ganesh/GrWindowRectangles.h similarity index 98% rename from src/gpu/GrWindowRectangles.h rename to src/gpu/ganesh/GrWindowRectangles.h index 6658162991..c45b96ee97 100644 --- a/src/gpu/GrWindowRectangles.h +++ b/src/gpu/ganesh/GrWindowRectangles.h @@ -9,7 +9,7 @@ #define GrWindowRectangles_DEFINED #include "include/core/SkRect.h" -#include "src/gpu/GrNonAtomicRef.h" +#include "src/gpu/ganesh/GrNonAtomicRef.h" class GrWindowRectangles { public: diff --git a/src/gpu/GrWindowRectsState.h b/src/gpu/ganesh/GrWindowRectsState.h similarity index 96% rename from src/gpu/GrWindowRectsState.h rename to src/gpu/ganesh/GrWindowRectsState.h index 59ff938bfd..46427c9cb6 100644 --- a/src/gpu/GrWindowRectsState.h +++ b/src/gpu/ganesh/GrWindowRectsState.h @@ -8,7 +8,7 @@ #ifndef GrWindowRectsState_DEFINED #define GrWindowRectsState_DEFINED -#include "src/gpu/GrWindowRectangles.h" +#include "src/gpu/ganesh/GrWindowRectangles.h" class GrWindowRectsState { public: diff --git a/src/gpu/GrWritePixelsRenderTask.cpp b/src/gpu/ganesh/GrWritePixelsRenderTask.cpp similarity index 93% rename from src/gpu/GrWritePixelsRenderTask.cpp rename to src/gpu/ganesh/GrWritePixelsRenderTask.cpp index 46e3d13f32..64d28ff123 100644 --- a/src/gpu/GrWritePixelsRenderTask.cpp +++ b/src/gpu/ganesh/GrWritePixelsRenderTask.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/GrWritePixelsRenderTask.h" +#include "src/gpu/ganesh/GrWritePixelsRenderTask.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" sk_sp GrWritePixelsTask::Make(GrDrawingManager* dm, sk_sp dst, diff --git a/src/gpu/GrWritePixelsRenderTask.h b/src/gpu/ganesh/GrWritePixelsRenderTask.h similarity index 97% rename from src/gpu/GrWritePixelsRenderTask.h rename to src/gpu/ganesh/GrWritePixelsRenderTask.h index 64a3954437..16526ac12e 100644 --- a/src/gpu/GrWritePixelsRenderTask.h +++ b/src/gpu/ganesh/GrWritePixelsRenderTask.h @@ -8,7 +8,7 @@ #ifndef GrWritePixelsTask_DEFINED #define GrWritePixelsTask_DEFINED -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" class GrWritePixelsTask final : public GrRenderTask { public: diff --git a/src/gpu/GrXferProcessor.cpp b/src/gpu/ganesh/GrXferProcessor.cpp similarity index 98% rename from src/gpu/GrXferProcessor.cpp rename to src/gpu/ganesh/GrXferProcessor.cpp index 7b959b41e8..91c6f34942 100644 --- a/src/gpu/GrXferProcessor.cpp +++ b/src/gpu/ganesh/GrXferProcessor.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrPipeline.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" GrXferProcessor::GrXferProcessor(ClassID classID) : INHERITED(classID) diff --git a/src/gpu/GrXferProcessor.h b/src/gpu/ganesh/GrXferProcessor.h similarity index 98% rename from src/gpu/GrXferProcessor.h rename to src/gpu/ganesh/GrXferProcessor.h index f04cc2edc3..18ab3b1af7 100644 --- a/src/gpu/GrXferProcessor.h +++ b/src/gpu/ganesh/GrXferProcessor.h @@ -10,11 +10,11 @@ #include "include/gpu/GrTypes.h" #include "src/gpu/Blend.h" -#include "src/gpu/GrNonAtomicRef.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProcessorAnalysis.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrNonAtomicRef.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" class GrGLSLXPFragmentBuilder; class GrGLSLProgramDataManager; diff --git a/src/gpu/GrYUVABackendTextures.cpp b/src/gpu/ganesh/GrYUVABackendTextures.cpp similarity index 100% rename from src/gpu/GrYUVABackendTextures.cpp rename to src/gpu/ganesh/GrYUVABackendTextures.cpp diff --git a/src/gpu/GrYUVATextureProxies.cpp b/src/gpu/ganesh/GrYUVATextureProxies.cpp similarity index 98% rename from src/gpu/GrYUVATextureProxies.cpp rename to src/gpu/ganesh/GrYUVATextureProxies.cpp index 4715a0fdb4..1de0f45e53 100644 --- a/src/gpu/GrYUVATextureProxies.cpp +++ b/src/gpu/ganesh/GrYUVATextureProxies.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" #ifdef SK_DEBUG static int num_channels(uint32_t channelFlags) { diff --git a/src/gpu/GrYUVATextureProxies.h b/src/gpu/ganesh/GrYUVATextureProxies.h similarity index 96% rename from src/gpu/GrYUVATextureProxies.h rename to src/gpu/ganesh/GrYUVATextureProxies.h index 9734d023f9..61324b99a2 100644 --- a/src/gpu/GrYUVATextureProxies.h +++ b/src/gpu/ganesh/GrYUVATextureProxies.h @@ -10,8 +10,8 @@ #include "include/core/SkYUVAInfo.h" #include "src/core/SkYUVAInfoLocation.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" class GrSurfaceProxyView; diff --git a/src/gpu/SkGr.cpp b/src/gpu/ganesh/SkGr.cpp similarity index 97% rename from src/gpu/SkGr.cpp rename to src/gpu/ganesh/SkGr.cpp index de07323adc..abc0a316fe 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/ganesh/SkGr.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/SkGr.h" #include "include/core/SkCanvas.h" #include "include/core/SkColorFilter.h" @@ -30,21 +30,21 @@ #include "src/core/SkResourceCache.h" #include "src/core/SkRuntimeEffectPriv.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "src/image/SkImage_Base.h" #include "src/shaders/SkShaderBase.h" diff --git a/src/gpu/SkGr.h b/src/gpu/ganesh/SkGr.h similarity index 98% rename from src/gpu/SkGr.h rename to src/gpu/ganesh/SkGr.h index b011590117..1ac6320c1a 100644 --- a/src/gpu/SkGr.h +++ b/src/gpu/ganesh/SkGr.h @@ -17,9 +17,9 @@ #include "include/private/SkColorData.h" #include "src/core/SkBlendModePriv.h" #include "src/gpu/Blend.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrSamplerState.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrSamplerState.h" class GrCaps; class GrColorInfo; diff --git a/src/gpu/SurfaceContext.cpp b/src/gpu/ganesh/SurfaceContext.cpp similarity index 98% rename from src/gpu/SurfaceContext.cpp rename to src/gpu/ganesh/SurfaceContext.cpp index 2903d5ef89..362227c8f0 100644 --- a/src/gpu/SurfaceContext.cpp +++ b/src/gpu/ganesh/SurfaceContext.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" @@ -13,21 +13,21 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkMipmap.h" #include "src/core/SkYUVMath.h" -#include "src/gpu/GrClientMappedBufferManager.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrClientMappedBufferManager.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include diff --git a/src/gpu/SurfaceContext.h b/src/gpu/ganesh/SurfaceContext.h similarity index 97% rename from src/gpu/SurfaceContext.h rename to src/gpu/ganesh/SurfaceContext.h index a1e99e1ad1..90859895fd 100644 --- a/src/gpu/SurfaceContext.h +++ b/src/gpu/ganesh/SurfaceContext.h @@ -13,13 +13,13 @@ #include "include/core/SkRefCnt.h" #include "include/core/SkSamplingOptions.h" #include "include/core/SkSurface.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrPixmap.h" -#include "src/gpu/GrRenderTask.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrPixmap.h" +#include "src/gpu/ganesh/GrRenderTask.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" class GrDrawingManager; class GrRecordingContext; diff --git a/src/gpu/SurfaceFillContext.cpp b/src/gpu/ganesh/SurfaceFillContext.cpp similarity index 83% rename from src/gpu/SurfaceFillContext.cpp rename to src/gpu/ganesh/SurfaceFillContext.cpp index eab314dfae..a1655e7442 100644 --- a/src/gpu/SurfaceFillContext.cpp +++ b/src/gpu/ganesh/SurfaceFillContext.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" -#include "src/gpu/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" namespace skgpu { diff --git a/src/gpu/SurfaceFillContext.h b/src/gpu/ganesh/SurfaceFillContext.h similarity index 99% rename from src/gpu/SurfaceFillContext.h rename to src/gpu/ganesh/SurfaceFillContext.h index c74c048942..021b55a968 100644 --- a/src/gpu/SurfaceFillContext.h +++ b/src/gpu/ganesh/SurfaceFillContext.h @@ -8,7 +8,7 @@ #ifndef SurfaceFillContext_DEFINED #define SurfaceFillContext_DEFINED -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/SurfaceContext.h" namespace skgpu { diff --git a/src/gpu/d3d/BUILD.bazel b/src/gpu/ganesh/d3d/BUILD.bazel similarity index 81% rename from src/gpu/d3d/BUILD.bazel rename to src/gpu/ganesh/d3d/BUILD.bazel index d00a50648c..d05f24f75a 100644 --- a/src/gpu/d3d/BUILD.bazel +++ b/src/gpu/ganesh/d3d/BUILD.bazel @@ -28,7 +28,7 @@ generated_cc_atom( ":GrD3DDescriptorHeap_hdr", ":GrD3DTextureResource_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrAttachment_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", ], ) @@ -48,8 +48,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrGpuBuffer_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -71,7 +71,7 @@ generated_cc_atom( deps = [ ":GrD3DAttachment_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrCaps_hdr", + "//src/gpu/ganesh:GrCaps_hdr", ], ) @@ -90,12 +90,12 @@ generated_cc_atom( "//include/gpu/d3d:GrD3DBackendContext_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", "//src/core:SkCompressedDataUtils_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrStencilSettings_hdr", "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", ], ) @@ -107,8 +107,8 @@ generated_cc_atom( ":GrD3DRootSignature_hdr", "//include/gpu:GrTypes_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu:GrRingBuffer_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh:GrRingBuffer_hdr", ], ) @@ -128,7 +128,7 @@ generated_cc_atom( ":GrD3DTexture_hdr", ":GrD3DUtil_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrScissorState_hdr", + "//src/gpu/ganesh:GrScissorState_hdr", ], ) @@ -138,7 +138,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -175,7 +175,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", "//src/utils:SkBitSet_hdr", ], ) @@ -216,10 +216,10 @@ generated_cc_atom( ":GrD3DCommandList_hdr", ":GrD3DResourceProvider_hdr", "//include/private:SkDeque_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrStagingBufferManager_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrStagingBufferManager_hdr", ], ) @@ -242,10 +242,10 @@ generated_cc_atom( "//include/gpu/d3d:GrD3DBackendContext_hdr", "//src/core:SkConvertPixels_hdr", "//src/core:SkMipmap_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", "//src/sksl:SkSLCompiler_hdr", ], ) @@ -257,7 +257,7 @@ generated_cc_atom( deps = [ "//include/gpu:GrTypes_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", ], ) @@ -275,13 +275,13 @@ generated_cc_atom( ":GrD3DRenderTarget_hdr", ":GrD3DTexture_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", ], ) @@ -291,10 +291,10 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrD3DPipelineState_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrSPIRVUniformHandler_hdr", - "//src/gpu:GrSPIRVVaryingHandler_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrSPIRVUniformHandler_hdr", + "//src/gpu/ganesh:GrSPIRVVaryingHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl/ir:SkSLProgram_hdr", ], ) @@ -314,11 +314,11 @@ generated_cc_atom( "//include/gpu/d3d:GrD3DTypes_hdr", "//src/core:SkReadBuffer_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrAutoLocaleSetter_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPersistentCacheUtils_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrStencilSettings_hdr", + "//src/gpu/ganesh:GrAutoLocaleSetter_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPersistentCacheUtils_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/utils:SkShaderUtils_hdr", ], @@ -330,8 +330,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrSPIRVUniformHandler_hdr", - "//src/gpu:GrUniformDataManager_hdr", + "//src/gpu/ganesh:GrSPIRVUniformHandler_hdr", + "//src/gpu/ganesh:GrUniformDataManager_hdr", ], ) @@ -355,8 +355,8 @@ generated_cc_atom( "//include/core:SkRefCnt_hdr", "//include/gpu:GrTypes_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", ], ) @@ -372,12 +372,12 @@ generated_cc_atom( ":GrD3DRootSignature_hdr", ":GrD3DTexture_hdr", "//include/private:SkTemplates_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", ], ) @@ -387,7 +387,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -400,8 +400,8 @@ generated_cc_atom( ":GrD3DResourceProvider_hdr", ":GrD3DTextureResource_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", ], ) @@ -417,8 +417,8 @@ generated_cc_atom( ":GrD3DUtil_hdr", "//include/gpu:GrBackendSurface_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrRenderTarget_hdr", "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", ], ) @@ -437,8 +437,8 @@ generated_cc_atom( "//include/private:SkTArray_hdr", "//include/private:SkTHash_hdr", "//src/core:SkLRUCache_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrRingBuffer_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrRingBuffer_hdr", ], ) @@ -457,7 +457,7 @@ generated_cc_atom( "//include/gpu:GrContextOptions_hdr", "//include/gpu:GrDirectContext_hdr", "//include/private:SkOpts_spi_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", ], ) @@ -477,7 +477,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -488,7 +488,7 @@ generated_cc_atom( deps = [ ":GrD3DGpu_hdr", ":GrD3DRootSignature_hdr", - "//src/gpu:GrSPIRVUniformHandler_hdr", + "//src/gpu/ganesh:GrSPIRVUniformHandler_hdr", ], ) @@ -500,7 +500,7 @@ generated_cc_atom( "//include/gpu:GrBackendSemaphore_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrSemaphore_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", ], ) @@ -532,7 +532,7 @@ generated_cc_atom( deps = [ ":GrD3DGpu_hdr", ":GrD3DTextureRenderTarget_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -546,7 +546,7 @@ generated_cc_atom( "//include/gpu:GrBackendSurface_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -558,7 +558,7 @@ generated_cc_atom( ":GrD3DAMDMemoryAllocator_hdr", ":GrD3DGpu_hdr", ":GrD3DTextureResource_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", ], ) @@ -570,8 +570,8 @@ generated_cc_atom( ":GrD3DDescriptorHeap_hdr", ":GrD3DTextureResource_hdr", "//src/core:SkLRUCache_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -584,7 +584,7 @@ generated_cc_atom( ":GrD3DTexture_hdr", ":GrD3DUtil_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -633,8 +633,8 @@ generated_cc_atom( deps = [ ":GrD3DGpu_hdr", ":GrD3DUtil_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//src/sksl:SkSLCompiler_hdr", ], ) diff --git a/src/gpu/d3d/GrD3DAMDMemoryAllocator.cpp b/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp similarity index 96% rename from src/gpu/d3d/GrD3DAMDMemoryAllocator.cpp rename to src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp index 74bd2795a5..1eabcfe3eb 100644 --- a/src/gpu/d3d/GrD3DAMDMemoryAllocator.cpp +++ b/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DAMDMemoryAllocator.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" sk_sp GrD3DAMDMemoryAllocator::Make(IDXGIAdapter* adapter, ID3D12Device* device) { diff --git a/src/gpu/d3d/GrD3DAMDMemoryAllocator.h b/src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h similarity index 100% rename from src/gpu/d3d/GrD3DAMDMemoryAllocator.h rename to src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h diff --git a/src/gpu/d3d/GrD3DAttachment.cpp b/src/gpu/ganesh/d3d/GrD3DAttachment.cpp similarity index 97% rename from src/gpu/d3d/GrD3DAttachment.cpp rename to src/gpu/ganesh/d3d/GrD3DAttachment.cpp index c043be74d2..2975ddaf6d 100644 --- a/src/gpu/d3d/GrD3DAttachment.cpp +++ b/src/gpu/ganesh/d3d/GrD3DAttachment.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DAttachment.h" +#include "src/gpu/ganesh/d3d/GrD3DAttachment.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" GrD3DAttachment::GrD3DAttachment(GrD3DGpu* gpu, SkISize dimensions, diff --git a/src/gpu/d3d/GrD3DAttachment.h b/src/gpu/ganesh/d3d/GrD3DAttachment.h similarity index 90% rename from src/gpu/d3d/GrD3DAttachment.h rename to src/gpu/ganesh/d3d/GrD3DAttachment.h index aaeacecd28..07b0814521 100644 --- a/src/gpu/d3d/GrD3DAttachment.h +++ b/src/gpu/ganesh/d3d/GrD3DAttachment.h @@ -8,11 +8,11 @@ #ifndef GrD3DAttachment_DEFINED #define GrD3DAttachment_DEFINED -#include "src/gpu/GrAttachment.h" +#include "src/gpu/ganesh/GrAttachment.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/d3d/GrD3DDescriptorHeap.h" -#include "src/gpu/d3d/GrD3DTextureResource.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureResource.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DBuffer.cpp b/src/gpu/ganesh/d3d/GrD3DBuffer.cpp similarity index 98% rename from src/gpu/d3d/GrD3DBuffer.cpp rename to src/gpu/ganesh/d3d/GrD3DBuffer.cpp index 54e4b1ec40..a1073b3eed 100644 --- a/src/gpu/d3d/GrD3DBuffer.cpp +++ b/src/gpu/ganesh/d3d/GrD3DBuffer.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DBuffer.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #ifdef SK_DEBUG #define VALIDATE() this->validate() diff --git a/src/gpu/d3d/GrD3DBuffer.h b/src/gpu/ganesh/d3d/GrD3DBuffer.h similarity index 94% rename from src/gpu/d3d/GrD3DBuffer.h rename to src/gpu/ganesh/d3d/GrD3DBuffer.h index bd40784d92..2d8c3a478c 100644 --- a/src/gpu/d3d/GrD3DBuffer.h +++ b/src/gpu/ganesh/d3d/GrD3DBuffer.h @@ -10,8 +10,8 @@ #define GrD3DBuffer_DEFINED #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrManagedResource.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DCaps.cpp b/src/gpu/ganesh/d3d/GrD3DCaps.cpp similarity index 99% rename from src/gpu/d3d/GrD3DCaps.cpp rename to src/gpu/ganesh/d3d/GrD3DCaps.cpp index 7520c9f9f9..34f792d2bf 100644 --- a/src/gpu/d3d/GrD3DCaps.cpp +++ b/src/gpu/ganesh/d3d/GrD3DCaps.cpp @@ -11,17 +11,17 @@ #include "include/gpu/d3d/GrD3DTypes.h" #include "src/core/SkCompressedDataUtils.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrStencilSettings.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/d3d/GrD3DCaps.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DRenderTarget.h" -#include "src/gpu/d3d/GrD3DTexture.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/d3d/GrD3DCaps.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" GrD3DCaps::GrD3DCaps(const GrContextOptions& contextOptions, IDXGIAdapter1* adapter, ID3D12Device* device) diff --git a/src/gpu/d3d/GrD3DCaps.h b/src/gpu/ganesh/d3d/GrD3DCaps.h similarity index 98% rename from src/gpu/d3d/GrD3DCaps.h rename to src/gpu/ganesh/d3d/GrD3DCaps.h index 8d6774943a..3a433ee684 100644 --- a/src/gpu/d3d/GrD3DCaps.h +++ b/src/gpu/ganesh/d3d/GrD3DCaps.h @@ -9,10 +9,10 @@ #ifndef GrD3DCaps_DEFINED #define GrD3DCaps_DEFINED -#include "src/gpu/GrCaps.h" +#include "src/gpu/ganesh/GrCaps.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/d3d/GrD3DAttachment.h" +#include "src/gpu/ganesh/d3d/GrD3DAttachment.h" /** * Stores some capabilities of a D3D backend. diff --git a/src/gpu/d3d/GrD3DCommandList.cpp b/src/gpu/ganesh/d3d/GrD3DCommandList.cpp similarity index 98% rename from src/gpu/d3d/GrD3DCommandList.cpp rename to src/gpu/ganesh/d3d/GrD3DCommandList.cpp index 7435718da5..4efac0e35b 100644 --- a/src/gpu/d3d/GrD3DCommandList.cpp +++ b/src/gpu/ganesh/d3d/GrD3DCommandList.cpp @@ -5,19 +5,19 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DCommandList.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandList.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrScissorState.h" -#include "src/gpu/d3d/GrD3DAttachment.h" -#include "src/gpu/d3d/GrD3DBuffer.h" -#include "src/gpu/d3d/GrD3DCommandSignature.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DPipeline.h" -#include "src/gpu/d3d/GrD3DRenderTarget.h" -#include "src/gpu/d3d/GrD3DTexture.h" -#include "src/gpu/d3d/GrD3DTextureResource.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrScissorState.h" +#include "src/gpu/ganesh/d3d/GrD3DAttachment.h" +#include "src/gpu/ganesh/d3d/GrD3DBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DPipeline.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureResource.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" GrD3DCommandList::GrD3DCommandList(gr_cp allocator, gr_cp commandList) diff --git a/src/gpu/d3d/GrD3DCommandList.h b/src/gpu/ganesh/d3d/GrD3DCommandList.h similarity index 98% rename from src/gpu/d3d/GrD3DCommandList.h rename to src/gpu/ganesh/d3d/GrD3DCommandList.h index a456d67b26..4227dee9b1 100644 --- a/src/gpu/d3d/GrD3DCommandList.h +++ b/src/gpu/ganesh/d3d/GrD3DCommandList.h @@ -10,9 +10,9 @@ #include "include/gpu/GrTypes.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/GrRingBuffer.h" -#include "src/gpu/d3d/GrD3DRootSignature.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/GrRingBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DRootSignature.h" #include diff --git a/src/gpu/d3d/GrD3DCommandSignature.cpp b/src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp similarity index 93% rename from src/gpu/d3d/GrD3DCommandSignature.cpp rename to src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp index e874a49bf8..48708e91ad 100644 --- a/src/gpu/d3d/GrD3DCommandSignature.cpp +++ b/src/gpu/ganesh/d3d/GrD3DCommandSignature.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DCommandSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandSignature.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" sk_sp GrD3DCommandSignature::Make(GrD3DGpu* gpu, ForIndexed forIndexed, unsigned int slot) { diff --git a/src/gpu/d3d/GrD3DCommandSignature.h b/src/gpu/ganesh/d3d/GrD3DCommandSignature.h similarity index 97% rename from src/gpu/d3d/GrD3DCommandSignature.h rename to src/gpu/ganesh/d3d/GrD3DCommandSignature.h index adb4954bd7..b118220ce8 100644 --- a/src/gpu/d3d/GrD3DCommandSignature.h +++ b/src/gpu/ganesh/d3d/GrD3DCommandSignature.h @@ -9,7 +9,7 @@ #define GrD3DCommandSignature_DEFINED #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DCpuDescriptorManager.cpp b/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp similarity index 98% rename from src/gpu/d3d/GrD3DCpuDescriptorManager.cpp rename to src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp index 760a70f0fe..c9c33236c9 100644 --- a/src/gpu/d3d/GrD3DCpuDescriptorManager.cpp +++ b/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DCpuDescriptorManager.h" +#include "src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" GrD3DCpuDescriptorManager::GrD3DCpuDescriptorManager(GrD3DGpu* gpu) : fRTVDescriptorPool(gpu, D3D12_DESCRIPTOR_HEAP_TYPE_RTV) diff --git a/src/gpu/d3d/GrD3DCpuDescriptorManager.h b/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h similarity index 98% rename from src/gpu/d3d/GrD3DCpuDescriptorManager.h rename to src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h index a100cea96e..d1c0a84b5c 100644 --- a/src/gpu/d3d/GrD3DCpuDescriptorManager.h +++ b/src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h @@ -8,7 +8,7 @@ #ifndef GrD3DCpuDescriptorManager_DEFINED #define GrD3DCpuDescriptorManager_DEFINED -#include "src/gpu/d3d/GrD3DDescriptorHeap.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h" #include class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DDescriptorHeap.cpp b/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp similarity index 95% rename from src/gpu/d3d/GrD3DDescriptorHeap.cpp rename to src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp index 8d2569783b..9f9facfb9c 100644 --- a/src/gpu/d3d/GrD3DDescriptorHeap.cpp +++ b/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DDescriptorHeap.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" std::unique_ptr GrD3DDescriptorHeap::Make(GrD3DGpu* gpu, D3D12_DESCRIPTOR_HEAP_TYPE type, diff --git a/src/gpu/d3d/GrD3DDescriptorHeap.h b/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h similarity index 98% rename from src/gpu/d3d/GrD3DDescriptorHeap.h rename to src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h index 30fdc1358e..0d86db13d6 100644 --- a/src/gpu/d3d/GrD3DDescriptorHeap.h +++ b/src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h @@ -9,7 +9,7 @@ #define GrD3DDescriptorHeap_DEFINED #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" #include "src/utils/SkBitSet.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DDescriptorTableManager.cpp b/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp similarity index 98% rename from src/gpu/d3d/GrD3DDescriptorTableManager.cpp rename to src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp index 56dcf6baa9..a1cfbb32f3 100644 --- a/src/gpu/d3d/GrD3DDescriptorTableManager.cpp +++ b/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DDescriptorTableManager.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" GrD3DDescriptorTableManager::GrD3DDescriptorTableManager(GrD3DGpu* gpu) : fShaderViewDescriptorPool(gpu, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV) diff --git a/src/gpu/d3d/GrD3DDescriptorTableManager.h b/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h similarity index 98% rename from src/gpu/d3d/GrD3DDescriptorTableManager.h rename to src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h index 14a2097c40..b06def9f49 100644 --- a/src/gpu/d3d/GrD3DDescriptorTableManager.h +++ b/src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h @@ -8,7 +8,7 @@ #ifndef GrD3DGpuDescriptorTableManager_DEFINED #define GrD3DGpuDescriptorTableManager_DEFINED -#include "src/gpu/d3d/GrD3DDescriptorHeap.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h" #include class GrD3DCommandList; diff --git a/src/gpu/d3d/GrD3DGpu.cpp b/src/gpu/ganesh/d3d/GrD3DGpu.cpp similarity index 99% rename from src/gpu/d3d/GrD3DGpu.cpp rename to src/gpu/ganesh/d3d/GrD3DGpu.cpp index fb9fb58b79..2be9648989 100644 --- a/src/gpu/d3d/GrD3DGpu.cpp +++ b/src/gpu/ganesh/d3d/GrD3DGpu.cpp @@ -5,25 +5,25 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/d3d/GrD3DBackendContext.h" #include "src/core/SkConvertPixels.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/d3d/GrD3DAMDMemoryAllocator.h" -#include "src/gpu/d3d/GrD3DAttachment.h" -#include "src/gpu/d3d/GrD3DBuffer.h" -#include "src/gpu/d3d/GrD3DCaps.h" -#include "src/gpu/d3d/GrD3DOpsRenderPass.h" -#include "src/gpu/d3d/GrD3DSemaphore.h" -#include "src/gpu/d3d/GrD3DTexture.h" -#include "src/gpu/d3d/GrD3DTextureRenderTarget.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h" +#include "src/gpu/ganesh/d3d/GrD3DAttachment.h" +#include "src/gpu/ganesh/d3d/GrD3DBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DCaps.h" +#include "src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h" +#include "src/gpu/ganesh/d3d/GrD3DSemaphore.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #include "src/sksl/SkSLCompiler.h" #if GR_TEST_UTILS diff --git a/src/gpu/d3d/GrD3DGpu.h b/src/gpu/ganesh/d3d/GrD3DGpu.h similarity index 97% rename from src/gpu/d3d/GrD3DGpu.h rename to src/gpu/ganesh/d3d/GrD3DGpu.h index 5bc16492ff..2692cc5095 100644 --- a/src/gpu/d3d/GrD3DGpu.h +++ b/src/gpu/ganesh/d3d/GrD3DGpu.h @@ -9,13 +9,13 @@ #define GrD3DGpu_DEFINED #include "include/private/SkDeque.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrStagingBufferManager.h" -#include "src/gpu/d3d/GrD3DCaps.h" -#include "src/gpu/d3d/GrD3DCommandList.h" -#include "src/gpu/d3d/GrD3DResourceProvider.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" +#include "src/gpu/ganesh/d3d/GrD3DCaps.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandList.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceProvider.h" struct GrD3DBackendContext; class GrD3DOpsRenderPass; diff --git a/src/gpu/d3d/GrD3DOpsRenderPass.cpp b/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp similarity index 95% rename from src/gpu/d3d/GrD3DOpsRenderPass.cpp rename to src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp index 4b2a8c3b02..e00716f848 100644 --- a/src/gpu/d3d/GrD3DOpsRenderPass.cpp +++ b/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.cpp @@ -5,25 +5,25 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DOpsRenderPass.h" +#include "src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/d3d/GrD3DBuffer.h" -#include "src/gpu/d3d/GrD3DCommandSignature.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DPipelineState.h" -#include "src/gpu/d3d/GrD3DPipelineStateBuilder.h" -#include "src/gpu/d3d/GrD3DRenderTarget.h" -#include "src/gpu/d3d/GrD3DTexture.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/d3d/GrD3DBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineState.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif GrD3DOpsRenderPass::GrD3DOpsRenderPass(GrD3DGpu* gpu) : fGpu(gpu) {} diff --git a/src/gpu/d3d/GrD3DOpsRenderPass.h b/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h similarity index 98% rename from src/gpu/d3d/GrD3DOpsRenderPass.h rename to src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h index 02266b8991..5ec6288d14 100644 --- a/src/gpu/d3d/GrD3DOpsRenderPass.h +++ b/src/gpu/ganesh/d3d/GrD3DOpsRenderPass.h @@ -8,7 +8,7 @@ #ifndef GrD3DOpsRenderPass_DEFINED #define GrD3DOpsRenderPass_DEFINED -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" #include "include/gpu/GrTypes.h" #include "include/private/GrTypesPriv.h" diff --git a/src/gpu/d3d/GrD3DPipeline.h b/src/gpu/ganesh/d3d/GrD3DPipeline.h similarity index 96% rename from src/gpu/d3d/GrD3DPipeline.h rename to src/gpu/ganesh/d3d/GrD3DPipeline.h index 5891abd00f..e757fa3a9b 100644 --- a/src/gpu/d3d/GrD3DPipeline.h +++ b/src/gpu/ganesh/d3d/GrD3DPipeline.h @@ -9,7 +9,7 @@ #define GrD3DPipeline_DEFINED #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" class GrD3DPipeline : public GrManagedResource { public: diff --git a/src/gpu/d3d/GrD3DPipelineState.cpp b/src/gpu/ganesh/d3d/GrD3DPipelineState.cpp similarity index 93% rename from src/gpu/d3d/GrD3DPipelineState.cpp rename to src/gpu/ganesh/d3d/GrD3DPipelineState.cpp index 916df8a2be..9b90e706a4 100644 --- a/src/gpu/d3d/GrD3DPipelineState.cpp +++ b/src/gpu/ganesh/d3d/GrD3DPipelineState.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DPipelineState.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineState.h" #include "include/private/SkTemplates.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/d3d/GrD3DBuffer.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DPipeline.h" -#include "src/gpu/d3d/GrD3DRootSignature.h" -#include "src/gpu/d3d/GrD3DTexture.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/d3d/GrD3DBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DPipeline.h" +#include "src/gpu/ganesh/d3d/GrD3DRootSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" GrD3DPipelineState::GrD3DPipelineState( sk_sp pipeline, diff --git a/src/gpu/d3d/GrD3DPipelineState.h b/src/gpu/ganesh/d3d/GrD3DPipelineState.h similarity index 95% rename from src/gpu/d3d/GrD3DPipelineState.h rename to src/gpu/ganesh/d3d/GrD3DPipelineState.h index 9cd9ca51ff..aa3dd1be6a 100644 --- a/src/gpu/d3d/GrD3DPipelineState.h +++ b/src/gpu/ganesh/d3d/GrD3DPipelineState.h @@ -11,9 +11,9 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrTypes.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/d3d/GrD3DPipelineStateDataManager.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include diff --git a/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp b/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp similarity index 98% rename from src/gpu/d3d/GrD3DPipelineStateBuilder.cpp rename to src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp index ab2d1e75a1..cb674231b8 100644 --- a/src/gpu/d3d/GrD3DPipelineStateBuilder.cpp +++ b/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.cpp @@ -7,22 +7,22 @@ //#include -#include "src/gpu/d3d/GrD3DPipelineStateBuilder.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/d3d/GrD3DTypes.h" #include "src/core/SkReadBuffer.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPersistentCacheUtils.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DPipeline.h" -#include "src/gpu/d3d/GrD3DRenderTarget.h" -#include "src/gpu/d3d/GrD3DRootSignature.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrAutoLocaleSetter.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DPipeline.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DRootSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #include "src/sksl/SkSLCompiler.h" #include "src/utils/SkShaderUtils.h" diff --git a/src/gpu/d3d/GrD3DPipelineStateBuilder.h b/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h similarity index 91% rename from src/gpu/d3d/GrD3DPipelineStateBuilder.h rename to src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h index d8025600da..bfd41cd572 100644 --- a/src/gpu/d3d/GrD3DPipelineStateBuilder.h +++ b/src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h @@ -8,11 +8,11 @@ #ifndef GrD3DPipelineStateBuilder_DEFINED #define GrD3DPipelineStateBuilder_DEFINED -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrSPIRVUniformHandler.h" -#include "src/gpu/GrSPIRVVaryingHandler.h" -#include "src/gpu/d3d/GrD3DPipelineState.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrSPIRVUniformHandler.h" +#include "src/gpu/ganesh/GrSPIRVVaryingHandler.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineState.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include "src/sksl/ir/SkSLProgram.h" class GrProgramDesc; diff --git a/src/gpu/d3d/GrD3DPipelineStateDataManager.cpp b/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp similarity index 89% rename from src/gpu/d3d/GrD3DPipelineStateDataManager.cpp rename to src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp index a902bddc9a..8c4a27f072 100644 --- a/src/gpu/d3d/GrD3DPipelineStateDataManager.cpp +++ b/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DPipelineStateDataManager.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DResourceProvider.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceProvider.h" GrD3DPipelineStateDataManager::GrD3DPipelineStateDataManager(const UniformInfoArray& uniforms, uint32_t uniformSize) diff --git a/src/gpu/d3d/GrD3DPipelineStateDataManager.h b/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h similarity index 88% rename from src/gpu/d3d/GrD3DPipelineStateDataManager.h rename to src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h index 18e8278cd9..1358064164 100644 --- a/src/gpu/d3d/GrD3DPipelineStateDataManager.h +++ b/src/gpu/ganesh/d3d/GrD3DPipelineStateDataManager.h @@ -8,10 +8,10 @@ #ifndef GrD3DPipelineStateDataManager_DEFINED #define GrD3DPipelineStateDataManager_DEFINED -#include "src/gpu/GrUniformDataManager.h" +#include "src/gpu/ganesh/GrUniformDataManager.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrSPIRVUniformHandler.h" +#include "src/gpu/ganesh/GrSPIRVUniformHandler.h" class GrD3DConstantRingBuffer; class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DRenderTarget.cpp b/src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp similarity index 96% rename from src/gpu/d3d/GrD3DRenderTarget.cpp rename to src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp index a9640d77a9..b925402e65 100644 --- a/src/gpu/d3d/GrD3DRenderTarget.cpp +++ b/src/gpu/ganesh/d3d/GrD3DRenderTarget.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrRenderTarget.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DResourceProvider.h" -#include "src/gpu/d3d/GrD3DTextureResource.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceProvider.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureResource.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" // We're virtually derived from GrSurface (via GrRenderTarget) so its // constructor must be explicitly called. diff --git a/src/gpu/d3d/GrD3DRenderTarget.h b/src/gpu/ganesh/d3d/GrD3DRenderTarget.h similarity index 95% rename from src/gpu/d3d/GrD3DRenderTarget.h rename to src/gpu/ganesh/d3d/GrD3DRenderTarget.h index 20d8fceb64..09b39b043d 100644 --- a/src/gpu/d3d/GrD3DRenderTarget.h +++ b/src/gpu/ganesh/d3d/GrD3DRenderTarget.h @@ -9,13 +9,13 @@ #ifndef GrD3DRenderTarget_DEFINED #define GrD3DRenderTarget_DEFINED -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/d3d/GrD3DTextureResource.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureResource.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/d3d/GrD3DDescriptorHeap.h" -#include "src/gpu/d3d/GrD3DResourceProvider.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceProvider.h" class GrD3DGpu; class GrD3DRenderTarget; diff --git a/src/gpu/d3d/GrD3DResourceProvider.cpp b/src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp similarity index 97% rename from src/gpu/d3d/GrD3DResourceProvider.cpp rename to src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp index 363cc0c25a..7f159b7e39 100644 --- a/src/gpu/d3d/GrD3DResourceProvider.cpp +++ b/src/gpu/ganesh/d3d/GrD3DResourceProvider.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DResourceProvider.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceProvider.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "include/private/SkOpts_spi.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/d3d/GrD3DBuffer.h" -#include "src/gpu/d3d/GrD3DCommandList.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DPipelineState.h" -#include "src/gpu/d3d/GrD3DPipelineStateBuilder.h" -#include "src/gpu/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/d3d/GrD3DBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandList.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineState.h" +#include "src/gpu/ganesh/d3d/GrD3DPipelineStateBuilder.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" GrD3DResourceProvider::GrD3DResourceProvider(GrD3DGpu* gpu) : fGpu(gpu) diff --git a/src/gpu/d3d/GrD3DResourceProvider.h b/src/gpu/ganesh/d3d/GrD3DResourceProvider.h similarity index 93% rename from src/gpu/d3d/GrD3DResourceProvider.h rename to src/gpu/ganesh/d3d/GrD3DResourceProvider.h index 64e127b489..480d075086 100644 --- a/src/gpu/d3d/GrD3DResourceProvider.h +++ b/src/gpu/ganesh/d3d/GrD3DResourceProvider.h @@ -12,14 +12,14 @@ #include "include/private/SkTArray.h" #include "include/private/SkTHash.h" #include "src/core/SkLRUCache.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrRingBuffer.h" -#include "src/gpu/d3d/GrD3DCommandSignature.h" -#include "src/gpu/d3d/GrD3DCpuDescriptorManager.h" -#include "src/gpu/d3d/GrD3DDescriptorTableManager.h" -#include "src/gpu/d3d/GrD3DPipeline.h" -#include "src/gpu/d3d/GrD3DRootSignature.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrRingBuffer.h" +#include "src/gpu/ganesh/d3d/GrD3DCommandSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DCpuDescriptorManager.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorTableManager.h" +#include "src/gpu/ganesh/d3d/GrD3DPipeline.h" +#include "src/gpu/ganesh/d3d/GrD3DRootSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #include diff --git a/src/gpu/d3d/GrD3DResourceState.h b/src/gpu/ganesh/d3d/GrD3DResourceState.h similarity index 100% rename from src/gpu/d3d/GrD3DResourceState.h rename to src/gpu/ganesh/d3d/GrD3DResourceState.h diff --git a/src/gpu/d3d/GrD3DRootSignature.cpp b/src/gpu/ganesh/d3d/GrD3DRootSignature.cpp similarity index 97% rename from src/gpu/d3d/GrD3DRootSignature.cpp rename to src/gpu/ganesh/d3d/GrD3DRootSignature.cpp index 7a13ae211f..4dbd17b6a2 100644 --- a/src/gpu/d3d/GrD3DRootSignature.cpp +++ b/src/gpu/ganesh/d3d/GrD3DRootSignature.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DRootSignature.h" +#include "src/gpu/ganesh/d3d/GrD3DRootSignature.h" -#include "src/gpu/GrSPIRVUniformHandler.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/GrSPIRVUniformHandler.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" sk_sp GrD3DRootSignature::Make(GrD3DGpu* gpu, int numTextureSamplers, int numUAVs) { diff --git a/src/gpu/d3d/GrD3DRootSignature.h b/src/gpu/ganesh/d3d/GrD3DRootSignature.h similarity index 97% rename from src/gpu/d3d/GrD3DRootSignature.h rename to src/gpu/ganesh/d3d/GrD3DRootSignature.h index a56f8b5db2..8f68172a15 100644 --- a/src/gpu/d3d/GrD3DRootSignature.h +++ b/src/gpu/ganesh/d3d/GrD3DRootSignature.h @@ -9,7 +9,7 @@ #define GrD3DRootSignature_DEFINED #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DSemaphore.cpp b/src/gpu/ganesh/d3d/GrD3DSemaphore.cpp similarity index 90% rename from src/gpu/d3d/GrD3DSemaphore.cpp rename to src/gpu/ganesh/d3d/GrD3DSemaphore.cpp index cd2cf54965..e7208e0554 100644 --- a/src/gpu/d3d/GrD3DSemaphore.cpp +++ b/src/gpu/ganesh/d3d/GrD3DSemaphore.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DSemaphore.h" +#include "src/gpu/ganesh/d3d/GrD3DSemaphore.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" std::unique_ptr GrD3DSemaphore::Make(GrD3DGpu* gpu) { diff --git a/src/gpu/d3d/GrD3DSemaphore.h b/src/gpu/ganesh/d3d/GrD3DSemaphore.h similarity index 95% rename from src/gpu/d3d/GrD3DSemaphore.h rename to src/gpu/ganesh/d3d/GrD3DSemaphore.h index da1afdcf7b..9fe9bee60a 100644 --- a/src/gpu/d3d/GrD3DSemaphore.h +++ b/src/gpu/ganesh/d3d/GrD3DSemaphore.h @@ -11,7 +11,7 @@ #include "include/gpu/GrBackendSemaphore.h" #include "include/gpu/d3d/GrD3DTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrSemaphore.h" +#include "src/gpu/ganesh/GrSemaphore.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DTexture.cpp b/src/gpu/ganesh/d3d/GrD3DTexture.cpp similarity index 97% rename from src/gpu/d3d/GrD3DTexture.cpp rename to src/gpu/ganesh/d3d/GrD3DTexture.cpp index 76889c4921..8e579a27a3 100644 --- a/src/gpu/d3d/GrD3DTexture.cpp +++ b/src/gpu/ganesh/d3d/GrD3DTexture.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" #include "include/gpu/d3d/GrD3DTypes.h" diff --git a/src/gpu/d3d/GrD3DTexture.h b/src/gpu/ganesh/d3d/GrD3DTexture.h similarity index 95% rename from src/gpu/d3d/GrD3DTexture.h rename to src/gpu/ganesh/d3d/GrD3DTexture.h index 6c68bbfe11..6449de7bef 100644 --- a/src/gpu/d3d/GrD3DTexture.h +++ b/src/gpu/ganesh/d3d/GrD3DTexture.h @@ -9,10 +9,10 @@ #define GrD3DTexture_DEFINED #include "src/core/SkLRUCache.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/d3d/GrD3DDescriptorHeap.h" -#include "src/gpu/d3d/GrD3DTextureResource.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DDescriptorHeap.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureResource.h" class GrD3DTexture : public GrTexture, public virtual GrD3DTextureResource { public: diff --git a/src/gpu/d3d/GrD3DTextureRenderTarget.cpp b/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp similarity index 98% rename from src/gpu/d3d/GrD3DTextureRenderTarget.cpp rename to src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp index 0588dc3310..6f2d69679f 100644 --- a/src/gpu/d3d/GrD3DTextureRenderTarget.cpp +++ b/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DTextureRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" GrD3DTextureRenderTarget::GrD3DTextureRenderTarget( GrD3DGpu* gpu, diff --git a/src/gpu/d3d/GrD3DTextureRenderTarget.h b/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h similarity index 98% rename from src/gpu/d3d/GrD3DTextureRenderTarget.h rename to src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h index 195946c8a8..7c5457505a 100644 --- a/src/gpu/d3d/GrD3DTextureRenderTarget.h +++ b/src/gpu/ganesh/d3d/GrD3DTextureRenderTarget.h @@ -10,8 +10,8 @@ #define GrD3DTextureRenderTarget_DEFINED #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/d3d/GrD3DRenderTarget.h" -#include "src/gpu/d3d/GrD3DTexture.h" +#include "src/gpu/ganesh/d3d/GrD3DRenderTarget.h" +#include "src/gpu/ganesh/d3d/GrD3DTexture.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DTextureResource.cpp b/src/gpu/ganesh/d3d/GrD3DTextureResource.cpp similarity index 96% rename from src/gpu/d3d/GrD3DTextureResource.cpp rename to src/gpu/ganesh/d3d/GrD3DTextureResource.cpp index efa32f1876..d0c40fba6d 100644 --- a/src/gpu/d3d/GrD3DTextureResource.cpp +++ b/src/gpu/ganesh/d3d/GrD3DTextureResource.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/d3d/GrD3DAMDMemoryAllocator.h" -#include "src/gpu/d3d/GrD3DGpu.h" -#include "src/gpu/d3d/GrD3DTextureResource.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/d3d/GrD3DAMDMemoryAllocator.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/d3d/GrD3DTextureResource.h" void GrD3DTextureResource::setResourceState(const GrD3DGpu* gpu, D3D12_RESOURCE_STATES newResourceState, diff --git a/src/gpu/d3d/GrD3DTextureResource.h b/src/gpu/ganesh/d3d/GrD3DTextureResource.h similarity index 97% rename from src/gpu/d3d/GrD3DTextureResource.h rename to src/gpu/ganesh/d3d/GrD3DTextureResource.h index 9c32fa2691..553db42381 100644 --- a/src/gpu/d3d/GrD3DTextureResource.h +++ b/src/gpu/ganesh/d3d/GrD3DTextureResource.h @@ -12,8 +12,8 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/d3d/GrD3DTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/d3d/GrD3DResourceState.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceState.h" class GrD3DGpu; diff --git a/src/gpu/d3d/GrD3DTypesMinimal.cpp b/src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp similarity index 96% rename from src/gpu/d3d/GrD3DTypesMinimal.cpp rename to src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp index 1848a219a1..4d9f1c14cb 100644 --- a/src/gpu/d3d/GrD3DTypesMinimal.cpp +++ b/src/gpu/ganesh/d3d/GrD3DTypesMinimal.cpp @@ -8,8 +8,8 @@ #include "include/private/GrD3DTypesMinimal.h" #include "include/gpu/d3d/GrD3DTypes.h" -#include "src/gpu/d3d/GrD3DResourceState.h" -#include "src/gpu/d3d/GrD3DTypesPriv.h" +#include "src/gpu/ganesh/d3d/GrD3DResourceState.h" +#include "src/gpu/ganesh/d3d/GrD3DTypesPriv.h" GrD3DBackendSurfaceInfo::GrD3DBackendSurfaceInfo(const GrD3DTextureResourceInfo& info, GrD3DResourceState* state) diff --git a/src/gpu/d3d/GrD3DTypesPriv.cpp b/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp similarity index 94% rename from src/gpu/d3d/GrD3DTypesPriv.cpp rename to src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp index 1af1d69467..9f1e3500f5 100644 --- a/src/gpu/d3d/GrD3DTypesPriv.cpp +++ b/src/gpu/ganesh/d3d/GrD3DTypesPriv.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DTypesPriv.h" +#include "src/gpu/ganesh/d3d/GrD3DTypesPriv.h" GrD3DSurfaceInfo GrD3DTextureResourceSpecToSurfaceInfo(const GrD3DTextureResourceSpec& d3dSpec, uint32_t sampleCount, diff --git a/src/gpu/d3d/GrD3DTypesPriv.h b/src/gpu/ganesh/d3d/GrD3DTypesPriv.h similarity index 100% rename from src/gpu/d3d/GrD3DTypesPriv.h rename to src/gpu/ganesh/d3d/GrD3DTypesPriv.h diff --git a/src/gpu/d3d/GrD3DUtil.cpp b/src/gpu/ganesh/d3d/GrD3DUtil.cpp similarity index 69% rename from src/gpu/d3d/GrD3DUtil.cpp rename to src/gpu/ganesh/d3d/GrD3DUtil.cpp index 502e6fe6c3..7d7cea1ee1 100644 --- a/src/gpu/d3d/GrD3DUtil.cpp +++ b/src/gpu/ganesh/d3d/GrD3DUtil.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/d3d/GrD3DUtil.h" +#include "src/gpu/ganesh/d3d/GrD3DUtil.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/d3d/GrD3DGpu.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/d3d/GrD3DGpu.h" #include "src/sksl/SkSLCompiler.h" bool GrDxgiFormatIsCompressed(DXGI_FORMAT format) { diff --git a/src/gpu/d3d/GrD3DUtil.h b/src/gpu/ganesh/d3d/GrD3DUtil.h similarity index 100% rename from src/gpu/d3d/GrD3DUtil.h rename to src/gpu/ganesh/d3d/GrD3DUtil.h diff --git a/src/gpu/dawn/BUILD.bazel b/src/gpu/ganesh/dawn/BUILD.bazel similarity index 77% rename from src/gpu/dawn/BUILD.bazel rename to src/gpu/ganesh/dawn/BUILD.bazel index 0a281a7b6a..67b209f7a0 100644 --- a/src/gpu/dawn/BUILD.bazel +++ b/src/gpu/ganesh/dawn/BUILD.bazel @@ -5,7 +5,7 @@ generated_cc_atom( hdrs = ["GrDawnAttachment.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrAttachment_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", "//third_party:dawn", ], ) @@ -26,7 +26,7 @@ generated_cc_atom( hdrs = ["GrDawnBuffer.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", "//third_party:dawn", ], ) @@ -49,7 +49,7 @@ generated_cc_atom( ":GrDawnUtil_hdr", "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrContextOptions_hdr", - "//src/gpu:GrCaps_hdr", + "//src/gpu/ganesh:GrCaps_hdr", ], ) @@ -59,11 +59,11 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrDawnCaps_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrStencilSettings_hdr", "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", ], ) @@ -74,10 +74,10 @@ generated_cc_atom( deps = [ ":GrDawnRingBuffer_hdr", "//src/core:SkLRUCache_hdr", - "//src/gpu:GrFinishCallbacks_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrStagingBufferManager_hdr", + "//src/gpu/ganesh:GrFinishCallbacks_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrStagingBufferManager_hdr", "//src/sksl/ir:SkSLProgram_hdr", "//third_party:dawn", ], @@ -104,16 +104,16 @@ generated_cc_atom( "//src/core:SkAutoMalloc_hdr", "//src/core:SkConvertPixels_hdr", "//src/core:SkMipmap_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpuResourceCacheAccess_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpuResourceCacheAccess_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", "//src/sksl:SkSLCompiler_hdr", ], ) @@ -124,8 +124,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu:GrTypes_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", "//third_party:dawn", ], ) @@ -143,11 +143,11 @@ generated_cc_atom( ":GrDawnRenderTarget_hdr", ":GrDawnTexture_hdr", ":GrDawnUtil_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh:GrTexture_hdr", "//src/sksl:SkSLCompiler_hdr", ], ) @@ -158,9 +158,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrDawnProgramDataManager_hdr", - "//src/gpu:GrSPIRVUniformHandler_hdr", - "//src/gpu:GrSPIRVVaryingHandler_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrSPIRVUniformHandler_hdr", + "//src/gpu/ganesh:GrSPIRVVaryingHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl:SkSLCompiler_hdr", "//third_party:dawn", ], @@ -174,10 +174,10 @@ generated_cc_atom( ":GrDawnGpu_hdr", ":GrDawnProgramBuilder_hdr", ":GrDawnTexture_hdr", - "//src/gpu:GrAutoLocaleSetter_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrAutoLocaleSetter_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//src/utils:SkShaderUtils_hdr", ], ) @@ -189,8 +189,8 @@ generated_cc_atom( deps = [ ":GrDawnRingBuffer_hdr", "//src/core:SkAutoMalloc_hdr", - "//src/gpu:GrSPIRVUniformHandler_hdr", - "//src/gpu:GrUniformDataManager_hdr", + "//src/gpu/ganesh:GrSPIRVUniformHandler_hdr", + "//src/gpu/ganesh:GrUniformDataManager_hdr", "//third_party:dawn", ], ) @@ -211,7 +211,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/dawn:GrDawnTypes_hdr", - "//src/gpu:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", ], ) @@ -263,7 +263,7 @@ generated_cc_atom( ":GrDawnGpu_hdr", ":GrDawnTextureRenderTarget_hdr", "//include/core:SkTraceMemoryDump_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -272,7 +272,7 @@ generated_cc_atom( hdrs = ["GrDawnTexture.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrTexture_hdr", "//third_party:dawn", ], ) diff --git a/src/gpu/dawn/GrDawnAttachment.cpp b/src/gpu/ganesh/dawn/GrDawnAttachment.cpp similarity index 93% rename from src/gpu/dawn/GrDawnAttachment.cpp rename to src/gpu/ganesh/dawn/GrDawnAttachment.cpp index a35c48960f..20b29bd840 100644 --- a/src/gpu/dawn/GrDawnAttachment.cpp +++ b/src/gpu/ganesh/dawn/GrDawnAttachment.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnAttachment.h" +#include "src/gpu/ganesh/dawn/GrDawnAttachment.h" -#include "src/gpu/dawn/GrDawnGpu.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" #define VK_CALL(GPU, X) GR_VK_CALL(GPU->vkInterface(), X) diff --git a/src/gpu/dawn/GrDawnAttachment.h b/src/gpu/ganesh/dawn/GrDawnAttachment.h similarity index 96% rename from src/gpu/dawn/GrDawnAttachment.h rename to src/gpu/ganesh/dawn/GrDawnAttachment.h index 3f167ee341..2c7e076002 100644 --- a/src/gpu/dawn/GrDawnAttachment.h +++ b/src/gpu/ganesh/dawn/GrDawnAttachment.h @@ -8,7 +8,7 @@ #ifndef GrDawnAttachment_DEFINED #define GrDawnAttachment_DEFINED -#include "src/gpu/GrAttachment.h" +#include "src/gpu/ganesh/GrAttachment.h" #include "webgpu/webgpu_cpp.h" diff --git a/src/gpu/dawn/GrDawnBuffer.cpp b/src/gpu/ganesh/dawn/GrDawnBuffer.cpp similarity index 97% rename from src/gpu/dawn/GrDawnBuffer.cpp rename to src/gpu/ganesh/dawn/GrDawnBuffer.cpp index bf696fe699..e737a2abce 100644 --- a/src/gpu/dawn/GrDawnBuffer.cpp +++ b/src/gpu/ganesh/dawn/GrDawnBuffer.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnBuffer.h" +#include "src/gpu/ganesh/dawn/GrDawnBuffer.h" -#include "src/gpu/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" namespace { wgpu::BufferUsage GrGpuBufferTypeToDawnUsageBit(GrGpuBufferType type) { diff --git a/src/gpu/dawn/GrDawnBuffer.h b/src/gpu/ganesh/dawn/GrDawnBuffer.h similarity index 96% rename from src/gpu/dawn/GrDawnBuffer.h rename to src/gpu/ganesh/dawn/GrDawnBuffer.h index e8b3571c93..37a95aaec4 100644 --- a/src/gpu/dawn/GrDawnBuffer.h +++ b/src/gpu/ganesh/dawn/GrDawnBuffer.h @@ -8,7 +8,7 @@ #ifndef GrDawnBuffer_DEFINED #define GrDawnBuffer_DEFINED -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" #include "webgpu/webgpu_cpp.h" class GrDawnGpu; diff --git a/src/gpu/dawn/GrDawnCaps.cpp b/src/gpu/ganesh/dawn/GrDawnCaps.cpp similarity index 97% rename from src/gpu/dawn/GrDawnCaps.cpp rename to src/gpu/ganesh/dawn/GrDawnCaps.cpp index 581cc97c3b..db5d679b4d 100644 --- a/src/gpu/dawn/GrDawnCaps.cpp +++ b/src/gpu/ganesh/dawn/GrDawnCaps.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnCaps.h" +#include "src/gpu/ganesh/dawn/GrDawnCaps.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrStencilSettings.h" #include "src/gpu/KeyBuilder.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrStencilSettings.h" GrDawnCaps::GrDawnCaps(const GrContextOptions& contextOptions) : INHERITED(contextOptions) { fMipmapSupport = true; diff --git a/src/gpu/dawn/GrDawnCaps.h b/src/gpu/ganesh/dawn/GrDawnCaps.h similarity index 97% rename from src/gpu/dawn/GrDawnCaps.h rename to src/gpu/ganesh/dawn/GrDawnCaps.h index dbc3741286..7bbef9947f 100644 --- a/src/gpu/dawn/GrDawnCaps.h +++ b/src/gpu/ganesh/dawn/GrDawnCaps.h @@ -10,8 +10,8 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrContextOptions.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" class GrDawnCaps : public GrCaps { public: diff --git a/src/gpu/dawn/GrDawnGpu.cpp b/src/gpu/ganesh/dawn/GrDawnGpu.cpp similarity index 97% rename from src/gpu/dawn/GrDawnGpu.cpp rename to src/gpu/ganesh/dawn/GrDawnGpu.cpp index 05c2e6065f..14451ffbc3 100644 --- a/src/gpu/dawn/GrDawnGpu.cpp +++ b/src/gpu/ganesh/dawn/GrDawnGpu.cpp @@ -5,31 +5,31 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" #include "include/gpu/GrBackendSemaphore.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpuResourceCacheAccess.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/dawn/GrDawnAttachment.h" -#include "src/gpu/dawn/GrDawnBuffer.h" -#include "src/gpu/dawn/GrDawnCaps.h" -#include "src/gpu/dawn/GrDawnOpsRenderPass.h" -#include "src/gpu/dawn/GrDawnProgramBuilder.h" -#include "src/gpu/dawn/GrDawnRenderTarget.h" -#include "src/gpu/dawn/GrDawnTexture.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpuResourceCacheAccess.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/dawn/GrDawnAttachment.h" +#include "src/gpu/ganesh/dawn/GrDawnBuffer.h" +#include "src/gpu/ganesh/dawn/GrDawnCaps.h" +#include "src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h" +#include "src/gpu/ganesh/dawn/GrDawnProgramBuilder.h" +#include "src/gpu/ganesh/dawn/GrDawnRenderTarget.h" +#include "src/gpu/ganesh/dawn/GrDawnTexture.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" #include "src/core/SkAutoMalloc.h" #include "src/core/SkMipmap.h" diff --git a/src/gpu/dawn/GrDawnGpu.h b/src/gpu/ganesh/dawn/GrDawnGpu.h similarity index 98% rename from src/gpu/dawn/GrDawnGpu.h rename to src/gpu/ganesh/dawn/GrDawnGpu.h index 002cb423da..eb62413ff9 100644 --- a/src/gpu/dawn/GrDawnGpu.h +++ b/src/gpu/ganesh/dawn/GrDawnGpu.h @@ -8,14 +8,14 @@ #ifndef GrDawnGpu_DEFINED #define GrDawnGpu_DEFINED -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrGpu.h" #include "webgpu/webgpu_cpp.h" #include "src/core/SkLRUCache.h" -#include "src/gpu/GrFinishCallbacks.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrStagingBufferManager.h" -#include "src/gpu/dawn/GrDawnRingBuffer.h" +#include "src/gpu/ganesh/GrFinishCallbacks.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" +#include "src/gpu/ganesh/dawn/GrDawnRingBuffer.h" #include "src/sksl/ir/SkSLProgram.h" #include diff --git a/src/gpu/dawn/GrDawnOpsRenderPass.cpp b/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp similarity index 93% rename from src/gpu/dawn/GrDawnOpsRenderPass.cpp rename to src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp index a4f8bdc41a..2f0cf795e4 100644 --- a/src/gpu/dawn/GrDawnOpsRenderPass.cpp +++ b/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnOpsRenderPass.h" +#include "src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/dawn/GrDawnAttachment.h" -#include "src/gpu/dawn/GrDawnBuffer.h" -#include "src/gpu/dawn/GrDawnGpu.h" -#include "src/gpu/dawn/GrDawnProgramBuilder.h" -#include "src/gpu/dawn/GrDawnRenderTarget.h" -#include "src/gpu/dawn/GrDawnTexture.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/dawn/GrDawnAttachment.h" +#include "src/gpu/ganesh/dawn/GrDawnBuffer.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnProgramBuilder.h" +#include "src/gpu/ganesh/dawn/GrDawnRenderTarget.h" +#include "src/gpu/ganesh/dawn/GrDawnTexture.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" #include "src/sksl/SkSLCompiler.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/dawn/GrDawnOpsRenderPass.h b/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h similarity index 97% rename from src/gpu/dawn/GrDawnOpsRenderPass.h rename to src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h index ecfb40df5d..40b0c6ebd4 100644 --- a/src/gpu/dawn/GrDawnOpsRenderPass.h +++ b/src/gpu/ganesh/dawn/GrDawnOpsRenderPass.h @@ -8,10 +8,10 @@ #ifndef GrDawnOpsRenderPass_DEFINED #define GrDawnOpsRenderPass_DEFINED -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/GrColor.h" +#include "src/gpu/ganesh/GrColor.h" #include "webgpu/webgpu_cpp.h" class GrDawnGpu; diff --git a/src/gpu/dawn/GrDawnProgramBuilder.cpp b/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp similarity index 98% rename from src/gpu/dawn/GrDawnProgramBuilder.cpp rename to src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp index 269f570a29..977b7dd726 100644 --- a/src/gpu/dawn/GrDawnProgramBuilder.cpp +++ b/src/gpu/ganesh/dawn/GrDawnProgramBuilder.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnProgramBuilder.h" +#include "src/gpu/ganesh/dawn/GrDawnProgramBuilder.h" -#include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/dawn/GrDawnGpu.h" -#include "src/gpu/dawn/GrDawnTexture.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrAutoLocaleSetter.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnTexture.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "src/utils/SkShaderUtils.h" static wgpu::BlendFactor to_dawn_blend_factor(skgpu::BlendCoeff coeff) { diff --git a/src/gpu/dawn/GrDawnProgramBuilder.h b/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h similarity index 93% rename from src/gpu/dawn/GrDawnProgramBuilder.h rename to src/gpu/ganesh/dawn/GrDawnProgramBuilder.h index 55141870b3..c2b18ff51b 100644 --- a/src/gpu/dawn/GrDawnProgramBuilder.h +++ b/src/gpu/ganesh/dawn/GrDawnProgramBuilder.h @@ -8,12 +8,12 @@ #ifndef GrDawnProgramBuilder_DEFINED #define GrDawnProgramBuilder_DEFINED -#include "src/gpu/GrSPIRVUniformHandler.h" -#include "src/gpu/GrSPIRVVaryingHandler.h" -#include "src/gpu/dawn/GrDawnProgramDataManager.h" +#include "src/gpu/ganesh/GrSPIRVUniformHandler.h" +#include "src/gpu/ganesh/GrSPIRVVaryingHandler.h" +#include "src/gpu/ganesh/dawn/GrDawnProgramDataManager.h" #include "src/sksl/SkSLCompiler.h" #include "webgpu/webgpu_cpp.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include diff --git a/src/gpu/dawn/GrDawnProgramDataManager.cpp b/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp similarity index 95% rename from src/gpu/dawn/GrDawnProgramDataManager.cpp rename to src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp index 36280ab335..ebc8852498 100644 --- a/src/gpu/dawn/GrDawnProgramDataManager.cpp +++ b/src/gpu/ganesh/dawn/GrDawnProgramDataManager.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnProgramDataManager.h" +#include "src/gpu/ganesh/dawn/GrDawnProgramDataManager.h" -#include "src/gpu/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" GrDawnProgramDataManager::GrDawnProgramDataManager(const UniformInfoArray& uniforms, uint32_t uniformBufferSize) diff --git a/src/gpu/dawn/GrDawnProgramDataManager.h b/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h similarity index 83% rename from src/gpu/dawn/GrDawnProgramDataManager.h rename to src/gpu/ganesh/dawn/GrDawnProgramDataManager.h index 700104d2e7..04b918d404 100644 --- a/src/gpu/dawn/GrDawnProgramDataManager.h +++ b/src/gpu/ganesh/dawn/GrDawnProgramDataManager.h @@ -8,10 +8,10 @@ #ifndef GrDawnProgramDataManager_DEFINED #define GrDawnProgramDataManager_DEFINED -#include "src/gpu/GrUniformDataManager.h" +#include "src/gpu/ganesh/GrUniformDataManager.h" -#include "src/gpu/GrSPIRVUniformHandler.h" -#include "src/gpu/dawn/GrDawnRingBuffer.h" +#include "src/gpu/ganesh/GrSPIRVUniformHandler.h" +#include "src/gpu/ganesh/dawn/GrDawnRingBuffer.h" #include "webgpu/webgpu_cpp.h" #include "src/core/SkAutoMalloc.h" diff --git a/src/gpu/dawn/GrDawnRenderTarget.cpp b/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp similarity index 94% rename from src/gpu/dawn/GrDawnRenderTarget.cpp rename to src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp index cd87f879d5..e64bd4d6df 100644 --- a/src/gpu/dawn/GrDawnRenderTarget.cpp +++ b/src/gpu/ganesh/dawn/GrDawnRenderTarget.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnRenderTarget.h" +#include "src/gpu/ganesh/dawn/GrDawnRenderTarget.h" #include "include/gpu/GrBackendSurface.h" -#include "src/gpu/dawn/GrDawnGpu.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" GrDawnRenderTarget::GrDawnRenderTarget(GrDawnGpu* gpu, SkISize dimensions, diff --git a/src/gpu/dawn/GrDawnRenderTarget.h b/src/gpu/ganesh/dawn/GrDawnRenderTarget.h similarity index 97% rename from src/gpu/dawn/GrDawnRenderTarget.h rename to src/gpu/ganesh/dawn/GrDawnRenderTarget.h index 9815aeba32..255105a42c 100644 --- a/src/gpu/dawn/GrDawnRenderTarget.h +++ b/src/gpu/ganesh/dawn/GrDawnRenderTarget.h @@ -9,7 +9,7 @@ #define GrDawnRenderTarget_DEFINED #include "include/gpu/dawn/GrDawnTypes.h" -#include "src/gpu/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTarget.h" class GrDawnGpu; diff --git a/src/gpu/dawn/GrDawnRingBuffer.cpp b/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp similarity index 85% rename from src/gpu/dawn/GrDawnRingBuffer.cpp rename to src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp index edb0f8dcc1..35c048ad4f 100644 --- a/src/gpu/dawn/GrDawnRingBuffer.cpp +++ b/src/gpu/ganesh/dawn/GrDawnRingBuffer.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnRingBuffer.h" +#include "src/gpu/ganesh/dawn/GrDawnRingBuffer.h" -#include "src/gpu/dawn/GrDawnGpu.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" namespace { const int kDefaultSize = 64 * 1024; diff --git a/src/gpu/dawn/GrDawnRingBuffer.h b/src/gpu/ganesh/dawn/GrDawnRingBuffer.h similarity index 95% rename from src/gpu/dawn/GrDawnRingBuffer.h rename to src/gpu/ganesh/dawn/GrDawnRingBuffer.h index 9270ca6342..954138c2b1 100644 --- a/src/gpu/dawn/GrDawnRingBuffer.h +++ b/src/gpu/ganesh/dawn/GrDawnRingBuffer.h @@ -8,7 +8,7 @@ #ifndef GrDawnRingBuffer_DEFINED #define GrDawnRingBuffer_DEFINED -#include "src/gpu/dawn/GrDawnBuffer.h" +#include "src/gpu/ganesh/dawn/GrDawnBuffer.h" class GrDawnGpu; diff --git a/src/gpu/dawn/GrDawnTexture.cpp b/src/gpu/ganesh/dawn/GrDawnTexture.cpp similarity index 95% rename from src/gpu/dawn/GrDawnTexture.cpp rename to src/gpu/ganesh/dawn/GrDawnTexture.cpp index dbe4cf8011..3ce8f28098 100644 --- a/src/gpu/dawn/GrDawnTexture.cpp +++ b/src/gpu/ganesh/dawn/GrDawnTexture.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnTexture.h" +#include "src/gpu/ganesh/dawn/GrDawnTexture.h" -#include "src/gpu/dawn/GrDawnGpu.h" -#include "src/gpu/dawn/GrDawnTextureRenderTarget.h" -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" GrDawnTexture::GrDawnTexture(GrDawnGpu* gpu, SkISize dimensions, diff --git a/src/gpu/dawn/GrDawnTexture.h b/src/gpu/ganesh/dawn/GrDawnTexture.h similarity index 97% rename from src/gpu/dawn/GrDawnTexture.h rename to src/gpu/ganesh/dawn/GrDawnTexture.h index d6ededbf2c..65d2aab8b5 100644 --- a/src/gpu/dawn/GrDawnTexture.h +++ b/src/gpu/ganesh/dawn/GrDawnTexture.h @@ -8,7 +8,7 @@ #ifndef GrDawnTexture_DEFINED #define GrDawnTexture_DEFINED -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrTexture.h" #include "webgpu/webgpu_cpp.h" class GrDawnGpu; diff --git a/src/gpu/dawn/GrDawnTextureRenderTarget.cpp b/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp similarity index 90% rename from src/gpu/dawn/GrDawnTextureRenderTarget.cpp rename to src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp index c143d7b789..e4187dea12 100644 --- a/src/gpu/dawn/GrDawnTextureRenderTarget.cpp +++ b/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnTextureRenderTarget.h" +#include "src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h" #include "include/core/SkTraceMemoryDump.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" GrDawnTextureRenderTarget::GrDawnTextureRenderTarget(GrDawnGpu* gpu, SkISize dimensions, diff --git a/src/gpu/dawn/GrDawnTextureRenderTarget.h b/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h similarity index 93% rename from src/gpu/dawn/GrDawnTextureRenderTarget.h rename to src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h index 8db2f49576..9643fe834e 100644 --- a/src/gpu/dawn/GrDawnTextureRenderTarget.h +++ b/src/gpu/ganesh/dawn/GrDawnTextureRenderTarget.h @@ -8,8 +8,8 @@ #ifndef GrDawnTextureRenderTarget_DEFINED #define GrDawnTextureRenderTarget_DEFINED -#include "src/gpu/dawn/GrDawnRenderTarget.h" -#include "src/gpu/dawn/GrDawnTexture.h" +#include "src/gpu/ganesh/dawn/GrDawnRenderTarget.h" +#include "src/gpu/ganesh/dawn/GrDawnTexture.h" class GrDawnGpu; diff --git a/src/gpu/dawn/GrDawnTypesPriv.cpp b/src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp similarity index 100% rename from src/gpu/dawn/GrDawnTypesPriv.cpp rename to src/gpu/ganesh/dawn/GrDawnTypesPriv.cpp diff --git a/src/gpu/dawn/GrDawnUtil.cpp b/src/gpu/ganesh/dawn/GrDawnUtil.cpp similarity index 98% rename from src/gpu/dawn/GrDawnUtil.cpp rename to src/gpu/ganesh/dawn/GrDawnUtil.cpp index 882d985d6f..b4656ffed6 100644 --- a/src/gpu/dawn/GrDawnUtil.cpp +++ b/src/gpu/ganesh/dawn/GrDawnUtil.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/dawn/GrDawnUtil.h" +#include "src/gpu/ganesh/dawn/GrDawnUtil.h" size_t GrDawnBytesPerBlock(wgpu::TextureFormat format) { switch (format) { diff --git a/src/gpu/dawn/GrDawnUtil.h b/src/gpu/ganesh/dawn/GrDawnUtil.h similarity index 100% rename from src/gpu/dawn/GrDawnUtil.h rename to src/gpu/ganesh/dawn/GrDawnUtil.h diff --git a/src/gpu/effects/BUILD.bazel b/src/gpu/ganesh/effects/BUILD.bazel similarity index 60% rename from src/gpu/effects/BUILD.bazel rename to src/gpu/ganesh/effects/BUILD.bazel index a19537ef57..e16c694631 100644 --- a/src/gpu/effects/BUILD.bazel +++ b/src/gpu/ganesh/effects/BUILD.bazel @@ -5,11 +5,11 @@ generated_cc_atom( hdrs = ["GrAtlasedShaderHelpers.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrDrawOpAtlas_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -20,9 +20,9 @@ generated_cc_atom( deps = [ "//include/private:GrTypesPriv_hdr", "//src/core:SkArenaAlloc_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProcessor_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", ], ) @@ -32,13 +32,13 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrBezierEffect_hdr", - "//src/gpu:GrShaderCaps_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -46,7 +46,7 @@ generated_cc_atom( name = "GrBicubicEffect_hdr", hdrs = ["GrBicubicEffect.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrFragmentProcessor_hdr"], + deps = ["//src/gpu/ganesh:GrFragmentProcessor_hdr"], ) generated_cc_atom( @@ -58,11 +58,11 @@ generated_cc_atom( ":GrMatrixEffect_hdr", ":GrTextureEffect_hdr", "//src/core:SkMatrixPriv_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", "//src/shaders:SkImageShader_hdr", ], ) @@ -73,8 +73,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkArenaAlloc_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", ], ) @@ -85,15 +85,15 @@ generated_cc_atom( deps = [ ":GrAtlasedShaderHelpers_hdr", ":GrBitmapTextGeoProc_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -113,11 +113,11 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrBlendFragmentProcessor_hdr", - "//src/gpu:GrFragmentProcessor_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/glsl:GrGLSLBlend_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/glsl:GrGLSLBlend_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", ], ) @@ -127,9 +127,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrProcessor_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", ], ) @@ -142,9 +142,9 @@ generated_cc_atom( "//include/sksl:DSL_hdr", "//src/core:SkPathPriv_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", "//src/sksl/dsl/priv:DSLFPs_hdr", ], ) @@ -156,7 +156,7 @@ generated_cc_atom( deps = [ "//include/core:SkRegion_hdr", "//include/gpu:GrTypes_hdr", - "//src/gpu:GrXferProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", ], ) @@ -166,14 +166,14 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrCoverageSetOpXP_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrXferProcessor_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLBlend_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLBlend_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -193,17 +193,17 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrCustomXfermode_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrXferProcessor_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLBlend_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLBlend_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -214,7 +214,7 @@ generated_cc_atom( deps = [ "//include/core:SkRefCnt_hdr", "//include/gpu:GrTypes_hdr", - "//src/gpu:GrXferProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", ], ) @@ -224,12 +224,12 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrDisableColorXP_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", ], ) @@ -239,8 +239,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkArenaAlloc_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", ], ) @@ -252,15 +252,15 @@ generated_cc_atom( ":GrAtlasedShaderHelpers_hdr", ":GrDistanceFieldGeoProc_hdr", "//src/core:SkDistanceFieldGen_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -268,7 +268,7 @@ generated_cc_atom( name = "GrGaussianConvolutionFragmentProcessor_hdr", hdrs = ["GrGaussianConvolutionFragmentProcessor.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrFragmentProcessor_hdr"], + deps = ["//src/gpu/ganesh:GrFragmentProcessor_hdr"], ) generated_cc_atom( @@ -280,12 +280,12 @@ generated_cc_atom( ":GrTextureEffect_hdr", "//include/sksl:DSL_hdr", "//src/core:SkGpuBlurUtils_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", "//src/sksl/dsl/priv:DSLFPs_hdr", ], ) @@ -294,7 +294,7 @@ generated_cc_atom( name = "GrMatrixConvolutionEffect_hdr", hdrs = ["GrMatrixConvolutionEffect.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrFragmentProcessor_hdr"], + deps = ["//src/gpu/ganesh:GrFragmentProcessor_hdr"], ) generated_cc_atom( @@ -306,17 +306,17 @@ generated_cc_atom( ":GrTextureEffect_hdr", "//include/core:SkBitmap_hdr", "//include/private:SkHalf_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrThreadSafeCache_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrThreadSafeCache_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -327,7 +327,7 @@ generated_cc_atom( deps = [ "//include/core:SkM44_hdr", "//include/core:SkTypes_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -338,9 +338,9 @@ generated_cc_atom( deps = [ ":GrMatrixEffect_hdr", ":GrTextureEffect_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl:SkSLUtil_hdr", ], ) @@ -349,7 +349,7 @@ generated_cc_atom( name = "GrModulateAtlasCoverageEffect_hdr", hdrs = ["GrModulateAtlasCoverageEffect.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrFragmentProcessor_hdr"], + deps = ["//src/gpu/ganesh:GrFragmentProcessor_hdr"], ) generated_cc_atom( @@ -359,8 +359,8 @@ generated_cc_atom( deps = [ ":GrModulateAtlasCoverageEffect_hdr", ":GrTextureEffect_hdr", - "//src/gpu:GrDynamicAtlas_hdr", "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh:GrDynamicAtlas_hdr", ], ) @@ -372,7 +372,7 @@ generated_cc_atom( "//include/core:SkRefCnt_hdr", "//include/gpu:GrTypes_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -383,7 +383,7 @@ generated_cc_atom( deps = [ ":GrOvalEffect_hdr", "//include/core:SkRect_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -395,7 +395,7 @@ generated_cc_atom( "//include/core:SkBlendMode_hdr", "//include/gpu:GrTypes_hdr", "//include/private:SkMacros_hdr", - "//src/gpu:GrXferProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", ], ) @@ -409,16 +409,16 @@ generated_cc_atom( "//include/private:SkMacros_hdr", "//include/private:SkTo_hdr", "//src/gpu:Blend_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProcessorAnalysis_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrXferProcessor_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLBlend_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProcessorAnalysis_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLBlend_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -430,7 +430,7 @@ generated_cc_atom( "//include/core:SkRefCnt_hdr", "//include/gpu:GrTypes_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -444,12 +444,12 @@ generated_cc_atom( ":GrRRectEffect_hdr", "//src/core:SkRRectPriv_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrShaderCaps_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -459,8 +459,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkArenaAlloc_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", ], ) @@ -470,11 +470,11 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrShadowGeoProc_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -488,7 +488,7 @@ generated_cc_atom( "//include/effects:SkRuntimeEffect_hdr", "//include/gpu:GrContextOptions_hdr", "//include/private:SkVx_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -506,12 +506,12 @@ generated_cc_atom( "//src/core:SkColorSpacePriv_hdr", "//src/core:SkRuntimeEffectPriv_hdr", "//src/core:SkVM_hdr", - "//src/gpu:GrBaseContextPriv_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrBaseContextPriv_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl:SkSLUtil_hdr", "//src/sksl/codegen:SkSLPipelineStageCodeGenerator_hdr", "//src/sksl/ir:SkSLVarDeclarations_hdr", @@ -525,9 +525,9 @@ generated_cc_atom( deps = [ "//include/core:SkImageInfo_hdr", "//include/core:SkMatrix_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", ], ) @@ -539,9 +539,9 @@ generated_cc_atom( ":GrMatrixEffect_hdr", ":GrTextureEffect_hdr", "//src/core:SkMatrixPriv_hdr", - "//src/gpu:GrTexture_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl:SkSLUtil_hdr", ], ) @@ -553,7 +553,7 @@ generated_cc_atom( deps = [ "//include/core:SkYUVAInfo_hdr", "//src/core:SkYUVAInfoLocation_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -567,11 +567,11 @@ generated_cc_atom( ":GrYUVtoRGBEffect_hdr", "//include/core:SkYUVAInfo_hdr", "//src/core:SkYUVMath_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrYUVATextureProxies_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrYUVATextureProxies_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl:SkSLUtil_hdr", ], ) diff --git a/src/gpu/effects/GrAtlasedShaderHelpers.h b/src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h similarity index 94% rename from src/gpu/effects/GrAtlasedShaderHelpers.h rename to src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h index 013d555d55..d08470779d 100644 --- a/src/gpu/effects/GrAtlasedShaderHelpers.h +++ b/src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h @@ -8,11 +8,11 @@ #ifndef GrAtlasedShaderHelpers_DEFINED #define GrAtlasedShaderHelpers_DEFINED -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" static void append_index_uv_varyings(GrGeometryProcessor::ProgramImpl::EmitArgs& args, int numTextureSamplers, diff --git a/src/gpu/effects/GrBezierEffect.cpp b/src/gpu/ganesh/effects/GrBezierEffect.cpp similarity index 97% rename from src/gpu/effects/GrBezierEffect.cpp rename to src/gpu/ganesh/effects/GrBezierEffect.cpp index 4671f8b74f..3c163728e1 100644 --- a/src/gpu/effects/GrBezierEffect.cpp +++ b/src/gpu/ganesh/effects/GrBezierEffect.cpp @@ -5,15 +5,15 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrBezierEffect.h" +#include "src/gpu/ganesh/effects/GrBezierEffect.h" -#include "src/gpu/GrShaderCaps.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" class GrConicEffect::Impl : public ProgramImpl { public: diff --git a/src/gpu/effects/GrBezierEffect.h b/src/gpu/ganesh/effects/GrBezierEffect.h similarity index 98% rename from src/gpu/effects/GrBezierEffect.h rename to src/gpu/ganesh/effects/GrBezierEffect.h index 38d1449ba5..d269eacfe6 100644 --- a/src/gpu/effects/GrBezierEffect.h +++ b/src/gpu/ganesh/effects/GrBezierEffect.h @@ -10,9 +10,9 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessor.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" /** * Shader is based off of Loop-Blinn Quadratic GPU Rendering diff --git a/src/gpu/effects/GrBicubicEffect.cpp b/src/gpu/ganesh/effects/GrBicubicEffect.cpp similarity index 97% rename from src/gpu/effects/GrBicubicEffect.cpp rename to src/gpu/ganesh/effects/GrBicubicEffect.cpp index 1a3217cbfb..02701cf5ed 100644 --- a/src/gpu/effects/GrBicubicEffect.cpp +++ b/src/gpu/ganesh/effects/GrBicubicEffect.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" #include "src/core/SkMatrixPriv.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include class GrBicubicEffect::Impl : public ProgramImpl { diff --git a/src/gpu/effects/GrBicubicEffect.h b/src/gpu/ganesh/effects/GrBicubicEffect.h similarity index 99% rename from src/gpu/effects/GrBicubicEffect.h rename to src/gpu/ganesh/effects/GrBicubicEffect.h index 33d5e80f42..0e0f7f1fbf 100644 --- a/src/gpu/effects/GrBicubicEffect.h +++ b/src/gpu/ganesh/effects/GrBicubicEffect.h @@ -8,7 +8,7 @@ #ifndef GrBicubicTextureEffect_DEFINED #define GrBicubicTextureEffect_DEFINED -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" class GrInvariantOutput; diff --git a/src/gpu/effects/GrBitmapTextGeoProc.cpp b/src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp similarity index 94% rename from src/gpu/effects/GrBitmapTextGeoProc.cpp rename to src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp index c377ac5293..a474dd91aa 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.cpp +++ b/src/gpu/ganesh/effects/GrBitmapTextGeoProc.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrBitmapTextGeoProc.h" +#include "src/gpu/ganesh/effects/GrBitmapTextGeoProc.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrAtlasedShaderHelpers.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" class GrBitmapTextGeoProc::Impl : public ProgramImpl { public: diff --git a/src/gpu/effects/GrBitmapTextGeoProc.h b/src/gpu/ganesh/effects/GrBitmapTextGeoProc.h similarity index 96% rename from src/gpu/effects/GrBitmapTextGeoProc.h rename to src/gpu/ganesh/effects/GrBitmapTextGeoProc.h index 5522a457ac..d23f9a5c7f 100644 --- a/src/gpu/effects/GrBitmapTextGeoProc.h +++ b/src/gpu/ganesh/effects/GrBitmapTextGeoProc.h @@ -9,8 +9,8 @@ #define GrBitmapTextGeoProc_DEFINED #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" class GrGLBitmapTextGeoProc; class GrInvariantOutput; diff --git a/src/gpu/effects/GrBlendFragmentProcessor.cpp b/src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp similarity index 97% rename from src/gpu/effects/GrBlendFragmentProcessor.cpp rename to src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp index 1104b291af..39342111b1 100644 --- a/src/gpu/effects/GrBlendFragmentProcessor.cpp +++ b/src/gpu/ganesh/effects/GrBlendFragmentProcessor.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/GrFragmentProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/glsl/GrGLSLBlend.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/glsl/GrGLSLBlend.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" // Some of the CPU implementations of blend modes differ from the GPU enough that // we can't use the CPU implementation to implement constantOutputForConstantInput. diff --git a/src/gpu/effects/GrBlendFragmentProcessor.h b/src/gpu/ganesh/effects/GrBlendFragmentProcessor.h similarity index 100% rename from src/gpu/effects/GrBlendFragmentProcessor.h rename to src/gpu/ganesh/effects/GrBlendFragmentProcessor.h diff --git a/src/gpu/effects/GrConvexPolyEffect.cpp b/src/gpu/ganesh/effects/GrConvexPolyEffect.cpp similarity index 97% rename from src/gpu/effects/GrConvexPolyEffect.cpp rename to src/gpu/ganesh/effects/GrConvexPolyEffect.cpp index 799fe8f68f..7d4fe09d3a 100644 --- a/src/gpu/effects/GrConvexPolyEffect.cpp +++ b/src/gpu/ganesh/effects/GrConvexPolyEffect.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrConvexPolyEffect.h" +#include "src/gpu/ganesh/effects/GrConvexPolyEffect.h" #include "include/sksl/DSL.h" #include "src/core/SkPathPriv.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include "src/sksl/dsl/priv/DSLFPs.h" ////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/effects/GrConvexPolyEffect.h b/src/gpu/ganesh/effects/GrConvexPolyEffect.h similarity index 95% rename from src/gpu/effects/GrConvexPolyEffect.h rename to src/gpu/ganesh/effects/GrConvexPolyEffect.h index fa9e60d8fa..0c698aa2dc 100644 --- a/src/gpu/effects/GrConvexPolyEffect.h +++ b/src/gpu/ganesh/effects/GrConvexPolyEffect.h @@ -9,9 +9,9 @@ #define GrConvexPolyEffect_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProcessor.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" class GrInvariantOutput; class SkPath; diff --git a/src/gpu/effects/GrCoverageSetOpXP.cpp b/src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp similarity index 95% rename from src/gpu/effects/GrCoverageSetOpXP.cpp rename to src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp index 95971384b3..5eafeb2849 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.cpp +++ b/src/gpu/ganesh/effects/GrCoverageSetOpXP.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrCoverageSetOpXP.h" +#include "src/gpu/ganesh/effects/GrCoverageSetOpXP.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLBlend.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLBlend.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" class CoverageSetOpXP : public GrXferProcessor { public: diff --git a/src/gpu/effects/GrCoverageSetOpXP.h b/src/gpu/ganesh/effects/GrCoverageSetOpXP.h similarity index 98% rename from src/gpu/effects/GrCoverageSetOpXP.h rename to src/gpu/ganesh/effects/GrCoverageSetOpXP.h index 1d54a103f1..8f95b05961 100644 --- a/src/gpu/effects/GrCoverageSetOpXP.h +++ b/src/gpu/ganesh/effects/GrCoverageSetOpXP.h @@ -10,7 +10,7 @@ #include "include/core/SkRegion.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" // See the comment above GrXPFactory's definition about this warning suppression. #if defined(__GNUC__) diff --git a/src/gpu/effects/GrCustomXfermode.cpp b/src/gpu/ganesh/effects/GrCustomXfermode.cpp similarity index 97% rename from src/gpu/effects/GrCustomXfermode.cpp rename to src/gpu/ganesh/effects/GrCustomXfermode.cpp index a8bec9ed51..f7b8c216ed 100644 --- a/src/gpu/effects/GrCustomXfermode.cpp +++ b/src/gpu/ganesh/effects/GrCustomXfermode.cpp @@ -5,19 +5,19 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrCustomXfermode.h" +#include "src/gpu/ganesh/effects/GrCustomXfermode.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLBlend.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLBlend.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" bool GrCustomXfermode::IsSupportedMode(SkBlendMode mode) { return (int)mode > (int)SkBlendMode::kLastCoeffMode && diff --git a/src/gpu/effects/GrCustomXfermode.h b/src/gpu/ganesh/effects/GrCustomXfermode.h similarity index 100% rename from src/gpu/effects/GrCustomXfermode.h rename to src/gpu/ganesh/effects/GrCustomXfermode.h diff --git a/src/gpu/effects/GrDisableColorXP.cpp b/src/gpu/ganesh/effects/GrDisableColorXP.cpp similarity index 87% rename from src/gpu/effects/GrDisableColorXP.cpp rename to src/gpu/ganesh/effects/GrDisableColorXP.cpp index aaaf51a9f4..9b405f0bc4 100644 --- a/src/gpu/effects/GrDisableColorXP.cpp +++ b/src/gpu/ganesh/effects/GrDisableColorXP.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" /** * This xfer processor disables color writing. Thus color and coverage and ignored and no blending diff --git a/src/gpu/effects/GrDisableColorXP.h b/src/gpu/ganesh/effects/GrDisableColorXP.h similarity index 97% rename from src/gpu/effects/GrDisableColorXP.h rename to src/gpu/ganesh/effects/GrDisableColorXP.h index 7ffd71b4fa..4a771a9f29 100644 --- a/src/gpu/effects/GrDisableColorXP.h +++ b/src/gpu/ganesh/effects/GrDisableColorXP.h @@ -10,7 +10,7 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" // See the comment above GrXPFactory's definition about this warning suppression. #if defined(__GNUC__) diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.cpp b/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp similarity index 98% rename from src/gpu/effects/GrDistanceFieldGeoProc.cpp rename to src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp index 688dec3a59..ff09cb87b1 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.cpp +++ b/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.cpp @@ -6,17 +6,17 @@ */ #include "src/core/SkDistanceFieldGen.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrAtlasedShaderHelpers.h" -#include "src/gpu/effects/GrDistanceFieldGeoProc.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/effects/GrAtlasedShaderHelpers.h" +#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" // Assuming a radius of a little less than the diagonal of the fragment #define SK_DistanceFieldAAFactor "0.65" diff --git a/src/gpu/effects/GrDistanceFieldGeoProc.h b/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h similarity index 99% rename from src/gpu/effects/GrDistanceFieldGeoProc.h rename to src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h index b0c9e6f8e7..f0625afbe2 100644 --- a/src/gpu/effects/GrDistanceFieldGeoProc.h +++ b/src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h @@ -9,8 +9,8 @@ #define GrDistanceFieldGeoProc_DEFINED #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" class GrGLDistanceFieldA8TextGeoProc; class GrGLDistanceFieldPathGeoProc; diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp b/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.cpp similarity index 96% rename from src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp rename to src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.cpp index d66360e83e..7e37aa0e4e 100644 --- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp +++ b/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.cpp @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h" #include "include/sksl/DSL.h" #include "src/core/SkGpuBlurUtils.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include "src/sksl/dsl/priv/DSLFPs.h" // For brevity diff --git a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h b/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h similarity index 98% rename from src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h rename to src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h index 905f4d4edf..58924a3033 100644 --- a/src/gpu/effects/GrGaussianConvolutionFragmentProcessor.h +++ b/src/gpu/ganesh/effects/GrGaussianConvolutionFragmentProcessor.h @@ -8,7 +8,7 @@ #ifndef GrGaussianConvolutionFragmentProcessor_DEFINED #define GrGaussianConvolutionFragmentProcessor_DEFINED -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" /** * A 1D Gaussian convolution effect. The kernel is computed as an array of 2 * half-width weights. diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.cpp b/src/gpu/ganesh/effects/GrMatrixConvolutionEffect.cpp similarity index 96% rename from src/gpu/effects/GrMatrixConvolutionEffect.cpp rename to src/gpu/ganesh/effects/GrMatrixConvolutionEffect.cpp index a12b1d1773..76451b5668 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.cpp +++ b/src/gpu/ganesh/effects/GrMatrixConvolutionEffect.cpp @@ -4,22 +4,22 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "src/gpu/effects/GrMatrixConvolutionEffect.h" +#include "src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h" #include "include/core/SkBitmap.h" #include "include/private/SkHalf.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrThreadSafeCache.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" class GrMatrixConvolutionEffect::Impl : public ProgramImpl { public: diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h similarity index 98% rename from src/gpu/effects/GrMatrixConvolutionEffect.h rename to src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h index af0dd50a02..e182a96033 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/ganesh/effects/GrMatrixConvolutionEffect.h @@ -8,7 +8,7 @@ #ifndef GrMatrixConvolutionEffect_DEFINED #define GrMatrixConvolutionEffect_DEFINED -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #include #include diff --git a/src/gpu/effects/GrMatrixEffect.cpp b/src/gpu/ganesh/effects/GrMatrixEffect.cpp similarity index 91% rename from src/gpu/effects/GrMatrixEffect.cpp rename to src/gpu/ganesh/effects/GrMatrixEffect.cpp index 87199f431a..cb07b885c1 100644 --- a/src/gpu/effects/GrMatrixEffect.cpp +++ b/src/gpu/ganesh/effects/GrMatrixEffect.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include "src/sksl/SkSLUtil.h" std::unique_ptr GrMatrixEffect::Make( diff --git a/src/gpu/effects/GrMatrixEffect.h b/src/gpu/ganesh/effects/GrMatrixEffect.h similarity index 97% rename from src/gpu/effects/GrMatrixEffect.h rename to src/gpu/ganesh/effects/GrMatrixEffect.h index ced35224b9..582813f536 100644 --- a/src/gpu/effects/GrMatrixEffect.h +++ b/src/gpu/ganesh/effects/GrMatrixEffect.h @@ -11,7 +11,7 @@ #include "include/core/SkM44.h" #include "include/core/SkTypes.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" class GrMatrixEffect : public GrFragmentProcessor { public: diff --git a/src/gpu/effects/GrModulateAtlasCoverageEffect.cpp b/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp similarity index 96% rename from src/gpu/effects/GrModulateAtlasCoverageEffect.cpp rename to src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp index 56dd5a7562..89cdd090a4 100644 --- a/src/gpu/effects/GrModulateAtlasCoverageEffect.cpp +++ b/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrModulateAtlasCoverageEffect.h" +#include "src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h" -#include "src/gpu/GrDynamicAtlas.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrDynamicAtlas.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" GrModulateAtlasCoverageEffect::GrModulateAtlasCoverageEffect( Flags flags, diff --git a/src/gpu/effects/GrModulateAtlasCoverageEffect.h b/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h similarity index 97% rename from src/gpu/effects/GrModulateAtlasCoverageEffect.h rename to src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h index 781390a5a8..6b0a08eb12 100644 --- a/src/gpu/effects/GrModulateAtlasCoverageEffect.h +++ b/src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h @@ -8,7 +8,7 @@ #ifndef GrGrModulateAtlasCoverageEffect_DEFINED #define GrGrModulateAtlasCoverageEffect_DEFINED -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" // Multiplies 'inputFP' by the coverage value in an atlas, optionally inverting or clamping to 0. class GrModulateAtlasCoverageEffect : public GrFragmentProcessor { diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/ganesh/effects/GrOvalEffect.cpp similarity index 90% rename from src/gpu/effects/GrOvalEffect.cpp rename to src/gpu/ganesh/effects/GrOvalEffect.cpp index 8662eac351..04db798009 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/ganesh/effects/GrOvalEffect.cpp @@ -6,8 +6,8 @@ */ #include "include/core/SkRect.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/effects/GrOvalEffect.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrOvalEffect.h" GrFPResult GrOvalEffect::Make(std::unique_ptr inputFP, GrClipEdgeType edgeType, const SkRect& oval, const GrShaderCaps& caps) { diff --git a/src/gpu/effects/GrOvalEffect.h b/src/gpu/ganesh/effects/GrOvalEffect.h similarity index 92% rename from src/gpu/effects/GrOvalEffect.h rename to src/gpu/ganesh/effects/GrOvalEffect.h index 524e918738..7b4461762b 100644 --- a/src/gpu/effects/GrOvalEffect.h +++ b/src/gpu/ganesh/effects/GrOvalEffect.h @@ -11,7 +11,7 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" struct GrShaderCaps; struct SkRect; diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.cpp b/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp similarity index 98% rename from src/gpu/effects/GrPorterDuffXferProcessor.cpp rename to src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp index cac8c049f7..f340fda6a5 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.cpp +++ b/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.cpp @@ -5,22 +5,22 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" #include "include/gpu/GrTypes.h" #include "include/private/SkMacros.h" #include "include/private/SkTo.h" #include "src/gpu/Blend.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProcessorAnalysis.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLBlend.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLBlend.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" /** * Wraps the shader outputs and HW blend state that comprise a Porter Duff blend mode with coverage. diff --git a/src/gpu/effects/GrPorterDuffXferProcessor.h b/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h similarity index 98% rename from src/gpu/effects/GrPorterDuffXferProcessor.h rename to src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h index 8260c92c58..9fab0b0690 100644 --- a/src/gpu/effects/GrPorterDuffXferProcessor.h +++ b/src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h @@ -11,7 +11,7 @@ #include "include/core/SkBlendMode.h" #include "include/gpu/GrTypes.h" #include "include/private/SkMacros.h" -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" // See the comment above GrXPFactory's definition about this warning suppression. #if defined(__GNUC__) diff --git a/src/gpu/effects/GrRRectEffect.cpp b/src/gpu/ganesh/effects/GrRRectEffect.cpp similarity index 98% rename from src/gpu/effects/GrRRectEffect.cpp rename to src/gpu/ganesh/effects/GrRRectEffect.cpp index df87d854be..b82a13ae8a 100644 --- a/src/gpu/effects/GrRRectEffect.cpp +++ b/src/gpu/ganesh/effects/GrRRectEffect.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" #include "src/core/SkRRectPriv.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrShaderCaps.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrConvexPolyEffect.h" -#include "src/gpu/effects/GrOvalEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/effects/GrConvexPolyEffect.h" +#include "src/gpu/ganesh/effects/GrOvalEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" // The effects defined here only handle rrect radii >= kRadiusMin. static const SkScalar kRadiusMin = SK_ScalarHalf; diff --git a/src/gpu/effects/GrRRectEffect.h b/src/gpu/ganesh/effects/GrRRectEffect.h similarity index 93% rename from src/gpu/effects/GrRRectEffect.h rename to src/gpu/ganesh/effects/GrRRectEffect.h index 0386279d10..3c0031003c 100644 --- a/src/gpu/effects/GrRRectEffect.h +++ b/src/gpu/ganesh/effects/GrRRectEffect.h @@ -11,7 +11,7 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" struct GrShaderCaps; class GrProcessor; diff --git a/src/gpu/effects/GrShadowGeoProc.cpp b/src/gpu/ganesh/effects/GrShadowGeoProc.cpp similarity index 90% rename from src/gpu/effects/GrShadowGeoProc.cpp rename to src/gpu/ganesh/effects/GrShadowGeoProc.cpp index 5d24b0988a..3529c1ce09 100644 --- a/src/gpu/effects/GrShadowGeoProc.cpp +++ b/src/gpu/ganesh/effects/GrShadowGeoProc.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrShadowGeoProc.h" +#include "src/gpu/ganesh/effects/GrShadowGeoProc.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" class GrRRectShadowGeoProc::Impl : public ProgramImpl { public: diff --git a/src/gpu/effects/GrShadowGeoProc.h b/src/gpu/ganesh/effects/GrShadowGeoProc.h similarity index 94% rename from src/gpu/effects/GrShadowGeoProc.h rename to src/gpu/ganesh/effects/GrShadowGeoProc.h index 7837c9466f..8557effe49 100644 --- a/src/gpu/effects/GrShadowGeoProc.h +++ b/src/gpu/ganesh/effects/GrShadowGeoProc.h @@ -9,8 +9,8 @@ #define GrShadowGeoProc_DEFINED #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" class GrGLRRectShadowGeoProc; class GrSurfaceProxyView; diff --git a/src/gpu/effects/GrSkSLFP.cpp b/src/gpu/ganesh/effects/GrSkSLFP.cpp similarity index 98% rename from src/gpu/effects/GrSkSLFP.cpp rename to src/gpu/ganesh/effects/GrSkSLFP.cpp index e3f6efb8bb..92c05552f9 100644 --- a/src/gpu/effects/GrSkSLFP.cpp +++ b/src/gpu/ganesh/effects/GrSkSLFP.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" #include "include/effects/SkRuntimeEffect.h" #include "include/private/GrContext_Base.h" @@ -13,12 +13,12 @@ #include "src/core/SkColorSpacePriv.h" #include "src/core/SkRuntimeEffectPriv.h" #include "src/core/SkVM.h" -#include "src/gpu/GrBaseContextPriv.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrBaseContextPriv.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include "src/sksl/SkSLUtil.h" #include "src/sksl/codegen/SkSLPipelineStageCodeGenerator.h" #include "src/sksl/ir/SkSLVarDeclarations.h" diff --git a/src/gpu/effects/GrSkSLFP.h b/src/gpu/ganesh/effects/GrSkSLFP.h similarity index 99% rename from src/gpu/effects/GrSkSLFP.h rename to src/gpu/ganesh/effects/GrSkSLFP.h index 2594d90061..5520e4d0b5 100644 --- a/src/gpu/effects/GrSkSLFP.h +++ b/src/gpu/ganesh/effects/GrSkSLFP.h @@ -13,7 +13,7 @@ #include "include/effects/SkRuntimeEffect.h" #include "include/gpu/GrContextOptions.h" #include "include/private/SkVx.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #include #include diff --git a/src/gpu/effects/GrTextureEffect.cpp b/src/gpu/ganesh/effects/GrTextureEffect.cpp similarity index 99% rename from src/gpu/effects/GrTextureEffect.cpp rename to src/gpu/ganesh/effects/GrTextureEffect.cpp index 9153a974f5..d9245efbc7 100644 --- a/src/gpu/effects/GrTextureEffect.cpp +++ b/src/gpu/ganesh/effects/GrTextureEffect.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "src/core/SkMatrixPriv.h" -#include "src/gpu/GrTexture.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include "src/sksl/SkSLUtil.h" using Wrap = GrSamplerState::WrapMode; diff --git a/src/gpu/effects/GrTextureEffect.h b/src/gpu/ganesh/effects/GrTextureEffect.h similarity index 98% rename from src/gpu/effects/GrTextureEffect.h rename to src/gpu/ganesh/effects/GrTextureEffect.h index 632c2fc9bd..98e6d91f8f 100644 --- a/src/gpu/effects/GrTextureEffect.h +++ b/src/gpu/ganesh/effects/GrTextureEffect.h @@ -10,9 +10,9 @@ #include "include/core/SkImageInfo.h" #include "include/core/SkMatrix.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" class GrTextureEffect : public GrFragmentProcessor { public: diff --git a/src/gpu/effects/GrYUVtoRGBEffect.cpp b/src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp similarity index 98% rename from src/gpu/effects/GrYUVtoRGBEffect.cpp rename to src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp index 5ffd780d98..553a9948c1 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.cpp +++ b/src/gpu/ganesh/effects/GrYUVtoRGBEffect.cpp @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -#include "src/gpu/effects/GrYUVtoRGBEffect.h" +#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h" #include "include/core/SkYUVAInfo.h" #include "src/core/SkYUVMath.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrYUVATextureProxies.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include "src/sksl/SkSLUtil.h" static void border_colors(const GrYUVATextureProxies& yuvaProxies, float planeBorders[4][4]) { diff --git a/src/gpu/effects/GrYUVtoRGBEffect.h b/src/gpu/ganesh/effects/GrYUVtoRGBEffect.h similarity index 97% rename from src/gpu/effects/GrYUVtoRGBEffect.h rename to src/gpu/ganesh/effects/GrYUVtoRGBEffect.h index 663a68bbb8..ebff86cb86 100644 --- a/src/gpu/effects/GrYUVtoRGBEffect.h +++ b/src/gpu/ganesh/effects/GrYUVtoRGBEffect.h @@ -10,7 +10,7 @@ #include "include/core/SkYUVAInfo.h" #include "src/core/SkYUVAInfoLocation.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" class GrYUVATextureProxies; diff --git a/src/gpu/geometry/BUILD.bazel b/src/gpu/ganesh/geometry/BUILD.bazel similarity index 96% rename from src/gpu/geometry/BUILD.bazel rename to src/gpu/ganesh/geometry/BUILD.bazel index 7ce6be19c7..98c9df9203 100644 --- a/src/gpu/geometry/BUILD.bazel +++ b/src/gpu/ganesh/geometry/BUILD.bazel @@ -44,7 +44,7 @@ generated_cc_atom( deps = [ ":GrAATriangulator_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrEagerVertexAllocator_hdr", + "//src/gpu/ganesh:GrEagerVertexAllocator_hdr", ], ) @@ -65,7 +65,7 @@ generated_cc_atom( "//src/core:SkGeometry_hdr", "//src/core:SkPathPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrVx_hdr", + "//src/gpu/ganesh:GrVx_hdr", ], ) @@ -187,7 +187,7 @@ generated_cc_atom( "//include/private:SkTemplates_hdr", "//src/core:SkPathPriv_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrStyle_hdr", + "//src/gpu/ganesh:GrStyle_hdr", ], ) @@ -210,7 +210,7 @@ generated_cc_atom( "//include/core:SkPoint_hdr", "//include/private:SkColorData_hdr", "//src/core:SkArenaAlloc_hdr", - "//src/gpu:GrColor_hdr", + "//src/gpu/ganesh:GrColor_hdr", ], ) @@ -224,6 +224,6 @@ generated_cc_atom( "//src/core:SkGeometry_hdr", "//src/core:SkPointPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrEagerVertexAllocator_hdr", + "//src/gpu/ganesh:GrEagerVertexAllocator_hdr", ], ) diff --git a/src/gpu/geometry/GrAAConvexTessellator.cpp b/src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp similarity index 99% rename from src/gpu/geometry/GrAAConvexTessellator.cpp rename to src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp index c561769c5a..cfcb31bfb0 100644 --- a/src/gpu/geometry/GrAAConvexTessellator.cpp +++ b/src/gpu/ganesh/geometry/GrAAConvexTessellator.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrAAConvexTessellator.h" +#include "src/gpu/ganesh/geometry/GrAAConvexTessellator.h" #include "include/core/SkCanvas.h" #include "include/core/SkPath.h" #include "include/core/SkPoint.h" #include "include/core/SkString.h" #include "include/private/SkTPin.h" -#include "src/gpu/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" // Next steps: // add an interactive sample app slide diff --git a/src/gpu/geometry/GrAAConvexTessellator.h b/src/gpu/ganesh/geometry/GrAAConvexTessellator.h similarity index 100% rename from src/gpu/geometry/GrAAConvexTessellator.h rename to src/gpu/ganesh/geometry/GrAAConvexTessellator.h diff --git a/src/gpu/geometry/GrAATriangulator.cpp b/src/gpu/ganesh/geometry/GrAATriangulator.cpp similarity index 99% rename from src/gpu/geometry/GrAATriangulator.cpp rename to src/gpu/ganesh/geometry/GrAATriangulator.cpp index b6dd4c0c91..9c4e1279d9 100644 --- a/src/gpu/geometry/GrAATriangulator.cpp +++ b/src/gpu/ganesh/geometry/GrAATriangulator.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrAATriangulator.h" +#include "src/gpu/ganesh/geometry/GrAATriangulator.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" #include #include #include diff --git a/src/gpu/geometry/GrAATriangulator.h b/src/gpu/ganesh/geometry/GrAATriangulator.h similarity index 98% rename from src/gpu/geometry/GrAATriangulator.h rename to src/gpu/ganesh/geometry/GrAATriangulator.h index a568beb978..a02d3a153e 100644 --- a/src/gpu/geometry/GrAATriangulator.h +++ b/src/gpu/ganesh/geometry/GrAATriangulator.h @@ -8,7 +8,7 @@ #ifndef GrAATriangulator_DEFINED #define GrAATriangulator_DEFINED -#include "src/gpu/geometry/GrTriangulator.h" +#include "src/gpu/ganesh/geometry/GrTriangulator.h" // Triangulates the given path in device space with a mesh of alpha ramps for antialiasing. class GrAATriangulator : private GrTriangulator { diff --git a/src/gpu/geometry/GrInnerFanTriangulator.h b/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h similarity index 97% rename from src/gpu/geometry/GrInnerFanTriangulator.h rename to src/gpu/ganesh/geometry/GrInnerFanTriangulator.h index ed386b3668..924403c7b9 100644 --- a/src/gpu/geometry/GrInnerFanTriangulator.h +++ b/src/gpu/ganesh/geometry/GrInnerFanTriangulator.h @@ -8,7 +8,7 @@ #ifndef GrInnerFanTriangulator_DEFINED #define GrInnerFanTriangulator_DEFINED -#include "src/gpu/geometry/GrTriangulator.h" +#include "src/gpu/ganesh/geometry/GrTriangulator.h" // Triangulates the inner polygon(s) of a path (i.e., the triangle fan for a Redbook rendering // method). When combined with the outer curves and breadcrumb triangles, these produce a complete diff --git a/src/gpu/geometry/GrPathUtils.cpp b/src/gpu/ganesh/geometry/GrPathUtils.cpp similarity index 99% rename from src/gpu/geometry/GrPathUtils.cpp rename to src/gpu/ganesh/geometry/GrPathUtils.cpp index d89e244b06..0acd18da4d 100644 --- a/src/gpu/geometry/GrPathUtils.cpp +++ b/src/gpu/ganesh/geometry/GrPathUtils.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" #include "include/gpu/GrTypes.h" #include "src/core/SkMathPriv.h" diff --git a/src/gpu/geometry/GrPathUtils.h b/src/gpu/ganesh/geometry/GrPathUtils.h similarity index 99% rename from src/gpu/geometry/GrPathUtils.h rename to src/gpu/ganesh/geometry/GrPathUtils.h index 24ae1bb44b..227841ee29 100644 --- a/src/gpu/geometry/GrPathUtils.h +++ b/src/gpu/ganesh/geometry/GrPathUtils.h @@ -13,7 +13,7 @@ #include "src/core/SkGeometry.h" #include "src/core/SkPathPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrVx.h" +#include "src/gpu/ganesh/GrVx.h" class SkMatrix; diff --git a/src/gpu/geometry/GrQuad.cpp b/src/gpu/ganesh/geometry/GrQuad.cpp similarity index 99% rename from src/gpu/geometry/GrQuad.cpp rename to src/gpu/ganesh/geometry/GrQuad.cpp index 2c512cf273..ff0038b70e 100644 --- a/src/gpu/geometry/GrQuad.cpp +++ b/src/gpu/ganesh/geometry/GrQuad.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" #include "include/core/SkMatrix.h" #include "include/private/GrTypesPriv.h" diff --git a/src/gpu/geometry/GrQuad.h b/src/gpu/ganesh/geometry/GrQuad.h similarity index 100% rename from src/gpu/geometry/GrQuad.h rename to src/gpu/ganesh/geometry/GrQuad.h diff --git a/src/gpu/geometry/GrQuadBuffer.h b/src/gpu/ganesh/geometry/GrQuadBuffer.h similarity index 99% rename from src/gpu/geometry/GrQuadBuffer.h rename to src/gpu/ganesh/geometry/GrQuadBuffer.h index 15f2216eb3..52db84edf0 100644 --- a/src/gpu/geometry/GrQuadBuffer.h +++ b/src/gpu/ganesh/geometry/GrQuadBuffer.h @@ -8,7 +8,7 @@ #define GrQuadBuffer_DEFINED #include "include/private/SkTDArray.h" -#include "src/gpu/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" template class GrQuadBuffer { diff --git a/src/gpu/geometry/GrQuadUtils.cpp b/src/gpu/ganesh/geometry/GrQuadUtils.cpp similarity index 99% rename from src/gpu/geometry/GrQuadUtils.cpp rename to src/gpu/ganesh/geometry/GrQuadUtils.cpp index a255702525..382ba4180e 100644 --- a/src/gpu/geometry/GrQuadUtils.cpp +++ b/src/gpu/ganesh/geometry/GrQuadUtils.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" #include "include/core/SkRect.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkVx.h" #include "src/core/SkPathPriv.h" -#include "src/gpu/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" using V4f = skvx::Vec<4, float>; using M4f = skvx::Vec<4, int32_t>; diff --git a/src/gpu/geometry/GrQuadUtils.h b/src/gpu/ganesh/geometry/GrQuadUtils.h similarity index 99% rename from src/gpu/geometry/GrQuadUtils.h rename to src/gpu/ganesh/geometry/GrQuadUtils.h index 7c285909b3..8923eb2f5d 100644 --- a/src/gpu/geometry/GrQuadUtils.h +++ b/src/gpu/ganesh/geometry/GrQuadUtils.h @@ -9,7 +9,7 @@ #define GrQuadUtils_DEFINED #include "include/private/SkVx.h" -#include "src/gpu/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" enum class GrQuadAAFlags; enum class GrAA : bool; diff --git a/src/gpu/geometry/GrRect.h b/src/gpu/ganesh/geometry/GrRect.h similarity index 100% rename from src/gpu/geometry/GrRect.h rename to src/gpu/ganesh/geometry/GrRect.h diff --git a/src/gpu/geometry/GrShape.cpp b/src/gpu/ganesh/geometry/GrShape.cpp similarity index 99% rename from src/gpu/geometry/GrShape.cpp rename to src/gpu/ganesh/geometry/GrShape.cpp index 34b88008c1..8d317b7a0f 100644 --- a/src/gpu/geometry/GrShape.cpp +++ b/src/gpu/ganesh/geometry/GrShape.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrShape.h" +#include "src/gpu/ganesh/geometry/GrShape.h" #include "src/core/SkPathPriv.h" #include "src/core/SkRRectPriv.h" diff --git a/src/gpu/geometry/GrShape.h b/src/gpu/ganesh/geometry/GrShape.h similarity index 100% rename from src/gpu/geometry/GrShape.h rename to src/gpu/ganesh/geometry/GrShape.h diff --git a/src/gpu/geometry/GrStyledShape.cpp b/src/gpu/ganesh/geometry/GrStyledShape.cpp similarity index 99% rename from src/gpu/geometry/GrStyledShape.cpp rename to src/gpu/ganesh/geometry/GrStyledShape.cpp index 8dddb28234..0d06eb24f6 100644 --- a/src/gpu/geometry/GrStyledShape.cpp +++ b/src/gpu/ganesh/geometry/GrStyledShape.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #include "include/private/SkIDChangeListener.h" diff --git a/src/gpu/geometry/GrStyledShape.h b/src/gpu/ganesh/geometry/GrStyledShape.h similarity index 99% rename from src/gpu/geometry/GrStyledShape.h rename to src/gpu/ganesh/geometry/GrStyledShape.h index b7f84459db..ee71782780 100644 --- a/src/gpu/geometry/GrStyledShape.h +++ b/src/gpu/ganesh/geometry/GrStyledShape.h @@ -13,8 +13,8 @@ #include "include/private/SkTemplates.h" #include "src/core/SkPathPriv.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/geometry/GrShape.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/geometry/GrShape.h" #include class SkIDChangeListener; diff --git a/src/gpu/geometry/GrTriangulator.cpp b/src/gpu/ganesh/geometry/GrTriangulator.cpp similarity index 99% rename from src/gpu/geometry/GrTriangulator.cpp rename to src/gpu/ganesh/geometry/GrTriangulator.cpp index 54b9e10b55..301748312f 100644 --- a/src/gpu/geometry/GrTriangulator.cpp +++ b/src/gpu/ganesh/geometry/GrTriangulator.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/geometry/GrTriangulator.h" +#include "src/gpu/ganesh/geometry/GrTriangulator.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" #include "src/core/SkGeometry.h" #include "src/core/SkPointPriv.h" diff --git a/src/gpu/geometry/GrTriangulator.h b/src/gpu/ganesh/geometry/GrTriangulator.h similarity index 99% rename from src/gpu/geometry/GrTriangulator.h rename to src/gpu/ganesh/geometry/GrTriangulator.h index 0c43f82d72..dbe4c1e623 100644 --- a/src/gpu/geometry/GrTriangulator.h +++ b/src/gpu/ganesh/geometry/GrTriangulator.h @@ -12,7 +12,7 @@ #include "include/core/SkPoint.h" #include "include/private/SkColorData.h" #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrColor.h" +#include "src/gpu/ganesh/GrColor.h" class GrEagerVertexAllocator; struct SkRect; diff --git a/src/gpu/ganesh/gl/BUILD.bazel b/src/gpu/ganesh/gl/BUILD.bazel new file mode 100644 index 0000000000..2b0c4c233b --- /dev/null +++ b/src/gpu/ganesh/gl/BUILD.bazel @@ -0,0 +1,588 @@ +load("//bazel:macros.bzl", "generated_cc_atom") + +generated_cc_atom( + name = "GrGLAssembleGLESInterfaceAutogen_src", + srcs = ["GrGLAssembleGLESInterfaceAutogen.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLAssembleHelpers_hdr", + "//include/gpu/gl:GrGLAssembleInterface_hdr", + ], +) + +generated_cc_atom( + name = "GrGLAssembleGLInterfaceAutogen_src", + srcs = ["GrGLAssembleGLInterfaceAutogen.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLAssembleHelpers_hdr", + "//include/gpu/gl:GrGLAssembleInterface_hdr", + ], +) + +generated_cc_atom( + name = "GrGLAssembleHelpers_src", + srcs = ["GrGLAssembleHelpers.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLAssembleHelpers_hdr", + ], +) + +generated_cc_atom( + name = "GrGLAssembleInterface_src", + srcs = ["GrGLAssembleInterface.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLAssembleHelpers_hdr", + "//include/gpu/gl:GrGLAssembleInterface_hdr", + ], +) + +generated_cc_atom( + name = "GrGLAssembleWebGLInterfaceAutogen_src", + srcs = ["GrGLAssembleWebGLInterfaceAutogen.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLAssembleHelpers_hdr", + "//include/gpu/gl:GrGLAssembleInterface_hdr", + ], +) + +generated_cc_atom( + name = "GrGLAttachment_hdr", + hdrs = ["GrGLAttachment.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/gl:GrGLInterface_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", + ], +) + +generated_cc_atom( + name = "GrGLAttachment_src", + srcs = ["GrGLAttachment.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLAttachment_hdr", + ":GrGLGpu_hdr", + "//include/core:SkTraceMemoryDump_hdr", + ], +) + +generated_cc_atom( + name = "GrGLBuffer_hdr", + hdrs = ["GrGLBuffer.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/gl:GrGLTypes_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + ], +) + +generated_cc_atom( + name = "GrGLBuffer_src", + srcs = ["GrGLBuffer.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLBuffer_hdr", + ":GrGLCaps_hdr", + ":GrGLGpu_hdr", + "//include/core:SkTraceMemoryDump_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + ], +) + +generated_cc_atom( + name = "GrGLCaps_hdr", + hdrs = ["GrGLCaps.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLAttachment_hdr", + ":GrGLUtil_hdr", + "//include/private:GrGLTypesPriv_hdr", + "//include/private:SkChecksum_hdr", + "//include/private:SkTArray_hdr", + "//include/private:SkTHash_hdr", + "//src/gpu:Swizzle_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + ], +) + +generated_cc_atom( + name = "GrGLCaps_src", + srcs = ["GrGLCaps.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLCaps_hdr", + ":GrGLContext_hdr", + ":GrGLRenderTarget_hdr", + ":GrGLTexture_hdr", + "//include/gpu:GrContextOptions_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkMathPriv_hdr", + "//src/core:SkTSearch_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrTextureProxyPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrGLContext_hdr", + hdrs = ["GrGLContext.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLCaps_hdr", + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLExtensions_hdr", + "//include/gpu/gl:GrGLInterface_hdr", + "//src/gpu/ganesh/glsl:GrGLSL_hdr", + ], +) + +generated_cc_atom( + name = "GrGLContext_src", + srcs = ["GrGLContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLContext_hdr", + ":GrGLGLSL_hdr", + "//include/gpu:GrContextOptions_hdr", + ], +) + +generated_cc_atom( + name = "GrGLExtensions_src", + srcs = ["GrGLExtensions.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLDefines_impl_hdr", + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLExtensions_hdr", + "//src/core:SkTSearch_hdr", + "//src/core:SkTSort_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrGLGLSL_hdr", + hdrs = ["GrGLGLSL.h"], + visibility = ["//:__subpackages__"], + deps = ["//src/gpu/ganesh/glsl:GrGLSL_hdr"], +) + +generated_cc_atom( + name = "GrGLGLSL_src", + srcs = ["GrGLGLSL.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGLSL_hdr", + ":GrGLUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrGLGpuProgramCache_src", + srcs = ["GrGLGpuProgramCache.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + "//include/gpu:GrContextOptions_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh/gl/builders:GrGLProgramBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrGLGpu_hdr", + hdrs = ["GrGLGpu.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLAttachment_hdr", + ":GrGLContext_hdr", + ":GrGLProgram_hdr", + ":GrGLRenderTarget_hdr", + ":GrGLTexture_hdr", + ":GrGLVertexArray_hdr", + "//include/core:SkTypes_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkLRUCache_hdr", + "//src/gpu/ganesh:GrFinishCallbacks_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrNativeRect_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", + "//src/gpu/ganesh:GrWindowRectsState_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + ], +) + +generated_cc_atom( + name = "GrGLGpu_src", + srcs = ["GrGLGpu.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLAttachment_hdr", + ":GrGLBuffer_hdr", + ":GrGLGpu_hdr", + ":GrGLOpsRenderPass_hdr", + ":GrGLSemaphore_hdr", + ":GrGLTextureRenderTarget_hdr", + "//include/core:SkColorSpace_hdr", + "//include/core:SkPixmap_hdr", + "//include/core:SkTypes_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrTypes_hdr", + "//include/private:SkHalf_hdr", + "//include/private:SkTemplates_hdr", + "//include/private:SkTo_hdr", + "//src/core:SkAutoMalloc_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkLRUCache_hdr", + "//src/core:SkMipmap_hdr", + "//src/core:SkScopeExit_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrCpuBuffer_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh/gl/builders:GrGLShaderStringBuilder_hdr", + "//src/sksl:SkSLCompiler_hdr", + "//src/utils:SkJSONWriter_hdr", + ], +) + +generated_cc_atom( + name = "GrGLInterfaceAutogen_src", + srcs = ["GrGLInterfaceAutogen.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/gpu/gl:GrGLExtensions_hdr", + "//include/gpu/gl:GrGLInterface_hdr", + ], +) + +generated_cc_atom( + name = "GrGLMakeNativeInterface_none_src", + srcs = ["GrGLMakeNativeInterface_none.cpp"], + visibility = ["//:__subpackages__"], + deps = ["//include/gpu/gl:GrGLInterface_hdr"], +) + +generated_cc_atom( + name = "GrGLOpsRenderPass_hdr", + hdrs = ["GrGLOpsRenderPass.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + ":GrGLRenderTarget_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + ], +) + +generated_cc_atom( + name = "GrGLOpsRenderPass_src", + srcs = ["GrGLOpsRenderPass.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLOpsRenderPass_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + ], +) + +generated_cc_atom( + name = "GrGLProgramDataManager_hdr", + hdrs = ["GrGLProgramDataManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/gl:GrGLTypes_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkTBlockList_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrGLProgramDataManager_src", + srcs = ["GrGLProgramDataManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + ":GrGLProgramDataManager_hdr", + "//include/core:SkMatrix_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrGLProgram_hdr", + hdrs = ["GrGLProgram.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLProgramDataManager_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrGLProgram_src", + srcs = ["GrGLProgram.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLBuffer_hdr", + ":GrGLGpu_hdr", + ":GrGLProgram_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/sksl:SkSLCompiler_hdr", + ], +) + +generated_cc_atom( + name = "GrGLRenderTarget_hdr", + hdrs = ["GrGLRenderTarget.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLDefines_impl_hdr", + "//include/core:SkScalar_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + ], +) + +generated_cc_atom( + name = "GrGLRenderTarget_src", + srcs = ["GrGLRenderTarget.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + ":GrGLRenderTarget_hdr", + ":GrGLUtil_hdr", + "//include/core:SkTraceMemoryDump_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrGLSemaphore_hdr", + hdrs = ["GrGLSemaphore.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu:GrBackendSemaphore_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + ], +) + +generated_cc_atom( + name = "GrGLSemaphore_src", + srcs = ["GrGLSemaphore.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + ":GrGLSemaphore_hdr", + ], +) + +generated_cc_atom( + name = "GrGLTextureRenderTarget_hdr", + hdrs = ["GrGLTextureRenderTarget.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLRenderTarget_hdr", + ":GrGLTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrGLTextureRenderTarget_src", + srcs = ["GrGLTextureRenderTarget.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + ":GrGLTextureRenderTarget_hdr", + "//include/core:SkTraceMemoryDump_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrGLTexture_hdr", + hdrs = ["GrGLTexture.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/private:GrGLTypesPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrGLTexture_src", + srcs = ["GrGLTexture.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLGpu_hdr", + ":GrGLTexture_hdr", + "//include/core:SkTraceMemoryDump_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrGLTypesPriv_src", + srcs = ["GrGLTypesPriv.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLDefines_impl_hdr", + "//include/core:SkScalar_hdr", + "//include/private:GrGLTypesPriv_hdr", + "//src/gpu:Swizzle_hdr", + ], +) + +generated_cc_atom( + name = "GrGLUniformHandler_hdr", + hdrs = ["GrGLUniformHandler.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrGLUniformHandler_src", + srcs = ["GrGLUniformHandler.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLCaps_hdr", + ":GrGLGpu_hdr", + ":GrGLUniformHandler_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh/gl/builders:GrGLProgramBuilder_hdr", + "//src/sksl:SkSLCompiler_hdr", + ], +) + +generated_cc_atom( + name = "GrGLUtil_hdr", + hdrs = ["GrGLUtil.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLDefines_impl_hdr", + "//include/gpu/gl:GrGLInterface_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkImageInfoPriv_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + ], +) + +generated_cc_atom( + name = "GrGLUtil_src", + srcs = ["GrGLUtil.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLUtil_hdr", + "//include/core:SkMatrix_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + ], +) + +generated_cc_atom( + name = "GrGLVaryingHandler_hdr", + hdrs = ["GrGLVaryingHandler.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLProgramDataManager_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + ], +) + +generated_cc_atom( + name = "GrGLVertexArray_hdr", + hdrs = ["GrGLVertexArray.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLDefines_impl_hdr", + "//include/gpu/gl:GrGLTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkTArray_hdr", + "//src/gpu/ganesh:GrGpuResource_hdr", + ], +) + +generated_cc_atom( + name = "GrGLVertexArray_src", + srcs = ["GrGLVertexArray.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrGLBuffer_hdr", + ":GrGLGpu_hdr", + ":GrGLVertexArray_hdr", + "//src/gpu/ganesh:GrCpuBuffer_hdr", + ], +) + +generated_cc_atom( + name = "GrGLDefines_impl_hdr", + hdrs = ["GrGLDefines_impl.h"], + visibility = ["//:__subpackages__"], +) diff --git a/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp b/src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp similarity index 99% rename from src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp rename to src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp index 2911a383de..a6c45bfc67 100644 --- a/src/gpu/gl/GrGLAssembleGLESInterfaceAutogen.cpp +++ b/src/gpu/ganesh/gl/GrGLAssembleGLESInterfaceAutogen.cpp @@ -11,7 +11,7 @@ #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #define GET_PROC(F) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F) #define GET_PROC_SUFFIX(F, S) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F #S) diff --git a/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp b/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp similarity index 99% rename from src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp rename to src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp index 18e2cdb62b..907c42c4d3 100644 --- a/src/gpu/gl/GrGLAssembleGLInterfaceAutogen.cpp +++ b/src/gpu/ganesh/gl/GrGLAssembleGLInterfaceAutogen.cpp @@ -11,7 +11,7 @@ #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #define GET_PROC(F) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F) #define GET_PROC_SUFFIX(F, S) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F #S) diff --git a/src/gpu/gl/GrGLAssembleHelpers.cpp b/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp similarity index 94% rename from src/gpu/gl/GrGLAssembleHelpers.cpp rename to src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp index 5e5163f26a..ab87cb30c3 100644 --- a/src/gpu/gl/GrGLAssembleHelpers.cpp +++ b/src/gpu/ganesh/gl/GrGLAssembleHelpers.cpp @@ -6,7 +6,7 @@ */ #include "include/gpu/gl/GrGLAssembleHelpers.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" void GrGetEGLQueryAndDisplay(GrEGLQueryStringFn** queryString, GrEGLDisplay* display, void* ctx, GrGLGetProc get) { diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/ganesh/gl/GrGLAssembleInterface.cpp similarity index 96% rename from src/gpu/gl/GrGLAssembleInterface.cpp rename to src/gpu/ganesh/gl/GrGLAssembleInterface.cpp index 2a0f774f0e..a92ea3b53a 100644 --- a/src/gpu/gl/GrGLAssembleInterface.cpp +++ b/src/gpu/ganesh/gl/GrGLAssembleInterface.cpp @@ -8,7 +8,7 @@ #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #define GET_PROC_LOCAL(F) GrGL##F##Fn* F = (GrGL##F##Fn*)get(ctx, "gl" #F) diff --git a/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp b/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp similarity index 99% rename from src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp rename to src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp index c8773a8693..d09a6b23eb 100644 --- a/src/gpu/gl/GrGLAssembleWebGLInterfaceAutogen.cpp +++ b/src/gpu/ganesh/gl/GrGLAssembleWebGLInterfaceAutogen.cpp @@ -11,7 +11,7 @@ #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #if SK_DISABLE_WEBGL_INTERFACE || !defined(SK_USE_WEBGL) sk_sp GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetProc get) { diff --git a/src/gpu/gl/GrGLAttachment.cpp b/src/gpu/ganesh/gl/GrGLAttachment.cpp similarity index 98% rename from src/gpu/gl/GrGLAttachment.cpp rename to src/gpu/ganesh/gl/GrGLAttachment.cpp index aca5d5ade4..85ecbc90ed 100644 --- a/src/gpu/gl/GrGLAttachment.cpp +++ b/src/gpu/ganesh/gl/GrGLAttachment.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLAttachment.h" +#include "src/gpu/ganesh/gl/GrGLAttachment.h" #include "include/core/SkTraceMemoryDump.h" -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #define GL_CALL(X) GR_GL_CALL(gpu->glInterface(), X) diff --git a/src/gpu/gl/GrGLAttachment.h b/src/gpu/ganesh/gl/GrGLAttachment.h similarity index 98% rename from src/gpu/gl/GrGLAttachment.h rename to src/gpu/ganesh/gl/GrGLAttachment.h index 5a7f9b0181..1985670e20 100644 --- a/src/gpu/gl/GrGLAttachment.h +++ b/src/gpu/ganesh/gl/GrGLAttachment.h @@ -9,7 +9,7 @@ #define GrGLMtlAttachment_DEFINED #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/GrAttachment.h" +#include "src/gpu/ganesh/GrAttachment.h" class GrGLGpu; diff --git a/src/gpu/gl/GrGLBuffer.cpp b/src/gpu/ganesh/gl/GrGLBuffer.cpp similarity index 98% rename from src/gpu/gl/GrGLBuffer.cpp rename to src/gpu/ganesh/gl/GrGLBuffer.cpp index 6c2d8abe06..8440e27afb 100644 --- a/src/gpu/gl/GrGLBuffer.cpp +++ b/src/gpu/ganesh/gl/GrGLBuffer.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLBuffer.h" +#include "src/gpu/ganesh/gl/GrGLBuffer.h" #include "include/core/SkTraceMemoryDump.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/gl/GrGLCaps.h" -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #define GL_CALL(X) GR_GL_CALL(this->glGpu()->glInterface(), X) #define GL_CALL_RET(RET, X) GR_GL_CALL_RET(this->glGpu()->glInterface(), RET, X) diff --git a/src/gpu/gl/GrGLBuffer.h b/src/gpu/ganesh/gl/GrGLBuffer.h similarity index 97% rename from src/gpu/gl/GrGLBuffer.h rename to src/gpu/ganesh/gl/GrGLBuffer.h index bccf639be3..4cef8f3db2 100644 --- a/src/gpu/gl/GrGLBuffer.h +++ b/src/gpu/ganesh/gl/GrGLBuffer.h @@ -9,7 +9,7 @@ #define GrGLBuffer_DEFINED #include "include/gpu/gl/GrGLTypes.h" -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" class GrGLGpu; class GrGLCaps; diff --git a/src/gpu/gl/GrGLCaps.cpp b/src/gpu/ganesh/gl/GrGLCaps.cpp similarity index 99% rename from src/gpu/gl/GrGLCaps.cpp rename to src/gpu/ganesh/gl/GrGLCaps.cpp index 91561d7e99..c91e636efe 100644 --- a/src/gpu/gl/GrGLCaps.cpp +++ b/src/gpu/ganesh/gl/GrGLCaps.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" #include #include @@ -14,15 +14,15 @@ #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkMathPriv.h" #include "src/core/SkTSearch.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/gl/GrGLContext.h" -#include "src/gpu/gl/GrGLRenderTarget.h" -#include "src/gpu/gl/GrGLTexture.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/gl/GrGLContext.h" +#include "src/gpu/ganesh/gl/GrGLRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" #if defined(SK_BUILD_FOR_IOS) #include diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/ganesh/gl/GrGLCaps.h similarity index 99% rename from src/gpu/gl/GrGLCaps.h rename to src/gpu/ganesh/gl/GrGLCaps.h index cd78aac867..881fde1b3b 100644 --- a/src/gpu/gl/GrGLCaps.h +++ b/src/gpu/ganesh/gl/GrGLCaps.h @@ -14,10 +14,10 @@ #include "include/private/SkChecksum.h" #include "include/private/SkTArray.h" #include "include/private/SkTHash.h" -#include "src/gpu/GrCaps.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/gl/GrGLAttachment.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/gl/GrGLAttachment.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" class GrGLContextInfo; class GrGLRenderTarget; diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/ganesh/gl/GrGLContext.cpp similarity index 97% rename from src/gpu/gl/GrGLContext.cpp rename to src/gpu/ganesh/gl/GrGLContext.cpp index 696dec8255..de56d8a9d3 100644 --- a/src/gpu/gl/GrGLContext.cpp +++ b/src/gpu/ganesh/gl/GrGLContext.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLContext.h" +#include "src/gpu/ganesh/gl/GrGLContext.h" #include "include/gpu/GrContextOptions.h" -#include "src/gpu/gl/GrGLGLSL.h" +#include "src/gpu/ganesh/gl/GrGLGLSL.h" #ifdef SK_BUILD_FOR_ANDROID #include diff --git a/src/gpu/gl/GrGLContext.h b/src/gpu/ganesh/gl/GrGLContext.h similarity index 97% rename from src/gpu/gl/GrGLContext.h rename to src/gpu/ganesh/gl/GrGLContext.h index 22f0d2fe9d..d5424ca6cf 100644 --- a/src/gpu/gl/GrGLContext.h +++ b/src/gpu/ganesh/gl/GrGLContext.h @@ -11,9 +11,9 @@ #include "include/gpu/gl/GrGLExtensions.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLCaps.h" -#include "src/gpu/gl/GrGLUtil.h" -#include "src/gpu/glsl/GrGLSL.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" +#include "src/gpu/ganesh/glsl/GrGLSL.h" struct GrContextOptions; diff --git a/src/gpu/ganesh/gl/GrGLDefines_impl.h b/src/gpu/ganesh/gl/GrGLDefines_impl.h new file mode 100644 index 0000000000..9c899288d5 --- /dev/null +++ b/src/gpu/ganesh/gl/GrGLDefines_impl.h @@ -0,0 +1,1154 @@ +/* + * Copyright 2011 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + + + +#ifndef GrGLDefines_DEFINED +#define GrGLDefines_DEFINED + +/* Profiles */ +#define GR_GL_CONTEXT_PROFILE_MASK 0x9126 +#define GR_GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 +#define GR_GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 + +// The following constants consist of the intersection of GL constants +// exported by GLES 1.0, GLES 2.0, and desktop GL required by the system. + +#define GR_GL_DEPTH_BUFFER_BIT 0x00000100 +#define GR_GL_STENCIL_BUFFER_BIT 0x00000400 +#define GR_GL_COLOR_BUFFER_BIT 0x00004000 + +/* Boolean */ +#define GR_GL_FALSE 0 +#define GR_GL_TRUE 1 + +/* BeginMode */ +#define GR_GL_POINTS 0x0000 +#define GR_GL_LINES 0x0001 +#define GR_GL_LINE_LOOP 0x0002 +#define GR_GL_LINE_STRIP 0x0003 +#define GR_GL_TRIANGLES 0x0004 +#define GR_GL_TRIANGLE_STRIP 0x0005 +#define GR_GL_TRIANGLE_FAN 0x0006 +#define GR_GL_PATCHES 0x000E + +/* AlphaFunction (not supported in ES20) */ +/* GL_NEVER */ +/* GL_LESS */ +/* GL_EQUAL */ +/* GL_LEQUAL */ +/* GL_GREATER */ +/* GL_NOTEQUAL */ +/* GL_GEQUAL */ +/* GL_ALWAYS */ + +/* Basic OpenGL blend equations */ +#define GR_GL_FUNC_ADD 0x8006 +#define GR_GL_FUNC_SUBTRACT 0x800A +#define GR_GL_FUNC_REVERSE_SUBTRACT 0x800B + +/* GL_KHR_blend_equation_advanced */ +#define GR_GL_SCREEN 0x9295 +#define GR_GL_OVERLAY 0x9296 +#define GR_GL_DARKEN 0x9297 +#define GR_GL_LIGHTEN 0x9298 +#define GR_GL_COLORDODGE 0x9299 +#define GR_GL_COLORBURN 0x929A +#define GR_GL_HARDLIGHT 0x929B +#define GR_GL_SOFTLIGHT 0x929C +#define GR_GL_DIFFERENCE 0x929E +#define GR_GL_EXCLUSION 0x92A0 +#define GR_GL_MULTIPLY 0x9294 +#define GR_GL_HSL_HUE 0x92AD +#define GR_GL_HSL_SATURATION 0x92AE +#define GR_GL_HSL_COLOR 0x92AF +#define GR_GL_HSL_LUMINOSITY 0x92B0 + +/* BlendingFactorDest */ +#define GR_GL_ZERO 0 +#define GR_GL_ONE 1 +#define GR_GL_SRC_COLOR 0x0300 +#define GR_GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GR_GL_SRC_ALPHA 0x0302 +#define GR_GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GR_GL_DST_ALPHA 0x0304 +#define GR_GL_ONE_MINUS_DST_ALPHA 0x0305 + +/* BlendingFactorSrc */ +/* GL_ZERO */ +/* GL_ONE */ +#define GR_GL_DST_COLOR 0x0306 +#define GR_GL_ONE_MINUS_DST_COLOR 0x0307 +#define GR_GL_SRC_ALPHA_SATURATE 0x0308 +/* GL_SRC_ALPHA */ +/* GL_ONE_MINUS_SRC_ALPHA */ +/* GL_DST_ALPHA */ +/* GL_ONE_MINUS_DST_ALPHA */ + +/* ExtendedBlendFactors */ +#define GR_GL_SRC1_COLOR 0x88F9 +#define GR_GL_ONE_MINUS_SRC1_COLOR 0x88FA +/* GL_SRC1_ALPHA */ +#define GR_GL_ONE_MINUS_SRC1_ALPHA 0x88FB + +/* Separate Blend Functions */ +#define GR_GL_BLEND_DST_RGB 0x80C8 +#define GR_GL_BLEND_SRC_RGB 0x80C9 +#define GR_GL_BLEND_DST_ALPHA 0x80CA +#define GR_GL_BLEND_SRC_ALPHA 0x80CB +#define GR_GL_CONSTANT_COLOR 0x8001 +#define GR_GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GR_GL_CONSTANT_ALPHA 0x8003 +#define GR_GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +#define GR_GL_BLEND_COLOR 0x8005 + +/* Buffer Objects */ +#define GR_GL_ARRAY_BUFFER 0x8892 +#define GR_GL_ELEMENT_ARRAY_BUFFER 0x8893 +#define GR_GL_DRAW_INDIRECT_BUFFER 0x8F3F +#define GR_GL_TEXTURE_BUFFER 0x8C2A +#define GR_GL_ARRAY_BUFFER_BINDING 0x8894 +#define GR_GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 +#define GR_GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 +#define GR_GL_PIXEL_PACK_BUFFER 0x88EB +#define GR_GL_PIXEL_UNPACK_BUFFER 0x88EC + +#define GR_GL_PIXEL_UNPACK_TRANSFER_BUFFER_CHROMIUM 0x78EC +#define GR_GL_PIXEL_PACK_TRANSFER_BUFFER_CHROMIUM 0x78ED + +#define GR_GL_STREAM_DRAW 0x88E0 +#define GR_GL_STREAM_READ 0x88E1 +#define GR_GL_STATIC_DRAW 0x88E4 +#define GR_GL_STATIC_READ 0x88E5 +#define GR_GL_DYNAMIC_DRAW 0x88E8 +#define GR_GL_DYNAMIC_READ 0x88E9 + +#define GR_GL_BUFFER_SIZE 0x8764 +#define GR_GL_BUFFER_USAGE 0x8765 + +#define GR_GL_CURRENT_VERTEX_ATTRIB 0x8626 + +/* CullFaceMode */ +#define GR_GL_FRONT 0x0404 +#define GR_GL_BACK 0x0405 +#define GR_GL_FRONT_AND_BACK 0x0408 + +/* DepthFunction */ +/* GL_NEVER */ +/* GL_LESS */ +/* GL_EQUAL */ +/* GL_LEQUAL */ +/* GL_GREATER */ +/* GL_NOTEQUAL */ +/* GL_GEQUAL */ +/* GL_ALWAYS */ + +/* EnableCap */ +#define GR_GL_TEXTURE_NONE 0x0000 +#define GR_GL_TEXTURE_2D 0x0DE1 +#define GR_GL_CULL_FACE 0x0B44 +#define GR_GL_BLEND 0x0BE2 +#define GR_GL_DITHER 0x0BD0 +#define GR_GL_STENCIL_TEST 0x0B90 +#define GR_GL_DEPTH_TEST 0x0B71 +#define GR_GL_SCISSOR_TEST 0x0C11 +#define GR_GL_POLYGON_OFFSET_FILL 0x8037 +#define GR_GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GR_GL_SAMPLE_COVERAGE 0x80A0 +#define GR_GL_POLYGON_OFFSET_FILL 0x8037 +#define GR_GL_POLYGON_SMOOTH 0x0B41 +#define GR_GL_POLYGON_STIPPLE 0x0B42 +#define GR_GL_COLOR_LOGIC_OP 0x0BF2 +#define GR_GL_COLOR_TABLE 0x80D0 +#define GR_GL_INDEX_LOGIC_OP 0x0BF1 +#define GR_GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 +#define GR_GL_LINE_STIPPLE 0x0B24 +#define GR_GL_FRAMEBUFFER_SRGB 0x8DB9 +#define GR_GL_SHADER_PIXEL_LOCAL_STORAGE 0x8F64 +#define GR_GL_SAMPLE_SHADING 0x8C36 + +/* ErrorCode */ +#define GR_GL_NO_ERROR 0 +#define GR_GL_INVALID_ENUM 0x0500 +#define GR_GL_INVALID_VALUE 0x0501 +#define GR_GL_INVALID_OPERATION 0x0502 +#define GR_GL_OUT_OF_MEMORY 0x0505 +#define GR_GL_CONTEXT_LOST 0x300E // TODO(gman): What value? + +/* FrontFaceDirection */ +#define GR_GL_CW 0x0900 +#define GR_GL_CCW 0x0901 + +/* GetPName */ +#define GR_GL_LINE_WIDTH 0x0B21 +#define GR_GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GR_GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#define GR_GL_CULL_FACE_MODE 0x0B45 +#define GR_GL_FRONT_FACE 0x0B46 +#define GR_GL_DEPTH_RANGE 0x0B70 +#define GR_GL_DEPTH_WRITEMASK 0x0B72 +#define GR_GL_DEPTH_CLEAR_VALUE 0x0B73 +#define GR_GL_DEPTH_FUNC 0x0B74 +#define GR_GL_STENCIL_CLEAR_VALUE 0x0B91 +#define GR_GL_STENCIL_FUNC 0x0B92 +#define GR_GL_STENCIL_FAIL 0x0B94 +#define GR_GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +#define GR_GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +#define GR_GL_STENCIL_REF 0x0B97 +#define GR_GL_STENCIL_VALUE_MASK 0x0B93 +#define GR_GL_STENCIL_WRITEMASK 0x0B98 +#define GR_GL_STENCIL_BACK_FUNC 0x8800 +#define GR_GL_STENCIL_BACK_FAIL 0x8801 +#define GR_GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 +#define GR_GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 +#define GR_GL_STENCIL_BACK_REF 0x8CA3 +#define GR_GL_STENCIL_BACK_VALUE_MASK 0x8CA4 +#define GR_GL_STENCIL_BACK_WRITEMASK 0x8CA5 +#define GR_GL_VIEWPORT 0x0BA2 +#define GR_GL_SCISSOR_BOX 0x0C10 +/* GL_SCISSOR_TEST */ +#define GR_GL_COLOR_CLEAR_VALUE 0x0C22 +#define GR_GL_COLOR_WRITEMASK 0x0C23 +#define GR_GL_UNPACK_ALIGNMENT 0x0CF5 +#define GR_GL_PACK_ALIGNMENT 0x0D05 +#define GR_GL_PACK_REVERSE_ROW_ORDER 0x93A4 +#define GR_GL_MAX_TEXTURE_SIZE 0x0D33 +#define GR_GL_TEXTURE_MIN_LOD 0x813A +#define GR_GL_TEXTURE_MAX_LOD 0x813B +#define GR_GL_TEXTURE_BASE_LEVEL 0x813C +#define GR_GL_TEXTURE_MAX_LEVEL 0x813D +#define GR_GL_MAX_VIEWPORT_DIMS 0x0D3A +#define GR_GL_SUBPIXEL_BITS 0x0D50 +#define GR_GL_RED_BITS 0x0D52 +#define GR_GL_GREEN_BITS 0x0D53 +#define GR_GL_BLUE_BITS 0x0D54 +#define GR_GL_ALPHA_BITS 0x0D55 +#define GR_GL_DEPTH_BITS 0x0D56 +#define GR_GL_STENCIL_BITS 0x0D57 +#define GR_GL_POLYGON_OFFSET_UNITS 0x2A00 +/* GL_POLYGON_OFFSET_FILL */ +#define GR_GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GR_GL_TEXTURE_BINDING_2D 0x8069 +#define GR_GL_SAMPLE_BUFFERS 0x80A8 +#define GR_GL_SAMPLES 0x80A9 +#define GR_GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GR_GL_SAMPLE_COVERAGE_INVERT 0x80AB +#define GR_GL_RENDERBUFFER_COVERAGE_SAMPLES 0x8CAB +#define GR_GL_RENDERBUFFER_COLOR_SAMPLES 0x8E10 +#define GR_GL_MAX_MULTISAMPLE_COVERAGE_MODES 0x8E11 +#define GR_GL_MULTISAMPLE_COVERAGE_MODES 0x8E12 +#define GR_GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B + +#define GR_GL_CONTEXT_FLAGS 0x821E +#define GR_GL_CONTEXT_FLAG_PROTECTED_CONTENT_BIT_EXT 0x00000010 +#define GR_GL_TEXTURE_PROTECTED_EXT 0x8BFA + +/* GetTextureParameter */ +/* GL_TEXTURE_MAG_FILTER */ +/* GL_TEXTURE_MIN_FILTER */ +/* GL_TEXTURE_WRAP_S */ +/* GL_TEXTURE_WRAP_T */ + +#define GR_GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GR_GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 + +/* Compressed Texture Formats */ +#define GR_GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +#define GR_GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +#define GR_GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +#define GR_GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 + +#define GR_GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C +#define GR_GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D +#define GR_GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E +#define GR_GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F + +#define GR_GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 +#define GR_GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 +#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 +#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 + +#define GR_GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137 +#define GR_GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138 + +#define GR_GL_COMPRESSED_ETC1_RGB8 0x8D64 + +#define GR_GL_COMPRESSED_R11_EAC 0x9270 +#define GR_GL_COMPRESSED_SIGNED_R11_EAC 0x9271 +#define GR_GL_COMPRESSED_RG11_EAC 0x9272 +#define GR_GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 + +#define GR_GL_COMPRESSED_RGB8_ETC2 0x9274 +#define GR_GL_COMPRESSED_SRGB8_ETC2 0x9275 +#define GR_GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1 0x9276 +#define GR_GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1 0x9277 +#define GR_GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 + +#define GR_GL_COMPRESSED_LUMINANCE_LATC1 0x8C70 +#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_LATC1 0x8C71 +#define GR_GL_COMPRESSED_LUMINANCE_ALPHA_LATC2 0x8C72 +#define GR_GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2 0x8C73 + +#define GR_GL_COMPRESSED_RED_RGTC1 0x8DBB +#define GR_GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC +#define GR_GL_COMPRESSED_RED_GREEN_RGTC2 0x8DBD +#define GR_GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2 0x8DBE + +#define GR_GL_COMPRESSED_3DC_X 0x87F9 +#define GR_GL_COMPRESSED_3DC_XY 0x87FA + +#define GR_GL_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C +#define GR_GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D +#define GR_GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E +#define GR_GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F + +#define GR_GL_COMPRESSED_RGBA_ASTC_4x4 0x93B0 +#define GR_GL_COMPRESSED_RGBA_ASTC_5x4 0x93B1 +#define GR_GL_COMPRESSED_RGBA_ASTC_5x5 0x93B2 +#define GR_GL_COMPRESSED_RGBA_ASTC_6x5 0x93B3 +#define GR_GL_COMPRESSED_RGBA_ASTC_6x6 0x93B4 +#define GR_GL_COMPRESSED_RGBA_ASTC_8x5 0x93B5 +#define GR_GL_COMPRESSED_RGBA_ASTC_8x6 0x93B6 +#define GR_GL_COMPRESSED_RGBA_ASTC_8x8 0x93B7 +#define GR_GL_COMPRESSED_RGBA_ASTC_10x5 0x93B8 +#define GR_GL_COMPRESSED_RGBA_ASTC_10x6 0x93B9 +#define GR_GL_COMPRESSED_RGBA_ASTC_10x8 0x93BA +#define GR_GL_COMPRESSED_RGBA_ASTC_10x10 0x93BB +#define GR_GL_COMPRESSED_RGBA_ASTC_12x10 0x93BC +#define GR_GL_COMPRESSED_RGBA_ASTC_12x12 0x93BD + +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4 0x93D0 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4 0x93D1 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5 0x93D2 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5 0x93D3 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6 0x93D4 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5 0x93D5 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6 0x93D6 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8 0x93D7 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5 0x93D8 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6 0x93D9 +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8 0x93DA +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10 0x93DB +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10 0x93DC +#define GR_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12 0x93DD + +/* HintMode */ +#define GR_GL_DONT_CARE 0x1100 +#define GR_GL_FASTEST 0x1101 +#define GR_GL_NICEST 0x1102 + +/* HintTarget */ +#define GR_GL_GENERATE_MIPMAP_HINT 0x8192 + +/* DataType */ +#define GR_GL_BYTE 0x1400 +#define GR_GL_UNSIGNED_BYTE 0x1401 +#define GR_GL_SHORT 0x1402 +#define GR_GL_UNSIGNED_SHORT 0x1403 +#define GR_GL_INT 0x1404 +#define GR_GL_UNSIGNED_INT 0x1405 +#define GR_GL_FLOAT 0x1406 +#define GR_GL_HALF_FLOAT 0x140B +#define GR_GL_FIXED 0x140C +#define GR_GL_HALF_FLOAT_OES 0x8D61 + +/* Lighting */ +#define GR_GL_LIGHTING 0x0B50 +#define GR_GL_LIGHT0 0x4000 +#define GR_GL_LIGHT1 0x4001 +#define GR_GL_LIGHT2 0x4002 +#define GR_GL_LIGHT3 0x4003 +#define GR_GL_LIGHT4 0x4004 +#define GR_GL_LIGHT5 0x4005 +#define GR_GL_LIGHT6 0x4006 +#define GR_GL_LIGHT7 0x4007 +#define GR_GL_SPOT_EXPONENT 0x1205 +#define GR_GL_SPOT_CUTOFF 0x1206 +#define GR_GL_CONSTANT_ATTENUATION 0x1207 +#define GR_GL_LINEAR_ATTENUATION 0x1208 +#define GR_GL_QUADRATIC_ATTENUATION 0x1209 +#define GR_GL_AMBIENT 0x1200 +#define GR_GL_DIFFUSE 0x1201 +#define GR_GL_SPECULAR 0x1202 +#define GR_GL_SHININESS 0x1601 +#define GR_GL_EMISSION 0x1600 +#define GR_GL_POSITION 0x1203 +#define GR_GL_SPOT_DIRECTION 0x1204 +#define GR_GL_AMBIENT_AND_DIFFUSE 0x1602 +#define GR_GL_COLOR_INDEXES 0x1603 +#define GR_GL_LIGHT_MODEL_TWO_SIDE 0x0B52 +#define GR_GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 +#define GR_GL_LIGHT_MODEL_AMBIENT 0x0B53 +#define GR_GL_FRONT_AND_BACK 0x0408 +#define GR_GL_SHADE_MODEL 0x0B54 +#define GR_GL_FLAT 0x1D00 +#define GR_GL_SMOOTH 0x1D01 +#define GR_GL_COLOR_MATERIAL 0x0B57 +#define GR_GL_COLOR_MATERIAL_FACE 0x0B55 +#define GR_GL_COLOR_MATERIAL_PARAMETER 0x0B56 +#define GR_GL_NORMALIZE 0x0BA1 + +/* Matrix Mode */ +#define GR_GL_MATRIX_MODE 0x0BA0 +#define GR_GL_MODELVIEW 0x1700 +#define GR_GL_PROJECTION 0x1701 +#define GR_GL_TEXTURE 0x1702 + +/* multisample */ +#define GR_GL_MULTISAMPLE 0x809D +#define GR_GL_SAMPLE_POSITION 0x8E50 + +/* Points */ +#define GR_GL_POINT_SMOOTH 0x0B10 +#define GR_GL_POINT_SIZE 0x0B11 +#define GR_GL_POINT_SIZE_GRANULARITY 0x0B13 +#define GR_GL_POINT_SIZE_RANGE 0x0B12 + +/* Lines */ +#define GR_GL_LINE_SMOOTH 0x0B20 +#define GR_GL_LINE_STIPPLE 0x0B24 +#define GR_GL_LINE_STIPPLE_PATTERN 0x0B25 +#define GR_GL_LINE_STIPPLE_REPEAT 0x0B26 +#define GR_GL_LINE_WIDTH 0x0B21 +#define GR_GL_LINE_WIDTH_GRANULARITY 0x0B23 +#define GR_GL_LINE_WIDTH_RANGE 0x0B22 + +/* PolygonMode */ +#define GR_GL_POINT 0x1B00 +#define GR_GL_LINE 0x1B01 +#define GR_GL_FILL 0x1B02 + +/* Unsized formats */ +#define GR_GL_STENCIL_INDEX 0x1901 +#define GR_GL_DEPTH_COMPONENT 0x1902 +#define GR_GL_DEPTH_STENCIL 0x84F9 +#define GR_GL_RED 0x1903 +#define GR_GL_RED_INTEGER 0x8D94 +#define GR_GL_GREEN 0x1904 +#define GR_GL_BLUE 0x1905 +#define GR_GL_ALPHA 0x1906 +#define GR_GL_LUMINANCE 0x1909 +#define GR_GL_LUMINANCE_ALPHA 0x190A +#define GR_GL_RG_INTEGER 0x8228 +#define GR_GL_RGB 0x1907 +#define GR_GL_RGB_INTEGER 0x8D98 +#define GR_GL_SRGB 0x8C40 +#define GR_GL_RGBA 0x1908 +#define GR_GL_RG 0x8227 +#define GR_GL_SRGB_ALPHA 0x8C42 +#define GR_GL_RGBA_INTEGER 0x8D99 +#define GR_GL_BGRA 0x80E1 + +/* Stencil index sized formats */ +#define GR_GL_STENCIL_INDEX4 0x8D47 +#define GR_GL_STENCIL_INDEX8 0x8D48 +#define GR_GL_STENCIL_INDEX16 0x8D49 + +/* Depth component sized formats */ +#define GR_GL_DEPTH_COMPONENT16 0x81A5 + +/* Depth stencil sized formats */ +#define GR_GL_DEPTH24_STENCIL8 0x88F0 + +/* Red sized formats */ +#define GR_GL_R8 0x8229 +#define GR_GL_R16 0x822A +#define GR_GL_R16F 0x822D +#define GR_GL_R32F 0x822E + +/* Red integer sized formats */ +#define GR_GL_R8I 0x8231 +#define GR_GL_R8UI 0x8232 +#define GR_GL_R16I 0x8233 +#define GR_GL_R16UI 0x8234 +#define GR_GL_R32I 0x8235 +#define GR_GL_R32UI 0x8236 + +/* Luminance sized formats */ +#define GR_GL_LUMINANCE8 0x8040 +#define GR_GL_LUMINANCE8_ALPHA8 0x8045 +#define GR_GL_LUMINANCE16F 0x881E + +/* Alpha sized formats */ +#define GR_GL_ALPHA8 0x803C +#define GR_GL_ALPHA16 0x803E +#define GR_GL_ALPHA16F 0x881C +#define GR_GL_ALPHA32F 0x8816 + +/* Alpha integer sized formats */ +#define GR_GL_ALPHA8I 0x8D90 +#define GR_GL_ALPHA8UI 0x8D7E +#define GR_GL_ALPHA16I 0x8D8A +#define GR_GL_ALPHA16UI 0x8D78 +#define GR_GL_ALPHA32I 0x8D84 +#define GR_GL_ALPHA32UI 0x8D72 + +/* RG sized formats */ +#define GR_GL_RG8 0x822B +#define GR_GL_RG16 0x822C +#define GR_GL_R16F 0x822D +#define GR_GL_R32F 0x822E +#define GR_GL_RG16F 0x822F + +/* RG sized integer formats */ +#define GR_GL_RG8I 0x8237 +#define GR_GL_RG8UI 0x8238 +#define GR_GL_RG16I 0x8239 +#define GR_GL_RG16UI 0x823A +#define GR_GL_RG32I 0x823B +#define GR_GL_RG32UI 0x823C + +/* RGB sized formats */ +#define GR_GL_RGB5 0x8050 +#define GR_GL_RGB565 0x8D62 +#define GR_GL_RGB8 0x8051 +#define GR_GL_SRGB8 0x8C41 +#define GR_GL_RGBX8 0x96BA + +/* RGB integer sized formats */ +#define GR_GL_RGB8I 0x8D8F +#define GR_GL_RGB8UI 0x8D7D +#define GR_GL_RGB16I 0x8D89 +#define GR_GL_RGB16UI 0x8D77 +#define GR_GL_RGB32I 0x8D83 +#define GR_GL_RGB32UI 0x8D71 + +/* RGBA sized formats */ +#define GR_GL_RGBA4 0x8056 +#define GR_GL_RGB5_A1 0x8057 +#define GR_GL_RGBA8 0x8058 +#define GR_GL_RGB10_A2 0x8059 +#define GR_GL_SRGB8_ALPHA8 0x8C43 +#define GR_GL_RGBA16F 0x881A +#define GR_GL_RGBA32F 0x8814 +#define GR_GL_RG32F 0x8230 +#define GR_GL_RGBA16 0x805B + +/* RGBA integer sized formats */ +#define GR_GL_RGBA8I 0x8D8E +#define GR_GL_RGBA8UI 0x8D7C +#define GR_GL_RGBA16I 0x8D88 +#define GR_GL_RGBA16UI 0x8D76 +#define GR_GL_RGBA32I 0x8D82 +#define GR_GL_RGBA32UI 0x8D70 + +/* BGRA sized formats */ +#define GR_GL_BGRA8 0x93A1 + +/* PixelType */ +/* GL_UNSIGNED_BYTE */ +#define GR_GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GR_GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GR_GL_UNSIGNED_SHORT_5_6_5 0x8363 +#define GR_GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 + +/* Shaders */ +#define GR_GL_FRAGMENT_SHADER 0x8B30 +#define GR_GL_VERTEX_SHADER 0x8B31 +#define GR_GL_TESS_CONTROL_SHADER 0x8E88 +#define GR_GL_TESS_EVALUATION_SHADER 0x8E87 +#define GR_GL_MAX_VERTEX_ATTRIBS 0x8869 +#define GR_GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB +#define GR_GL_MAX_VARYING_VECTORS 0x8DFC +#define GR_GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D +#define GR_GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C +#define GR_GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 +#define GR_GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 +#define GR_GL_MAX_FRAGMENT_UNIFORM_VECTORS 0x8DFD +#define GR_GL_SHADER_TYPE 0x8B4F +#define GR_GL_DELETE_STATUS 0x8B80 +#define GR_GL_LINK_STATUS 0x8B82 +#define GR_GL_VALIDATE_STATUS 0x8B83 +#define GR_GL_ATTACHED_SHADERS 0x8B85 +#define GR_GL_ACTIVE_UNIFORMS 0x8B86 +#define GR_GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +#define GR_GL_ACTIVE_ATTRIBUTES 0x8B89 +#define GR_GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +#define GR_GL_SHADING_LANGUAGE_VERSION 0x8B8C +#define GR_GL_CURRENT_PROGRAM 0x8B8D +#define GR_GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 +#define GR_GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A +#define GR_GL_MAX_SHADER_PIXEL_LOCAL_STORAGE_FAST_SIZE 0x8F63 +#define GR_GL_SHADER_BINARY_FORMATS 0x8DF8 + +/* StencilFunction */ +#define GR_GL_NEVER 0x0200 +#define GR_GL_LESS 0x0201 +#define GR_GL_EQUAL 0x0202 +#define GR_GL_LEQUAL 0x0203 +#define GR_GL_GREATER 0x0204 +#define GR_GL_NOTEQUAL 0x0205 +#define GR_GL_GEQUAL 0x0206 +#define GR_GL_ALWAYS 0x0207 + +/* StencilOp */ +/* GL_ZERO */ +#define GR_GL_KEEP 0x1E00 +#define GR_GL_REPLACE 0x1E01 +#define GR_GL_INCR 0x1E02 +#define GR_GL_DECR 0x1E03 +#define GR_GL_INVERT 0x150A +#define GR_GL_INCR_WRAP 0x8507 +#define GR_GL_DECR_WRAP 0x8508 + +/* StringName */ +#define GR_GL_VENDOR 0x1F00 +#define GR_GL_RENDERER 0x1F01 +#define GR_GL_VERSION 0x1F02 +#define GR_GL_EXTENSIONS 0x1F03 + +/* StringCounts */ +#define GR_GL_NUM_EXTENSIONS 0x821D + +/* Pixel Mode / Transfer */ +#define GR_GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GR_GL_PACK_ROW_LENGTH 0x0D02 + + +/* TextureMagFilter */ +#define GR_GL_NEAREST 0x2600 +#define GR_GL_LINEAR 0x2601 + +/* TextureMinFilter */ +/* GL_NEAREST */ +/* GL_LINEAR */ +#define GR_GL_NEAREST_MIPMAP_NEAREST 0x2700 +#define GR_GL_LINEAR_MIPMAP_NEAREST 0x2701 +#define GR_GL_NEAREST_MIPMAP_LINEAR 0x2702 +#define GR_GL_LINEAR_MIPMAP_LINEAR 0x2703 + +/* TextureUsage */ +#define GR_GL_FRAMEBUFFER_ATTACHMENT 0x93A3 + +/* TextureParameterName */ +#define GR_GL_TEXTURE_MAG_FILTER 0x2800 +#define GR_GL_TEXTURE_MIN_FILTER 0x2801 +#define GR_GL_TEXTURE_WRAP_S 0x2802 +#define GR_GL_TEXTURE_WRAP_T 0x2803 +#define GR_GL_TEXTURE_USAGE 0x93A2 +#define GR_GL_TEXTURE_MAX_ANISOTROPY 0x84FE +#define GR_GL_MAX_TEXTURE_MAX_ANISOTROPY 0x84FF + +/* TextureTarget */ +/* GL_TEXTURE_2D */ +#define GR_GL_TEXTURE 0x1702 +#define GR_GL_TEXTURE_CUBE_MAP 0x8513 +#define GR_GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GR_GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GR_GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GR_GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GR_GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GR_GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GR_GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GR_GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C + +/* TextureUnit */ +#define GR_GL_TEXTURE0 0x84C0 +#define GR_GL_TEXTURE1 0x84C1 +#define GR_GL_TEXTURE2 0x84C2 +#define GR_GL_TEXTURE3 0x84C3 +#define GR_GL_TEXTURE4 0x84C4 +#define GR_GL_TEXTURE5 0x84C5 +#define GR_GL_TEXTURE6 0x84C6 +#define GR_GL_TEXTURE7 0x84C7 +#define GR_GL_TEXTURE8 0x84C8 +#define GR_GL_TEXTURE9 0x84C9 +#define GR_GL_TEXTURE10 0x84CA +#define GR_GL_TEXTURE11 0x84CB +#define GR_GL_TEXTURE12 0x84CC +#define GR_GL_TEXTURE13 0x84CD +#define GR_GL_TEXTURE14 0x84CE +#define GR_GL_TEXTURE15 0x84CF +#define GR_GL_TEXTURE16 0x84D0 +#define GR_GL_TEXTURE17 0x84D1 +#define GR_GL_TEXTURE18 0x84D2 +#define GR_GL_TEXTURE19 0x84D3 +#define GR_GL_TEXTURE20 0x84D4 +#define GR_GL_TEXTURE21 0x84D5 +#define GR_GL_TEXTURE22 0x84D6 +#define GR_GL_TEXTURE23 0x84D7 +#define GR_GL_TEXTURE24 0x84D8 +#define GR_GL_TEXTURE25 0x84D9 +#define GR_GL_TEXTURE26 0x84DA +#define GR_GL_TEXTURE27 0x84DB +#define GR_GL_TEXTURE28 0x84DC +#define GR_GL_TEXTURE29 0x84DD +#define GR_GL_TEXTURE30 0x84DE +#define GR_GL_TEXTURE31 0x84DF +#define GR_GL_ACTIVE_TEXTURE 0x84E0 +#define GR_GL_MAX_TEXTURE_UNITS 0x84E2 +#define GR_GL_MAX_TEXTURE_COORDS 0x8871 + +/* TextureWrapMode */ +#define GR_GL_REPEAT 0x2901 +#define GR_GL_CLAMP_TO_EDGE 0x812F +#define GR_GL_MIRRORED_REPEAT 0x8370 +#define GR_GL_CLAMP_TO_BORDER 0x812D + +/* Texture Swizzle */ +#define GR_GL_TEXTURE_SWIZZLE_R 0x8E42 +#define GR_GL_TEXTURE_SWIZZLE_G 0x8E43 +#define GR_GL_TEXTURE_SWIZZLE_B 0x8E44 +#define GR_GL_TEXTURE_SWIZZLE_A 0x8E45 +#define GR_GL_TEXTURE_SWIZZLE_RGBA 0x8E46 + +/* Texture mapping */ +#define GR_GL_TEXTURE_ENV 0x2300 +#define GR_GL_TEXTURE_ENV_MODE 0x2200 +#define GR_GL_TEXTURE_1D 0x0DE0 +/* GL_TEXTURE_2D */ +/* GL_TEXTURE_WRAP_S */ +/* GL_TEXTURE_WRAP_T */ +/* GL_TEXTURE_MAG_FILTER */ +/* GL_TEXTURE_MIN_FILTER */ +#define GR_GL_TEXTURE_ENV_COLOR 0x2201 +#define GR_GL_TEXTURE_GEN_S 0x0C60 +#define GR_GL_TEXTURE_GEN_T 0x0C61 +#define GR_GL_TEXTURE_GEN_R 0x0C62 +#define GR_GL_TEXTURE_GEN_Q 0x0C63 +#define GR_GL_TEXTURE_GEN_MODE 0x2500 +#define GR_GL_TEXTURE_BORDER_COLOR 0x1004 +#define GR_GL_TEXTURE_WIDTH 0x1000 +#define GR_GL_TEXTURE_HEIGHT 0x1001 +#define GR_GL_TEXTURE_BORDER 0x1005 +#define GR_GL_TEXTURE_COMPONENTS 0x1003 +#define GR_GL_TEXTURE_RED_SIZE 0x805C +#define GR_GL_TEXTURE_GREEN_SIZE 0x805D +#define GR_GL_TEXTURE_BLUE_SIZE 0x805E +#define GR_GL_TEXTURE_ALPHA_SIZE 0x805F +#define GR_GL_TEXTURE_LUMINANCE_SIZE 0x8060 +#define GR_GL_TEXTURE_INTENSITY_SIZE 0x8061 +#define GR_GL_TEXTURE_INTERNAL_FORMAT 0x1003 +/* GL_NEAREST_MIPMAP_NEAREST */ +/* GL_NEAREST_MIPMAP_LINEAR */ +/* GL_LINEAR_MIPMAP_NEAREST */ +/* GL_LINEAR_MIPMAP_LINEAR */ +#define GR_GL_OBJECT_LINEAR 0x2401 +#define GR_GL_OBJECT_PLANE 0x2501 +#define GR_GL_EYE_LINEAR 0x2400 +#define GR_GL_EYE_PLANE 0x2502 +#define GR_GL_SPHERE_MAP 0x2402 +#define GR_GL_DECAL 0x2101 +#define GR_GL_MODULATE 0x2100 +/* GL_NEAREST */ +/* GL_REPEAT */ +#define GR_GL_CLAMP 0x2900 +#define GR_GL_S 0x2000 +#define GR_GL_T 0x2001 +#define GR_GL_R 0x2002 +#define GR_GL_Q 0x2003 +#define GR_GL_TEXTURE_GEN_R 0x0C62 +#define GR_GL_TEXTURE_GEN_Q 0x0C63 + +/* texture_env_combine */ +#define GR_GL_COMBINE 0x8570 +#define GR_GL_COMBINE_RGB 0x8571 +#define GR_GL_COMBINE_ALPHA 0x8572 +#define GR_GL_SOURCE0_RGB 0x8580 +#define GR_GL_SOURCE1_RGB 0x8581 +#define GR_GL_SOURCE2_RGB 0x8582 +#define GR_GL_SOURCE0_ALPHA 0x8588 +#define GR_GL_SOURCE1_ALPHA 0x8589 +#define GR_GL_SOURCE2_ALPHA 0x858A +#define GR_GL_OPERAND0_RGB 0x8590 +#define GR_GL_OPERAND1_RGB 0x8591 +#define GR_GL_OPERAND2_RGB 0x8592 +#define GR_GL_OPERAND0_ALPHA 0x8598 +#define GR_GL_OPERAND1_ALPHA 0x8599 +#define GR_GL_OPERAND2_ALPHA 0x859A +#define GR_GL_RGB_SCALE 0x8573 +#define GR_GL_ADD_SIGNED 0x8574 +#define GR_GL_INTERPOLATE 0x8575 +#define GR_GL_SUBTRACT 0x84E7 +#define GR_GL_CONSTANT 0x8576 +#define GR_GL_PRIMARY_COLOR 0x8577 +#define GR_GL_PREVIOUS 0x8578 +#define GR_GL_SRC0_RGB 0x8580 +#define GR_GL_SRC1_RGB 0x8581 +#define GR_GL_SRC2_RGB 0x8582 +#define GR_GL_SRC0_ALPHA 0x8588 +#define GR_GL_SRC1_ALPHA 0x8589 +#define GR_GL_SRC2_ALPHA 0x858A + +/* Uniform Types */ +#define GR_GL_FLOAT_VEC2 0x8B50 +#define GR_GL_FLOAT_VEC3 0x8B51 +#define GR_GL_FLOAT_VEC4 0x8B52 +#define GR_GL_INT_VEC2 0x8B53 +#define GR_GL_INT_VEC3 0x8B54 +#define GR_GL_INT_VEC4 0x8B55 +#define GR_GL_BOOL 0x8B56 +#define GR_GL_BOOL_VEC2 0x8B57 +#define GR_GL_BOOL_VEC3 0x8B58 +#define GR_GL_BOOL_VEC4 0x8B59 +#define GR_GL_FLOAT_MAT2 0x8B5A +#define GR_GL_FLOAT_MAT3 0x8B5B +#define GR_GL_FLOAT_MAT4 0x8B5C +#define GR_GL_SAMPLER_2D 0x8B5E +#define GR_GL_SAMPLER_CUBE 0x8B60 + +/* Vertex Arrays */ +#define GR_GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 +#define GR_GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 +#define GR_GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 +#define GR_GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 +#define GR_GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A +#define GR_GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 +#define GR_GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F +#define GR_GL_VERTEX_ARRAY 0x8074 +#define GR_GL_NORMAL_ARRAY 0x8075 +#define GR_GL_COLOR_ARRAY 0x8076 +#define GR_GL_SECONDARY_COLOR_ARRAY 0x845E +#define GR_GL_INDEX_ARRAY 0x8077 +#define GR_GL_TEXTURE_COORD_ARRAY 0x8078 +#define GR_GL_EDGE_FLAG_ARRAY 0x8079 +#define GR_GL_VERTEX_ARRAY_SIZE 0x807A +#define GR_GL_VERTEX_ARRAY_TYPE 0x807B +#define GR_GL_VERTEX_ARRAY_STRIDE 0x807C +#define GR_GL_NORMAL_ARRAY_TYPE 0x807E +#define GR_GL_NORMAL_ARRAY_STRIDE 0x807F +#define GR_GL_COLOR_ARRAY_SIZE 0x8081 +#define GR_GL_COLOR_ARRAY_TYPE 0x8082 +#define GR_GL_COLOR_ARRAY_STRIDE 0x8083 +#define GR_GL_INDEX_ARRAY_TYPE 0x8085 +#define GR_GL_INDEX_ARRAY_STRIDE 0x8086 +#define GR_GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 +#define GR_GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 +#define GR_GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A +#define GR_GL_EDGE_FLAG_ARRAY_STRIDE 0x808C +#define GR_GL_VERTEX_ARRAY_POINTER 0x808E +#define GR_GL_NORMAL_ARRAY_POINTER 0x808F +#define GR_GL_COLOR_ARRAY_POINTER 0x8090 +#define GR_GL_INDEX_ARRAY_POINTER 0x8091 +#define GR_GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 +#define GR_GL_EDGE_FLAG_ARRAY_POINTER 0x8093 +#define GR_GL_V2F 0x2A20 +#define GR_GL_V3F 0x2A21 +#define GR_GL_C4UB_V2F 0x2A22 +#define GR_GL_C4UB_V3F 0x2A23 +#define GR_GL_C3F_V3F 0x2A24 +#define GR_GL_N3F_V3F 0x2A25 +#define GR_GL_C4F_N3F_V3F 0x2A26 +#define GR_GL_T2F_V3F 0x2A27 +#define GR_GL_T4F_V4F 0x2A28 +#define GR_GL_T2F_C4UB_V3F 0x2A29 +#define GR_GL_T2F_C3F_V3F 0x2A2A +#define GR_GL_T2F_N3F_V3F 0x2A2B +#define GR_GL_T2F_C4F_N3F_V3F 0x2A2C +#define GR_GL_T4F_C4F_N3F_V4F 0x2A2D +#define GR_GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 + +/* Buffer Object */ +#define GR_GL_READ_ONLY 0x88B8 +#define GR_GL_WRITE_ONLY 0x88B9 +#define GR_GL_READ_WRITE 0x88BA +#define GR_GL_BUFFER_MAPPED 0x88BC + +#define GR_GL_MAP_READ_BIT 0x0001 +#define GR_GL_MAP_WRITE_BIT 0x0002 +#define GR_GL_MAP_INVALIDATE_RANGE_BIT 0x0004 +#define GR_GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 +#define GR_GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 +#define GR_GL_MAP_UNSYNCHRONIZED_BIT 0x0020 + +/* Read Format */ +#define GR_GL_IMPLEMENTATION_COLOR_READ_TYPE 0x8B9A +#define GR_GL_IMPLEMENTATION_COLOR_READ_FORMAT 0x8B9B + +/* Shader Source */ +#define GR_GL_COMPILE_STATUS 0x8B81 +#define GR_GL_INFO_LOG_LENGTH 0x8B84 +#define GR_GL_SHADER_SOURCE_LENGTH 0x8B88 +#define GR_GL_SHADER_COMPILER 0x8DFA + +/* Shader Binary */ +#define GR_GL_SHADER_BINARY_FORMATS 0x8DF8 +#define GR_GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 + +/* Program Binary */ +#define GR_GL_NUM_PROGRAM_BINARY_FORMATS 0x87FE +#define GR_GL_PROGRAM_BINARY_FORMATS 0x87FF + +/* Shader Precision-Specified Types */ +#define GR_GL_LOW_FLOAT 0x8DF0 +#define GR_GL_MEDIUM_FLOAT 0x8DF1 +#define GR_GL_HIGH_FLOAT 0x8DF2 +#define GR_GL_LOW_INT 0x8DF3 +#define GR_GL_MEDIUM_INT 0x8DF4 +#define GR_GL_HIGH_INT 0x8DF5 + +/* Queries */ +#define GR_GL_QUERY_COUNTER_BITS 0x8864 +#define GR_GL_CURRENT_QUERY 0x8865 +#define GR_GL_QUERY_RESULT 0x8866 +#define GR_GL_QUERY_RESULT_AVAILABLE 0x8867 +#define GR_GL_SAMPLES_PASSED 0x8914 +#define GR_GL_ANY_SAMPLES_PASSED 0x8C2F +#define GR_GL_TIME_ELAPSED 0x88BF +#define GR_GL_TIMESTAMP 0x8E28 +#define GR_GL_PRIMITIVES_GENERATED 0x8C87 +#define GR_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 + + +/* Framebuffer Object. */ +#define GR_GL_FRAMEBUFFER 0x8D40 +#define GR_GL_READ_FRAMEBUFFER 0x8CA8 +#define GR_GL_DRAW_FRAMEBUFFER 0x8CA9 + +#define GR_GL_RENDERBUFFER 0x8D41 + +#define GR_GL_MAX_SAMPLES 0x8D57 +// GL_IMG_multisampled_render_to_texture uses a different value for GL_MAX_SAMPLES +#define GR_GL_MAX_SAMPLES_IMG 0x9135 + +#define GR_GL_RENDERBUFFER_WIDTH 0x8D42 +#define GR_GL_RENDERBUFFER_HEIGHT 0x8D43 +#define GR_GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 +#define GR_GL_RENDERBUFFER_RED_SIZE 0x8D50 +#define GR_GL_RENDERBUFFER_GREEN_SIZE 0x8D51 +#define GR_GL_RENDERBUFFER_BLUE_SIZE 0x8D52 +#define GR_GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 +#define GR_GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 +#define GR_GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 + +#define GR_GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 +#define GR_GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 + +#define GR_GL_COLOR_ATTACHMENT0 0x8CE0 +#define GR_GL_DEPTH_ATTACHMENT 0x8D00 +#define GR_GL_STENCIL_ATTACHMENT 0x8D20 + +// GL_EXT_discard_framebuffer +#define GR_GL_COLOR 0x1800 +#define GR_GL_DEPTH 0x1801 +#define GR_GL_STENCIL 0x1802 + +#define GR_GL_NONE 0 +#define GR_GL_FRAMEBUFFER_DEFAULT 0x8218 + +#define GR_GL_FRAMEBUFFER_COMPLETE 0x8CD5 +#define GR_GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 +#define GR_GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 +#define GR_GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS 0x8CD9 +#define GR_GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD + +#define GR_GL_FRAMEBUFFER_BINDING 0x8CA6 +#define GR_GL_RENDERBUFFER_BINDING 0x8CA7 +#define GR_GL_MAX_RENDERBUFFER_SIZE 0x84E8 + +#define GR_GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 + +/* Path Rendering */ +// commands +#define GR_GL_CLOSE_PATH 0x00 +#define GR_GL_MOVE_TO 0x02 +#define GR_GL_LINE_TO 0x04 +#define GR_GL_QUADRATIC_CURVE_TO 0x0A +#define GR_GL_CUBIC_CURVE_TO 0x0C +#define GR_GL_CONIC_CURVE_TO 0x1A + +// path parameters +#define GR_GL_PATH_STROKE_WIDTH 0x9075 +#define GR_GL_PATH_END_CAPS 0x9076 +#define GR_GL_PATH_JOIN_STYLE 0x9079 +#define GR_GL_PATH_MITER_LIMIT 0x907A +#define GR_GL_PATH_STROKE_BOUND 0x9086 + +// fill modes +#define GR_GL_COUNT_UP 0x9088 + +// cover mode +#define GR_GL_BOUNDING_BOX 0x908D +#define GR_GL_BOUNDING_BOX_OF_BOUNDING_BOXES 0x909C + +// transform type +#define GR_GL_TRANSLATE_X 0x908E +#define GR_GL_TRANSLATE_Y 0x908F +#define GR_GL_TRANSLATE_2D 0x9090 +#define GR_GL_TRANSPOSE_AFFINE_2D 0x9096 + +// cap/dash values +#define GR_GL_SQUARE 0x90A3 +#define GR_GL_ROUND 0x90A4 + +// join values +#define GR_GL_BEVEL 0x90A6 +#define GR_GL_MITER_REVERT 0x90A7 + +// glyph loading values +#define GR_GL_STANDARD_FONT_FORMAT 0x936C +#define GR_GL_FONT_GLYPHS_AVAILABLE 0x9368 + +// NV_path_rendering extension to ARB_program_interface_query: +// .. corresponds to the set of active input variables used by the fragment +// shader stage of (if a fragment stage exists). +#define GR_GL_FRAGMENT_INPUT 0x936D + +// NV_path_rendering extension to EXT_direct_state_access: +// [the matrix functions] must support the PATH_PROJECTION_NV and +// PATH_MODELVIEW_NV tokens for matrixMode. +#define GR_GL_PATH_PROJECTION 0x1701 +#define GR_GL_PATH_MODELVIEW 0x1700 + +/* ARM specific define for MSAA support on framebuffer fetch */ +#define GR_GL_FETCH_PER_SAMPLE 0x8F65 + +/* GL_KHR_debug */ +#define GR_GL_DEBUG_OUTPUT 0x92E0 +#define GR_GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 +#define GR_GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 +#define GR_GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 +#define GR_GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 +#define GR_GL_DEBUG_LOGGED_MESSAGES 0x9145 +#define GR_GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 +#define GR_GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GR_GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GR_GL_MAX_LABEL_LENGTH 0x82E8 +#define GR_GL_DEBUG_SOURCE_API 0x8246 +#define GR_GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 +#define GR_GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 +#define GR_GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 +#define GR_GL_DEBUG_SOURCE_APPLICATION 0x824A +#define GR_GL_DEBUG_SOURCE_OTHER 0x824B +#define GR_GL_DEBUG_TYPE_ERROR 0x824C +#define GR_GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D +#define GR_GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E +#define GR_GL_DEBUG_TYPE_PORTABILITY 0x824F +#define GR_GL_DEBUG_TYPE_PERFORMANCE 0x8250 +#define GR_GL_DEBUG_TYPE_OTHER 0x8251 +#define GR_GL_DEBUG_TYPE_MARKER 0x8268 +#define GR_GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GR_GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GR_GL_DEBUG_SEVERITY_HIGH 0x9146 +#define GR_GL_DEBUG_SEVERITY_MEDIUM 0x9147 +#define GR_GL_DEBUG_SEVERITY_LOW 0x9148 +#define GR_GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GR_GL_STACK_UNDERFLOW 0x0504 +#define GR_GL_STACK_OVERFLOW 0x0503 +#define GR_GL_BUFFER 0x82E0 +#define GR_GL_SHADER 0x82E1 +#define GR_GL_PROGRAM 0x82E2 +#define GR_GL_QUERY 0x82E3 +#define GR_GL_PROGRAM_PIPELINE 0x82E4 +#define GR_GL_SAMPLER 0x82E6 + +/* GL_OES_EGL_image_external */ +#define GR_GL_TEXTURE_EXTERNAL 0x8D65 +#define GR_GL_TEXTURE_BINDING_EXTERNAL 0x8D67 + +/* GL_ARB_texture_rectangle or GL_ANGLE_texture_rectangle */ +#define GR_GL_TEXTURE_RECTANGLE 0x84F5 +#define GR_GL_TEXTURE_BINDING_RECTANGLE 0x84F6 + +/* GL_EXT_window_rectangles */ +#define GR_GL_MAX_WINDOW_RECTANGLES 0x8f14 +#define GR_GL_INCLUSIVE 0x8f10 +#define GR_GL_EXCLUSIVE 0x8f11 + +/** GL_QCOM_tiled_rendering */ +#define GR_GL_COLOR_BUFFER_BIT0 0x00000001 +#define GR_GL_COLOR_BUFFER_BIT1 0x00000002 +#define GR_GL_COLOR_BUFFER_BIT2 0x00000004 +#define GR_GL_COLOR_BUFFER_BIT3 0x00000008 +#define GR_GL_COLOR_BUFFER_BIT4 0x00000010 +#define GR_GL_COLOR_BUFFER_BIT5 0x00000020 +#define GR_GL_COLOR_BUFFER_BIT6 0x00000040 +#define GR_GL_COLOR_BUFFER_BIT7 0x00000080 +#define GR_GL_DEPTH_BUFFER_BIT0 0x00000100 +#define GR_GL_DEPTH_BUFFER_BIT1 0x00000200 +#define GR_GL_DEPTH_BUFFER_BIT2 0x00000400 +#define GR_GL_DEPTH_BUFFER_BIT3 0x00000800 +#define GR_GL_DEPTH_BUFFER_BIT4 0x00001000 +#define GR_GL_DEPTH_BUFFER_BIT5 0x00002000 +#define GR_GL_DEPTH_BUFFER_BIT6 0x00004000 +#define GR_GL_DEPTH_BUFFER_BIT7 0x00008000 +#define GR_GL_STENCIL_BUFFER_BIT0 0x00010000 +#define GR_GL_STENCIL_BUFFER_BIT1 0x00020000 +#define GR_GL_STENCIL_BUFFER_BIT2 0x00040000 +#define GR_GL_STENCIL_BUFFER_BIT3 0x00080000 +#define GR_GL_STENCIL_BUFFER_BIT4 0x00100000 +#define GR_GL_STENCIL_BUFFER_BIT5 0x00200000 +#define GR_GL_STENCIL_BUFFER_BIT6 0x00400000 +#define GR_GL_STENCIL_BUFFER_BIT7 0x00800000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT0 0x01000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT1 0x02000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT2 0x04000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT3 0x08000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT4 0x10000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT5 0x20000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT6 0x40000000 +#define GR_GL_MULTISAMPLE_BUFFER_BIT7 0x80000000 + +/* GL_ARB_sync */ +#define GR_GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 +#define GR_GL_ALREADY_SIGNALED 0x911A +#define GR_GL_TIMEOUT_EXPIRED 0x911B +#define GR_GL_CONDITION_SATISFIED 0x911C +#define GR_GL_WAIT_FAILED 0x911D +#define GR_GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 +#define GR_GL_TIMEOUT_IGNORED 0xFFFFFFFFFFFFFFFFull + +/* GL_EXT_geometry_shader */ +#define GR_GL_LINES_ADJACENCY 0x000A + +#define GR_GL_PATCH_VERTICES 0x8E72 + +/* GL_ARB_internalformat_query */ +#define GR_GL_NUM_SAMPLE_COUNTS 0x9380 + +/* EGL Defines */ +#define GR_EGL_NO_DISPLAY ((GrEGLDisplay)nullptr) +#define GR_EGL_EXTENSIONS 0x3055 +#define GR_EGL_GL_TEXTURE_2D 0x30B1 +#define GR_EGL_GL_TEXTURE_LEVEL 0x30BC +#define GR_EGL_IMAGE_PRESERVED 0x30D2 +#define GR_EGL_FALSE 0x0 +#define GR_EGL_TRUE 0x1 +#define GR_EGL_NONE 0x3038 +#define GR_EGL_NO_IMAGE ((GrEGLImage)nullptr) + +/* Programs */ +#define GR_GL_PROGRAM_BINARY_RETRIEVABLE_HINT 0x8257 +#define GL_PROGRAM_BINARY_LENGTH 0x8741 + +/* GL_NV_conservative_raster */ +#define GR_GL_CONSERVATIVE_RASTERIZATION 0x9346 + +/* Barriers */ +#define GR_GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT 0x0001 +#define GR_GL_ELEMENT_ARRAY_BARRIER_BIT 0x0002 +#define GR_GL_UNIFORM_BARRIER_BIT 0x0004 +#define GR_GL_TEXTURE_FETCH_BARRIER_BIT 0x0008 +#define GR_GL_SHADER_IMAGE_ACCESS_BARRIER_BIT 0x0020 +#define GR_GL_COMMAND_BARRIER_BIT 0x0040 +#define GR_GL_PIXEL_BUFFER_BARRIER_BIT 0x0080 +#define GR_GL_TEXTURE_UPDATE_BARRIER_BIT 0x0100 +#define GR_GL_BUFFER_UPDATE_BARRIER_BIT 0x0200 +#define GR_GL_FRAMEBUFFER_BARRIER_BIT 0x0400 +#define GR_GL_TRANSFORM_FEEDBACK_BARRIER_BIT 0x0800 +#define GR_GL_ATOMIC_COUNTER_BARRIER_BIT 0x1000 +#define GR_GL_ALL_BARRIER_BITS 0xffffffff + +/** GL_NV_fence_sync */ +#define GR_GL_ALL_COMPLETED 0x84F2 + +/* Tessellation */ +#define GR_GL_MAX_TESS_GEN_LEVEL_OES 0x8E7E + +#endif diff --git a/src/gpu/gl/GrGLExtensions.cpp b/src/gpu/ganesh/gl/GrGLExtensions.cpp similarity index 98% rename from src/gpu/gl/GrGLExtensions.cpp rename to src/gpu/ganesh/gl/GrGLExtensions.cpp index 63156f5d55..8a2259587f 100644 --- a/src/gpu/gl/GrGLExtensions.cpp +++ b/src/gpu/ganesh/gl/GrGLExtensions.cpp @@ -6,8 +6,8 @@ */ #include "include/gpu/gl/GrGLExtensions.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "src/core/SkTSearch.h" #include "src/core/SkTSort.h" diff --git a/src/gpu/gl/GrGLGLSL.cpp b/src/gpu/ganesh/gl/GrGLGLSL.cpp similarity index 97% rename from src/gpu/gl/GrGLGLSL.cpp rename to src/gpu/ganesh/gl/GrGLGLSL.cpp index bfd30e9153..5f4f16b3c8 100644 --- a/src/gpu/gl/GrGLGLSL.cpp +++ b/src/gpu/ganesh/gl/GrGLGLSL.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLGLSL.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLGLSL.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" bool GrGLGetGLSLGeneration(const GrGLDriverInfo& info, SkSL::GLSLGeneration* generation) { SkASSERT(generation); diff --git a/src/gpu/gl/GrGLGLSL.h b/src/gpu/ganesh/gl/GrGLGLSL.h similarity index 90% rename from src/gpu/gl/GrGLGLSL.h rename to src/gpu/ganesh/gl/GrGLGLSL.h index 9dc50f6017..1542fff4b7 100644 --- a/src/gpu/gl/GrGLGLSL.h +++ b/src/gpu/ganesh/gl/GrGLGLSL.h @@ -8,7 +8,7 @@ #ifndef GrGLGLSL_DEFINED #define GrGLGLSL_DEFINED -#include "src/gpu/glsl/GrGLSL.h" +#include "src/gpu/ganesh/glsl/GrGLSL.h" struct GrGLDriverInfo; diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/ganesh/gl/GrGLGpu.cpp similarity index 99% rename from src/gpu/gl/GrGLGpu.cpp rename to src/gpu/ganesh/gl/GrGLGpu.cpp index 3528b56b06..ca13d020e8 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/ganesh/gl/GrGLGpu.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #include "include/core/SkColorSpace.h" #include "include/core/SkPixmap.h" @@ -23,24 +23,24 @@ #include "src/core/SkMipmap.h" #include "src/core/SkScopeExit.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrCpuBuffer.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/gl/GrGLAttachment.h" -#include "src/gpu/gl/GrGLBuffer.h" -#include "src/gpu/gl/GrGLOpsRenderPass.h" -#include "src/gpu/gl/GrGLSemaphore.h" -#include "src/gpu/gl/GrGLTextureRenderTarget.h" -#include "src/gpu/gl/builders/GrGLShaderStringBuilder.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrCpuBuffer.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/gl/GrGLAttachment.h" +#include "src/gpu/ganesh/gl/GrGLBuffer.h" +#include "src/gpu/ganesh/gl/GrGLOpsRenderPass.h" +#include "src/gpu/ganesh/gl/GrGLSemaphore.h" +#include "src/gpu/ganesh/gl/GrGLTextureRenderTarget.h" +#include "src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h" #include "src/sksl/SkSLCompiler.h" #include diff --git a/src/gpu/gl/GrGLGpu.h b/src/gpu/ganesh/gl/GrGLGpu.h similarity index 98% rename from src/gpu/gl/GrGLGpu.h rename to src/gpu/ganesh/gl/GrGLGpu.h index 96c825b1c6..414a168d15 100644 --- a/src/gpu/gl/GrGLGpu.h +++ b/src/gpu/ganesh/gl/GrGLGpu.h @@ -11,19 +11,19 @@ #include "include/core/SkTypes.h" #include "include/private/SkTArray.h" #include "src/core/SkLRUCache.h" -#include "src/gpu/GrFinishCallbacks.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrNativeRect.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/GrWindowRectsState.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/gl/GrGLAttachment.h" -#include "src/gpu/gl/GrGLContext.h" -#include "src/gpu/gl/GrGLProgram.h" -#include "src/gpu/gl/GrGLRenderTarget.h" -#include "src/gpu/gl/GrGLTexture.h" -#include "src/gpu/gl/GrGLVertexArray.h" +#include "src/gpu/ganesh/GrFinishCallbacks.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrNativeRect.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/GrWindowRectsState.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/gl/GrGLAttachment.h" +#include "src/gpu/ganesh/gl/GrGLContext.h" +#include "src/gpu/ganesh/gl/GrGLProgram.h" +#include "src/gpu/ganesh/gl/GrGLRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" +#include "src/gpu/ganesh/gl/GrGLVertexArray.h" class GrGLBuffer; class GrGLOpsRenderPass; diff --git a/src/gpu/gl/GrGLGpuProgramCache.cpp b/src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp similarity index 94% rename from src/gpu/gl/GrGLGpuProgramCache.cpp rename to src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp index dbdac14e1c..460d90ed2c 100644 --- a/src/gpu/gl/GrGLGpuProgramCache.cpp +++ b/src/gpu/ganesh/gl/GrGLGpuProgramCache.cpp @@ -7,15 +7,15 @@ #include -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/gl/builders/GrGLProgramBuilder.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h" struct GrGLGpu::ProgramCache::Entry { Entry(sk_sp program) diff --git a/src/gpu/gl/GrGLInterfaceAutogen.cpp b/src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp similarity index 99% rename from src/gpu/gl/GrGLInterfaceAutogen.cpp rename to src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp index cedd33cc14..38c1aa8182 100644 --- a/src/gpu/gl/GrGLInterfaceAutogen.cpp +++ b/src/gpu/ganesh/gl/GrGLInterfaceAutogen.cpp @@ -11,7 +11,7 @@ #include "include/gpu/gl/GrGLExtensions.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include diff --git a/src/gpu/gl/GrGLMakeNativeInterface_none.cpp b/src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp similarity index 100% rename from src/gpu/gl/GrGLMakeNativeInterface_none.cpp rename to src/gpu/ganesh/gl/GrGLMakeNativeInterface_none.cpp diff --git a/src/gpu/gl/GrGLOpsRenderPass.cpp b/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp similarity index 99% rename from src/gpu/gl/GrGLOpsRenderPass.cpp rename to src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp index 1c0f852d6a..10e9e71231 100644 --- a/src/gpu/gl/GrGLOpsRenderPass.cpp +++ b/src/gpu/ganesh/gl/GrGLOpsRenderPass.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLOpsRenderPass.h" +#include "src/gpu/ganesh/gl/GrGLOpsRenderPass.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTarget.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #endif #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) diff --git a/src/gpu/gl/GrGLOpsRenderPass.h b/src/gpu/ganesh/gl/GrGLOpsRenderPass.h similarity index 96% rename from src/gpu/gl/GrGLOpsRenderPass.h rename to src/gpu/ganesh/gl/GrGLOpsRenderPass.h index 15fed21255..474204f008 100644 --- a/src/gpu/gl/GrGLOpsRenderPass.h +++ b/src/gpu/ganesh/gl/GrGLOpsRenderPass.h @@ -8,11 +8,11 @@ #ifndef GrGLOpsRenderPass_DEFINED #define GrGLOpsRenderPass_DEFINED -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLRenderTarget.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLRenderTarget.h" class GrGLGpu; class GrGLRenderTarget; diff --git a/src/gpu/gl/GrGLProgram.cpp b/src/gpu/ganesh/gl/GrGLProgram.cpp similarity index 94% rename from src/gpu/gl/GrGLProgram.cpp rename to src/gpu/ganesh/gl/GrGLProgram.cpp index 678edeeabc..d2ccfe6c24 100644 --- a/src/gpu/gl/GrGLProgram.cpp +++ b/src/gpu/ganesh/gl/GrGLProgram.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLProgram.h" +#include "src/gpu/ganesh/gl/GrGLProgram.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/gl/GrGLBuffer.h" -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/gl/GrGLBuffer.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #include "src/sksl/SkSLCompiler.h" #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/ganesh/gl/GrGLProgram.h similarity index 94% rename from src/gpu/gl/GrGLProgram.h rename to src/gpu/ganesh/gl/GrGLProgram.h index 1ee9160370..9f2fd95f83 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/ganesh/gl/GrGLProgram.h @@ -9,12 +9,12 @@ #ifndef GrGLProgram_DEFINED #define GrGLProgram_DEFINED -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/gl/GrGLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/gl/GrGLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include diff --git a/src/gpu/gl/GrGLProgramDataManager.cpp b/src/gpu/ganesh/gl/GrGLProgramDataManager.cpp similarity index 98% rename from src/gpu/gl/GrGLProgramDataManager.cpp rename to src/gpu/ganesh/gl/GrGLProgramDataManager.cpp index f3fa7b78af..39bbea14c1 100644 --- a/src/gpu/gl/GrGLProgramDataManager.cpp +++ b/src/gpu/ganesh/gl/GrGLProgramDataManager.cpp @@ -6,9 +6,9 @@ */ #include "include/core/SkMatrix.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \ SkASSERT((COUNT) <= (UNI).fArrayCount || \ diff --git a/src/gpu/gl/GrGLProgramDataManager.h b/src/gpu/ganesh/gl/GrGLProgramDataManager.h similarity index 96% rename from src/gpu/gl/GrGLProgramDataManager.h rename to src/gpu/ganesh/gl/GrGLProgramDataManager.h index 69701a2186..59375b1ce8 100644 --- a/src/gpu/gl/GrGLProgramDataManager.h +++ b/src/gpu/ganesh/gl/GrGLProgramDataManager.h @@ -10,9 +10,9 @@ #include "include/gpu/gl/GrGLTypes.h" #include "src/core/SkTBlockList.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include "include/private/SkTArray.h" diff --git a/src/gpu/gl/GrGLRenderTarget.cpp b/src/gpu/ganesh/gl/GrGLRenderTarget.cpp similarity index 98% rename from src/gpu/gl/GrGLRenderTarget.cpp rename to src/gpu/ganesh/gl/GrGLRenderTarget.cpp index 73a99af178..d5d655c700 100644 --- a/src/gpu/gl/GrGLRenderTarget.cpp +++ b/src/gpu/ganesh/gl/GrGLRenderTarget.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLRenderTarget.h" #include "include/core/SkTraceMemoryDump.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #define GPUGL static_cast(this->getGpu()) #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/ganesh/gl/GrGLRenderTarget.h similarity index 98% rename from src/gpu/gl/GrGLRenderTarget.h rename to src/gpu/ganesh/gl/GrGLRenderTarget.h index 64f396fe3d..36474b252e 100644 --- a/src/gpu/gl/GrGLRenderTarget.h +++ b/src/gpu/ganesh/gl/GrGLRenderTarget.h @@ -11,8 +11,8 @@ #include "include/core/SkScalar.h" #include "include/gpu/GrBackendSurface.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" class GrGLCaps; class GrGLGpu; diff --git a/src/gpu/gl/GrGLSemaphore.cpp b/src/gpu/ganesh/gl/GrGLSemaphore.cpp similarity index 81% rename from src/gpu/gl/GrGLSemaphore.cpp rename to src/gpu/ganesh/gl/GrGLSemaphore.cpp index 32fd636795..a6346e9f79 100644 --- a/src/gpu/gl/GrGLSemaphore.cpp +++ b/src/gpu/ganesh/gl/GrGLSemaphore.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLSemaphore.h" +#include "src/gpu/ganesh/gl/GrGLSemaphore.h" -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" GrGLSemaphore::GrGLSemaphore(GrGLGpu* gpu, bool isOwned) : fGpu(gpu), fSync(nullptr), fIsOwned(isOwned) { diff --git a/src/gpu/gl/GrGLSemaphore.h b/src/gpu/ganesh/gl/GrGLSemaphore.h similarity index 97% rename from src/gpu/gl/GrGLSemaphore.h rename to src/gpu/ganesh/gl/GrGLSemaphore.h index bbfcce6ee1..1fcf9a5c95 100644 --- a/src/gpu/gl/GrGLSemaphore.h +++ b/src/gpu/ganesh/gl/GrGLSemaphore.h @@ -10,7 +10,7 @@ #include "include/gpu/GrBackendSemaphore.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrSemaphore.h" +#include "src/gpu/ganesh/GrSemaphore.h" class GrGLGpu; diff --git a/src/gpu/gl/GrGLTexture.cpp b/src/gpu/ganesh/gl/GrGLTexture.cpp similarity index 97% rename from src/gpu/gl/GrGLTexture.cpp rename to src/gpu/ganesh/gl/GrGLTexture.cpp index fc0f92a97f..aa4166e6d0 100644 --- a/src/gpu/gl/GrGLTexture.cpp +++ b/src/gpu/ganesh/gl/GrGLTexture.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLTexture.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" #include "include/core/SkTraceMemoryDump.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #define GPUGL static_cast(this->getGpu()) #define GL_CALL(X) GR_GL_CALL(GPUGL->glInterface(), X) diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/ganesh/gl/GrGLTexture.h similarity index 96% rename from src/gpu/gl/GrGLTexture.h rename to src/gpu/ganesh/gl/GrGLTexture.h index 3506adb7a6..1ef9381dcf 100644 --- a/src/gpu/gl/GrGLTexture.h +++ b/src/gpu/ganesh/gl/GrGLTexture.h @@ -10,9 +10,9 @@ #define GrGLTexture_DEFINED #include "include/private/GrGLTypesPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" class GrGLGpu; diff --git a/src/gpu/gl/GrGLTextureRenderTarget.cpp b/src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp similarity index 95% rename from src/gpu/gl/GrGLTextureRenderTarget.cpp rename to src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp index db870c4186..1195db8b02 100644 --- a/src/gpu/gl/GrGLTextureRenderTarget.cpp +++ b/src/gpu/ganesh/gl/GrGLTextureRenderTarget.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLTextureRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLTextureRenderTarget.h" #include "include/core/SkTraceMemoryDump.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" GrGLTextureRenderTarget::GrGLTextureRenderTarget(GrGLGpu* gpu, SkBudgeted budgeted, diff --git a/src/gpu/gl/GrGLTextureRenderTarget.h b/src/gpu/ganesh/gl/GrGLTextureRenderTarget.h similarity index 96% rename from src/gpu/gl/GrGLTextureRenderTarget.h rename to src/gpu/ganesh/gl/GrGLTextureRenderTarget.h index dad9f2c0f4..c1925fa083 100644 --- a/src/gpu/gl/GrGLTextureRenderTarget.h +++ b/src/gpu/ganesh/gl/GrGLTextureRenderTarget.h @@ -9,8 +9,8 @@ #ifndef GrGLTextureRenderTarget_DEFINED #define GrGLTextureRenderTarget_DEFINED -#include "src/gpu/gl/GrGLRenderTarget.h" -#include "src/gpu/gl/GrGLTexture.h" +#include "src/gpu/ganesh/gl/GrGLRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" class GrGLGpu; diff --git a/src/gpu/gl/GrGLTypesPriv.cpp b/src/gpu/ganesh/gl/GrGLTypesPriv.cpp similarity index 98% rename from src/gpu/gl/GrGLTypesPriv.cpp rename to src/gpu/ganesh/gl/GrGLTypesPriv.cpp index 182a44d4ee..b2c32a5f0d 100644 --- a/src/gpu/gl/GrGLTypesPriv.cpp +++ b/src/gpu/ganesh/gl/GrGLTypesPriv.cpp @@ -8,7 +8,7 @@ #include "include/core/SkScalar.h" #include "include/private/GrGLTypesPriv.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" GrGLTextureParameters::SamplerOverriddenState::SamplerOverriddenState() // These are the OpenGL defaults. diff --git a/src/gpu/gl/GrGLUniformHandler.cpp b/src/gpu/ganesh/gl/GrGLUniformHandler.cpp similarity index 95% rename from src/gpu/gl/GrGLUniformHandler.cpp rename to src/gpu/ganesh/gl/GrGLUniformHandler.cpp index c9e629017e..67bdc5b94f 100644 --- a/src/gpu/gl/GrGLUniformHandler.cpp +++ b/src/gpu/ganesh/gl/GrGLUniformHandler.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLUniformHandler.h" +#include "src/gpu/ganesh/gl/GrGLUniformHandler.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/gl/GrGLCaps.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/builders/GrGLProgramBuilder.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h" #include "src/sksl/SkSLCompiler.h" #define GL_CALL(X) GR_GL_CALL(this->glGpu()->glInterface(), X) diff --git a/src/gpu/gl/GrGLUniformHandler.h b/src/gpu/ganesh/gl/GrGLUniformHandler.h similarity index 96% rename from src/gpu/gl/GrGLUniformHandler.h rename to src/gpu/ganesh/gl/GrGLUniformHandler.h index b9a1564235..9622c7ab84 100644 --- a/src/gpu/gl/GrGLUniformHandler.h +++ b/src/gpu/ganesh/gl/GrGLUniformHandler.h @@ -8,8 +8,8 @@ #ifndef GrGLUniformHandler_DEFINED #define GrGLUniformHandler_DEFINED -#include "src/gpu/gl/GrGLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/gl/GrGLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include diff --git a/src/gpu/gl/GrGLUtil.cpp b/src/gpu/ganesh/gl/GrGLUtil.cpp similarity index 99% rename from src/gpu/gl/GrGLUtil.cpp rename to src/gpu/ganesh/gl/GrGLUtil.cpp index 03996aad5e..5dfd7d94c9 100644 --- a/src/gpu/gl/GrGLUtil.cpp +++ b/src/gpu/ganesh/gl/GrGLUtil.cpp @@ -8,8 +8,8 @@ #include "include/core/SkMatrix.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include /////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/gl/GrGLUtil.h b/src/gpu/ganesh/gl/GrGLUtil.h similarity index 99% rename from src/gpu/gl/GrGLUtil.h rename to src/gpu/ganesh/gl/GrGLUtil.h index c73eb87daa..5e01f4b6ae 100644 --- a/src/gpu/gl/GrGLUtil.h +++ b/src/gpu/ganesh/gl/GrGLUtil.h @@ -11,9 +11,9 @@ #include "include/gpu/gl/GrGLInterface.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkImageInfoPriv.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" class SkMatrix; diff --git a/src/gpu/gl/GrGLVaryingHandler.h b/src/gpu/ganesh/gl/GrGLVaryingHandler.h similarity index 84% rename from src/gpu/gl/GrGLVaryingHandler.h rename to src/gpu/ganesh/gl/GrGLVaryingHandler.h index 3e98c0ce77..49e2740c33 100644 --- a/src/gpu/gl/GrGLVaryingHandler.h +++ b/src/gpu/ganesh/gl/GrGLVaryingHandler.h @@ -9,8 +9,8 @@ #define GrGLVaryingHandler_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/gl/GrGLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/gl/GrGLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" class GrGLVaryingHandler : public GrGLSLVaryingHandler { public: diff --git a/src/gpu/gl/GrGLVertexArray.cpp b/src/gpu/ganesh/gl/GrGLVertexArray.cpp similarity index 98% rename from src/gpu/gl/GrGLVertexArray.cpp rename to src/gpu/ganesh/gl/GrGLVertexArray.cpp index bbe74251e0..be437224c0 100644 --- a/src/gpu/gl/GrGLVertexArray.cpp +++ b/src/gpu/ganesh/gl/GrGLVertexArray.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/GrCpuBuffer.h" -#include "src/gpu/gl/GrGLBuffer.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLVertexArray.h" +#include "src/gpu/ganesh/GrCpuBuffer.h" +#include "src/gpu/ganesh/gl/GrGLBuffer.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLVertexArray.h" struct AttribLayout { bool fNormalized; // Only used by floating point types. diff --git a/src/gpu/gl/GrGLVertexArray.h b/src/gpu/ganesh/gl/GrGLVertexArray.h similarity index 97% rename from src/gpu/gl/GrGLVertexArray.h rename to src/gpu/ganesh/gl/GrGLVertexArray.h index febc679310..3be5bc0d54 100644 --- a/src/gpu/gl/GrGLVertexArray.h +++ b/src/gpu/ganesh/gl/GrGLVertexArray.h @@ -11,8 +11,8 @@ #include "include/gpu/gl/GrGLTypes.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkTArray.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" class GrBuffer; class GrGLGpu; diff --git a/src/gpu/gl/android/BUILD.bazel b/src/gpu/ganesh/gl/android/BUILD.bazel similarity index 64% rename from src/gpu/gl/android/BUILD.bazel rename to src/gpu/ganesh/gl/android/BUILD.bazel index 9a088f226f..1123f97661 100644 --- a/src/gpu/gl/android/BUILD.bazel +++ b/src/gpu/ganesh/gl/android/BUILD.bazel @@ -5,7 +5,7 @@ generated_cc_atom( srcs = ["GrGLMakeNativeInterface_android.cpp"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu/gl/egl:GrGLMakeEGLInterface_src", - "//src/gpu/gl/egl:GrGLMakeNativeInterface_egl_src", + "//src/gpu/ganesh/gl/egl:GrGLMakeEGLInterface_src", + "//src/gpu/ganesh/gl/egl:GrGLMakeNativeInterface_egl_src", ], ) diff --git a/src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp b/src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp similarity index 53% rename from src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp rename to src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp index 50c0113dd4..484558ebf9 100644 --- a/src/gpu/gl/android/GrGLMakeNativeInterface_android.cpp +++ b/src/gpu/ganesh/gl/android/GrGLMakeNativeInterface_android.cpp @@ -4,5 +4,5 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "src/gpu/gl/egl/GrGLMakeEGLInterface.cpp" -#include "src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp" +#include "src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp" +#include "src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp" diff --git a/src/gpu/gl/builders/BUILD.bazel b/src/gpu/ganesh/gl/builders/BUILD.bazel similarity index 60% rename from src/gpu/gl/builders/BUILD.bazel rename to src/gpu/ganesh/gl/builders/BUILD.bazel index b4a5c0a4d4..b8e743f665 100644 --- a/src/gpu/gl/builders/BUILD.bazel +++ b/src/gpu/ganesh/gl/builders/BUILD.bazel @@ -6,13 +6,13 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu:GrContextOptions_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu/gl:GrGLProgramDataManager_hdr", - "//src/gpu/gl:GrGLProgram_hdr", - "//src/gpu/gl:GrGLUniformHandler_hdr", - "//src/gpu/gl:GrGLVaryingHandler_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh/gl:GrGLProgramDataManager_hdr", + "//src/gpu/ganesh/gl:GrGLProgram_hdr", + "//src/gpu/ganesh/gl:GrGLUniformHandler_hdr", + "//src/gpu/ganesh/gl:GrGLVaryingHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", "//src/sksl/ir:SkSLProgram_hdr", ], ) @@ -30,18 +30,18 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkTraceEvent_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrAutoLocaleSetter_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrPersistentCacheUtils_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrXferProcessor_hdr", "//src/gpu:Swizzle_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLProgram_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh:GrAutoLocaleSetter_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrPersistentCacheUtils_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLProgram_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", "//src/utils:SkShaderUtils_hdr", ], ) @@ -53,8 +53,8 @@ generated_cc_atom( deps = [ "//include/core:SkTypes_hdr", "//include/gpu:GrContextOptions_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu/gl:GrGLContext_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh/gl:GrGLContext_hdr", "//src/sksl/codegen:SkSLGLSLCodeGenerator_hdr", ], ) @@ -67,7 +67,7 @@ generated_cc_atom( ":GrGLShaderStringBuilder_hdr", "//src/core:SkAutoMalloc_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl/codegen:SkSLGLSLCodeGenerator_hdr", "//src/sksl/ir:SkSLProgram_hdr", diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp similarity index 97% rename from src/gpu/gl/builders/GrGLProgramBuilder.cpp rename to src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp index f5e0a78596..d82c85c1ad 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/builders/GrGLProgramBuilder.h" +#include "src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkATrace.h" @@ -13,23 +13,23 @@ #include "src/core/SkReadBuffer.h" #include "src/core/SkTraceEvent.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPersistentCacheUtils.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLProgram.h" -#include "src/gpu/gl/builders/GrGLProgramBuilder.h" +#include "src/gpu/ganesh/GrAutoLocaleSetter.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLProgram.h" +#include "src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h" #include "src/utils/SkShaderUtils.h" #include -#include "src/gpu/gl/builders/GrGLShaderStringBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X) diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.h b/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h similarity index 91% rename from src/gpu/gl/builders/GrGLProgramBuilder.h rename to src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h index b73054b4c7..fcdb5d4a60 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.h +++ b/src/gpu/ganesh/gl/builders/GrGLProgramBuilder.h @@ -9,13 +9,13 @@ #define GrGLProgramBuilder_DEFINED #include "include/gpu/GrContextOptions.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/gl/GrGLProgram.h" -#include "src/gpu/gl/GrGLProgramDataManager.h" -#include "src/gpu/gl/GrGLUniformHandler.h" -#include "src/gpu/gl/GrGLVaryingHandler.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/gl/GrGLProgram.h" +#include "src/gpu/ganesh/gl/GrGLProgramDataManager.h" +#include "src/gpu/ganesh/gl/GrGLUniformHandler.h" +#include "src/gpu/ganesh/gl/GrGLVaryingHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" #include "src/sksl/ir/SkSLProgram.h" class GrFragmentProcessor; diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp b/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp similarity index 97% rename from src/gpu/gl/builders/GrGLShaderStringBuilder.cpp rename to src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp index 515cc3085f..a275cd9ee9 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.cpp +++ b/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.cpp @@ -7,8 +7,8 @@ #include "src/core/SkAutoMalloc.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/builders/GrGLShaderStringBuilder.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/codegen/SkSLGLSLCodeGenerator.h" #include "src/sksl/ir/SkSLProgram.h" diff --git a/src/gpu/gl/builders/GrGLShaderStringBuilder.h b/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h similarity index 94% rename from src/gpu/gl/builders/GrGLShaderStringBuilder.h rename to src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h index 275236b897..73e637fe1c 100644 --- a/src/gpu/gl/builders/GrGLShaderStringBuilder.h +++ b/src/gpu/ganesh/gl/builders/GrGLShaderStringBuilder.h @@ -10,8 +10,8 @@ #include "include/core/SkTypes.h" #include "include/gpu/GrContextOptions.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/gl/GrGLContext.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/gl/GrGLContext.h" #include "src/sksl/codegen/SkSLGLSLCodeGenerator.h" std::unique_ptr GrSkSLtoGLSL(const GrGLGpu* gpu, diff --git a/src/gpu/gl/egl/BUILD.bazel b/src/gpu/ganesh/gl/egl/BUILD.bazel similarity index 93% rename from src/gpu/gl/egl/BUILD.bazel rename to src/gpu/ganesh/gl/egl/BUILD.bazel index 573ca142a6..36aefc6761 100644 --- a/src/gpu/gl/egl/BUILD.bazel +++ b/src/gpu/ganesh/gl/egl/BUILD.bazel @@ -7,7 +7,7 @@ generated_cc_atom( deps = [ "//include/gpu/gl:GrGLAssembleInterface_hdr", "//include/gpu/gl:GrGLInterface_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", ], ) diff --git a/src/gpu/gl/egl/GrGLMakeEGLInterface.cpp b/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp similarity index 98% rename from src/gpu/gl/egl/GrGLMakeEGLInterface.cpp rename to src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp index cc5fe7623b..78225b4610 100644 --- a/src/gpu/gl/egl/GrGLMakeEGLInterface.cpp +++ b/src/gpu/ganesh/gl/egl/GrGLMakeEGLInterface.cpp @@ -6,7 +6,7 @@ */ #include "include/gpu/gl/GrGLAssembleInterface.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include #ifndef GL_GLEXT_PROTOTYPES diff --git a/src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp b/src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp similarity index 100% rename from src/gpu/gl/egl/GrGLMakeNativeInterface_egl.cpp rename to src/gpu/ganesh/gl/egl/GrGLMakeNativeInterface_egl.cpp diff --git a/src/gpu/gl/glfw/BUILD.bazel b/src/gpu/ganesh/gl/glfw/BUILD.bazel similarity index 88% rename from src/gpu/gl/glfw/BUILD.bazel rename to src/gpu/ganesh/gl/glfw/BUILD.bazel index 13ae7a457e..0163da9ad6 100644 --- a/src/gpu/gl/glfw/BUILD.bazel +++ b/src/gpu/ganesh/gl/glfw/BUILD.bazel @@ -7,6 +7,6 @@ generated_cc_atom( deps = [ "//include/gpu/gl:GrGLAssembleInterface_hdr", "//include/gpu/gl:GrGLInterface_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", ], ) diff --git a/src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw.cpp b/src/gpu/ganesh/gl/glfw/GrGLMakeNativeInterface_glfw.cpp similarity index 93% rename from src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw.cpp rename to src/gpu/ganesh/gl/glfw/GrGLMakeNativeInterface_glfw.cpp index 9592476c19..dd6c57a9f7 100644 --- a/src/gpu/gl/glfw/GrGLMakeNativeInterface_glfw.cpp +++ b/src/gpu/ganesh/gl/glfw/GrGLMakeNativeInterface_glfw.cpp @@ -8,7 +8,7 @@ #include "include/gpu/gl/GrGLAssembleInterface.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include diff --git a/src/gpu/gl/glx/BUILD.bazel b/src/gpu/ganesh/gl/glx/BUILD.bazel similarity index 93% rename from src/gpu/gl/glx/BUILD.bazel rename to src/gpu/ganesh/gl/glx/BUILD.bazel index 81d0c6a69f..096f040625 100644 --- a/src/gpu/gl/glx/BUILD.bazel +++ b/src/gpu/ganesh/gl/glx/BUILD.bazel @@ -7,7 +7,7 @@ generated_cc_atom( deps = [ "//include/gpu/gl:GrGLAssembleInterface_hdr", "//include/gpu/gl:GrGLInterface_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", ], ) diff --git a/src/gpu/gl/glx/GrGLMakeGLXInterface.cpp b/src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp similarity index 96% rename from src/gpu/gl/glx/GrGLMakeGLXInterface.cpp rename to src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp index 8d28304401..2b2d364886 100644 --- a/src/gpu/gl/glx/GrGLMakeGLXInterface.cpp +++ b/src/gpu/ganesh/gl/glx/GrGLMakeGLXInterface.cpp @@ -7,7 +7,7 @@ #include "include/gpu/gl/GrGLAssembleInterface.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" // Define this to get a prototype for glXGetProcAddress on some systems #define GLX_GLXEXT_PROTOTYPES 1 diff --git a/src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp b/src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp similarity index 100% rename from src/gpu/gl/glx/GrGLMakeNativeInterface_glx.cpp rename to src/gpu/ganesh/gl/glx/GrGLMakeNativeInterface_glx.cpp diff --git a/src/gpu/gl/iOS/BUILD.bazel b/src/gpu/ganesh/gl/iOS/BUILD.bazel similarity index 100% rename from src/gpu/gl/iOS/BUILD.bazel rename to src/gpu/ganesh/gl/iOS/BUILD.bazel diff --git a/src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp b/src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp similarity index 100% rename from src/gpu/gl/iOS/GrGLMakeNativeInterface_iOS.cpp rename to src/gpu/ganesh/gl/iOS/GrGLMakeNativeInterface_iOS.cpp diff --git a/src/gpu/gl/mac/BUILD.bazel b/src/gpu/ganesh/gl/mac/BUILD.bazel similarity index 100% rename from src/gpu/gl/mac/BUILD.bazel rename to src/gpu/ganesh/gl/mac/BUILD.bazel diff --git a/src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp b/src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp similarity index 100% rename from src/gpu/gl/mac/GrGLMakeNativeInterface_mac.cpp rename to src/gpu/ganesh/gl/mac/GrGLMakeNativeInterface_mac.cpp diff --git a/src/gpu/gl/webgl/BUILD.bazel b/src/gpu/ganesh/gl/webgl/BUILD.bazel similarity index 100% rename from src/gpu/gl/webgl/BUILD.bazel rename to src/gpu/ganesh/gl/webgl/BUILD.bazel diff --git a/src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp b/src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp similarity index 100% rename from src/gpu/gl/webgl/GrGLMakeNativeInterface_webgl.cpp rename to src/gpu/ganesh/gl/webgl/GrGLMakeNativeInterface_webgl.cpp diff --git a/src/gpu/gl/win/BUILD.bazel b/src/gpu/ganesh/gl/win/BUILD.bazel similarity index 90% rename from src/gpu/gl/win/BUILD.bazel rename to src/gpu/ganesh/gl/win/BUILD.bazel index a5537ea87d..d548b70099 100644 --- a/src/gpu/gl/win/BUILD.bazel +++ b/src/gpu/ganesh/gl/win/BUILD.bazel @@ -9,6 +9,6 @@ generated_cc_atom( "//include/gpu/gl:GrGLAssembleInterface_hdr", "//include/gpu/gl:GrGLInterface_hdr", "//src/core:SkLeanWindows_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", ], ) diff --git a/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp b/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp similarity index 98% rename from src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp rename to src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp index c34a6f9c85..f15b5fbc06 100644 --- a/src/gpu/gl/win/GrGLMakeNativeInterface_win.cpp +++ b/src/gpu/ganesh/gl/win/GrGLMakeNativeInterface_win.cpp @@ -11,7 +11,7 @@ #include "include/gpu/gl/GrGLAssembleInterface.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include #include diff --git a/src/gpu/glsl/BUILD.bazel b/src/gpu/ganesh/glsl/BUILD.bazel similarity index 81% rename from src/gpu/glsl/BUILD.bazel rename to src/gpu/ganesh/glsl/BUILD.bazel index 12564411f5..1b7ccea7aa 100644 --- a/src/gpu/glsl/BUILD.bazel +++ b/src/gpu/ganesh/glsl/BUILD.bazel @@ -30,7 +30,7 @@ generated_cc_atom( ":GrGLSLUniformHandler_hdr", "//src/core:SkColorSpacePriv_hdr", "//src/core:SkColorSpaceXformSteps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", ], ) @@ -41,8 +41,8 @@ generated_cc_atom( deps = [ ":GrGLSLShaderBuilder_hdr", "//src/gpu:Blend_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", ], ) @@ -55,8 +55,8 @@ generated_cc_atom( ":GrGLSLProgramBuilder_hdr", ":GrGLSLUniformHandler_hdr", ":GrGLSLVarying_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", ], ) @@ -69,11 +69,11 @@ generated_cc_atom( ":GrGLSLProgramDataManager_hdr", ":GrGLSLUniformHandler_hdr", ":GrGLSLVertexGeoBuilder_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrXferProcessor_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", "//src/sksl:SkSLCompiler_hdr", ], ) @@ -86,15 +86,15 @@ generated_cc_atom( ":GrGLSLProgramBuilder_hdr", ":GrGLSLVarying_hdr", "//include/sksl:DSL_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl/dsl/priv:DSLFPs_hdr", ], @@ -107,7 +107,7 @@ generated_cc_atom( deps = [ "//include/core:SkTypes_hdr", "//include/private:SkNoncopyable_hdr", - "//src/gpu:GrResourceHandle_hdr", + "//src/gpu/ganesh:GrResourceHandle_hdr", ], ) @@ -134,7 +134,7 @@ generated_cc_atom( "//include/private:SkSLString_hdr", "//include/private:SkTDArray_hdr", "//src/core:SkTBlockList_hdr", - "//src/gpu:GrShaderVar_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", ], ) @@ -148,9 +148,9 @@ generated_cc_atom( ":GrGLSLProgramBuilder_hdr", ":GrGLSLShaderBuilder_hdr", "//include/sksl:DSL_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrShaderVar_hdr", "//src/gpu:Swizzle_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", "//src/sksl:SkSLThreadContext_hdr", "//src/sksl/ir:SkSLVarDeclarations_hdr", ], @@ -162,8 +162,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrGLSLProgramDataManager_hdr", - "//src/gpu:GrShaderVar_hdr", "//src/gpu:Swizzle_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", ], ) @@ -186,7 +186,7 @@ generated_cc_atom( ":GrGLSLProgramDataManager_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkTBlockList_hdr", - "//src/gpu:GrShaderVar_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", ], ) @@ -197,7 +197,7 @@ generated_cc_atom( deps = [ ":GrGLSLProgramBuilder_hdr", ":GrGLSLVarying_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", ], ) @@ -207,7 +207,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrGLSLShaderBuilder_hdr", - "//src/gpu:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", ], ) diff --git a/src/gpu/glsl/GrGLSL.cpp b/src/gpu/ganesh/glsl/GrGLSL.cpp similarity index 98% rename from src/gpu/glsl/GrGLSL.cpp rename to src/gpu/ganesh/glsl/GrGLSL.cpp index 71603f8fb2..3095941ef9 100644 --- a/src/gpu/glsl/GrGLSL.cpp +++ b/src/gpu/ganesh/glsl/GrGLSL.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/glsl/GrGLSL.h" +#include "src/gpu/ganesh/glsl/GrGLSL.h" const char* GrGLSLTypeString(SkSLType t) { switch (t) { diff --git a/src/gpu/glsl/GrGLSL.h b/src/gpu/ganesh/glsl/GrGLSL.h similarity index 100% rename from src/gpu/glsl/GrGLSL.h rename to src/gpu/ganesh/glsl/GrGLSL.h diff --git a/src/gpu/glsl/GrGLSLBlend.cpp b/src/gpu/ganesh/glsl/GrGLSLBlend.cpp similarity index 97% rename from src/gpu/glsl/GrGLSLBlend.cpp rename to src/gpu/ganesh/glsl/GrGLSLBlend.cpp index 94097ad236..587a973fdb 100644 --- a/src/gpu/glsl/GrGLSLBlend.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLBlend.cpp @@ -6,9 +6,9 @@ */ #include "include/private/SkSLString.h" -#include "src/gpu/glsl/GrGLSLBlend.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLBlend.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" namespace GrGLSLBlend { diff --git a/src/gpu/glsl/GrGLSLBlend.h b/src/gpu/ganesh/glsl/GrGLSLBlend.h similarity index 96% rename from src/gpu/glsl/GrGLSLBlend.h rename to src/gpu/ganesh/glsl/GrGLSLBlend.h index 9c1db8eb33..cf6e6a409d 100644 --- a/src/gpu/glsl/GrGLSLBlend.h +++ b/src/gpu/ganesh/glsl/GrGLSLBlend.h @@ -9,7 +9,7 @@ #define GrGLBlend_DEFINED #include "include/core/SkBlendMode.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" class GrGLSLShaderBuilder; class GrGLSLUniformHandler; diff --git a/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h b/src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h similarity index 97% rename from src/gpu/glsl/GrGLSLColorSpaceXformHelper.h rename to src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h index 05996059bc..18d83425f0 100644 --- a/src/gpu/glsl/GrGLSLColorSpaceXformHelper.h +++ b/src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h @@ -10,8 +10,8 @@ #include "src/core/SkColorSpacePriv.h" #include "src/core/SkColorSpaceXformSteps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" /** * Helper class to assist with using GrColorSpaceXform within an FP. This manages all of the diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp similarity index 93% rename from src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp rename to src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp index f9a75090fd..00f14c8672 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" GrGLSLFragmentShaderBuilder::GrGLSLFragmentShaderBuilder(GrGLSLProgramBuilder* program) : GrGLSLShaderBuilder(program) {} diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h b/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h similarity index 97% rename from src/gpu/glsl/GrGLSLFragmentShaderBuilder.h rename to src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h index 2ee54fe59a..454d90fb4b 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.h +++ b/src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h @@ -9,9 +9,9 @@ #define GrGLSLFragmentShaderBuilder_DEFINED #include "src/gpu/Blend.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/glsl/GrGLSLShaderBuilder.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h" class GrRenderTarget; class GrGLSLVarying; diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.cpp b/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp similarity index 97% rename from src/gpu/glsl/GrGLSLProgramBuilder.cpp rename to src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp index 3b3ddc5f95..be4521c6ef 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.cpp @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include #include "include/sksl/DSL.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/dsl/priv/DSLFPs.h" diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h similarity index 94% rename from src/gpu/glsl/GrGLSLProgramBuilder.h rename to src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h index 193a71d9be..e7a674523f 100644 --- a/src/gpu/glsl/GrGLSLProgramBuilder.h +++ b/src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h @@ -8,15 +8,15 @@ #ifndef GrGLSLProgramBuilder_DEFINED #define GrGLSLProgramBuilder_DEFINED -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" #include "src/sksl/SkSLCompiler.h" #include diff --git a/src/gpu/glsl/GrGLSLProgramDataManager.cpp b/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp similarity index 93% rename from src/gpu/glsl/GrGLSLProgramDataManager.cpp rename to src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp index 2421fe9d2f..547e7a9394 100644 --- a/src/gpu/glsl/GrGLSLProgramDataManager.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" #include "include/core/SkM44.h" #include "include/core/SkMatrix.h" diff --git a/src/gpu/glsl/GrGLSLProgramDataManager.h b/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h similarity index 98% rename from src/gpu/glsl/GrGLSLProgramDataManager.h rename to src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h index b0d155ecc0..f502431723 100644 --- a/src/gpu/glsl/GrGLSLProgramDataManager.h +++ b/src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h @@ -10,7 +10,7 @@ #include "include/core/SkTypes.h" #include "include/private/SkNoncopyable.h" -#include "src/gpu/GrResourceHandle.h" +#include "src/gpu/ganesh/GrResourceHandle.h" class SkMatrix; class SkM44; diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.cpp b/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp similarity index 97% rename from src/gpu/glsl/GrGLSLShaderBuilder.cpp rename to src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp index f78c0630aa..4020658605 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.cpp @@ -5,15 +5,15 @@ * found in the LICENSE file. */ -#include "src/gpu/glsl/GrGLSLShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h" #include "include/sksl/DSL.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrShaderVar.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/glsl/GrGLSLBlend.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLBlend.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #include "src/sksl/SkSLThreadContext.h" #include "src/sksl/ir/SkSLVarDeclarations.h" diff --git a/src/gpu/glsl/GrGLSLShaderBuilder.h b/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h similarity index 99% rename from src/gpu/glsl/GrGLSLShaderBuilder.h rename to src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h index ad5bcb7237..4a43791fec 100644 --- a/src/gpu/glsl/GrGLSLShaderBuilder.h +++ b/src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h @@ -13,8 +13,8 @@ #include "include/private/SkSLString.h" #include "include/private/SkTDArray.h" #include "src/core/SkTBlockList.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include diff --git a/src/gpu/glsl/GrGLSLUniformHandler.cpp b/src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp similarity index 89% rename from src/gpu/glsl/GrGLSLUniformHandler.cpp rename to src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp index 6bb7287a6d..ce03012b08 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLUniformHandler.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSL.h" -#include "src/gpu/glsl/GrGLSLShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSL.h" +#include "src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h" GrShaderVar GrGLSLUniformHandler::getUniformMapping(const GrProcessor& owner, SkString rawName) const { diff --git a/src/gpu/glsl/GrGLSLUniformHandler.h b/src/gpu/ganesh/glsl/GrGLSLUniformHandler.h similarity index 98% rename from src/gpu/glsl/GrGLSLUniformHandler.h rename to src/gpu/ganesh/glsl/GrGLSLUniformHandler.h index c0e7ebf97c..be3a411d85 100644 --- a/src/gpu/glsl/GrGLSLUniformHandler.h +++ b/src/gpu/ganesh/glsl/GrGLSLUniformHandler.h @@ -8,9 +8,9 @@ #ifndef GrGLSLUniformHandler_DEFINED #define GrGLSLUniformHandler_DEFINED -#include "src/gpu/GrShaderVar.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" // variable names beginning with this prefix will not be mangled #define GR_NO_MANGLE_PREFIX "sk_" diff --git a/src/gpu/glsl/GrGLSLVarying.cpp b/src/gpu/ganesh/glsl/GrGLSLVarying.cpp similarity index 97% rename from src/gpu/glsl/GrGLSLVarying.cpp rename to src/gpu/ganesh/glsl/GrGLSLVarying.cpp index 9132542da5..e857e6ff68 100644 --- a/src/gpu/glsl/GrGLSLVarying.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLVarying.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" void GrGLSLVaryingHandler::addPassThroughAttribute(const GrShaderVar& vsVar, const char* output, diff --git a/src/gpu/glsl/GrGLSLVarying.h b/src/gpu/ganesh/glsl/GrGLSLVarying.h similarity index 98% rename from src/gpu/glsl/GrGLSLVarying.h rename to src/gpu/ganesh/glsl/GrGLSLVarying.h index 1a89bce981..9cb60a061f 100644 --- a/src/gpu/glsl/GrGLSLVarying.h +++ b/src/gpu/ganesh/glsl/GrGLSLVarying.h @@ -10,8 +10,8 @@ #include "include/private/GrTypesPriv.h" #include "src/core/SkTBlockList.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" class GrGeometryProcessor; class GrGLSLProgramBuilder; diff --git a/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp b/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp similarity index 90% rename from src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp rename to src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp index 07aa6c0712..757e6a9f27 100644 --- a/src/gpu/glsl/GrGLSLVertexGeoBuilder.cpp +++ b/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" void GrGLSLVertexGeoBuilder::emitNormalizedSkPosition(SkString* out, const char* devPos, SkSLType devPosType) { diff --git a/src/gpu/glsl/GrGLSLVertexGeoBuilder.h b/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h similarity index 94% rename from src/gpu/glsl/GrGLSLVertexGeoBuilder.h rename to src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h index 0ecc2b5706..35d1935dd9 100644 --- a/src/gpu/glsl/GrGLSLVertexGeoBuilder.h +++ b/src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h @@ -8,8 +8,8 @@ #ifndef GrGLSLVertexGeoBuilder_DEFINED #define GrGLSLVertexGeoBuilder_DEFINED -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/glsl/GrGLSLShaderBuilder.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLShaderBuilder.h" /** * Base class for vertex shader builder. This is the stage that computes input geometry for the diff --git a/src/gpu/gradients/BUILD.bazel b/src/gpu/ganesh/gradients/BUILD.bazel similarity index 77% rename from src/gpu/gradients/BUILD.bazel rename to src/gpu/ganesh/gradients/BUILD.bazel index 30d752fb3c..100a890773 100644 --- a/src/gpu/gradients/BUILD.bazel +++ b/src/gpu/ganesh/gradients/BUILD.bazel @@ -31,8 +31,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/utils:SkRandom_hdr", - "//src/gpu:GrFPArgs_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFPArgs_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", "//src/shaders/gradients:SkGradientShaderPriv_hdr", "//src/shaders/gradients:SkLinearGradient_hdr", "//src/shaders/gradients:SkRadialGradient_hdr", @@ -52,13 +52,13 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//src/core:SkMathPriv_hdr", "//src/core:SkRuntimeEffectPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", ], ) diff --git a/src/gpu/gradients/GrGradientBitmapCache.cpp b/src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp similarity index 99% rename from src/gpu/gradients/GrGradientBitmapCache.cpp rename to src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp index a1f6082489..61ba8dca53 100644 --- a/src/gpu/gradients/GrGradientBitmapCache.cpp +++ b/src/gpu/ganesh/gradients/GrGradientBitmapCache.cpp @@ -6,7 +6,7 @@ */ -#include "src/gpu/gradients/GrGradientBitmapCache.h" +#include "src/gpu/ganesh/gradients/GrGradientBitmapCache.h" #include "include/private/SkFloatBits.h" #include "include/private/SkHalf.h" diff --git a/src/gpu/gradients/GrGradientBitmapCache.h b/src/gpu/ganesh/gradients/GrGradientBitmapCache.h similarity index 100% rename from src/gpu/gradients/GrGradientBitmapCache.h rename to src/gpu/ganesh/gradients/GrGradientBitmapCache.h diff --git a/src/gpu/gradients/GrGradientShader.cpp b/src/gpu/ganesh/gradients/GrGradientShader.cpp similarity index 99% rename from src/gpu/gradients/GrGradientShader.cpp rename to src/gpu/ganesh/gradients/GrGradientShader.cpp index 4ce118f78f..3493d8538d 100644 --- a/src/gpu/gradients/GrGradientShader.cpp +++ b/src/gpu/ganesh/gradients/GrGradientShader.cpp @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/gradients/GrGradientShader.h" +#include "src/gpu/ganesh/gradients/GrGradientShader.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkMathPriv.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/gradients/GrGradientBitmapCache.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/gradients/GrGradientBitmapCache.h" using Vec4 = skvx::Vec<4, float>; diff --git a/src/gpu/gradients/GrGradientShader.h b/src/gpu/ganesh/gradients/GrGradientShader.h similarity index 96% rename from src/gpu/gradients/GrGradientShader.h rename to src/gpu/ganesh/gradients/GrGradientShader.h index 19948a64a7..6c97808043 100644 --- a/src/gpu/gradients/GrGradientShader.h +++ b/src/gpu/ganesh/gradients/GrGradientShader.h @@ -8,8 +8,8 @@ #ifndef GrGradientShader_DEFINE #define GrGradientShader_DEFINE -#include "src/gpu/GrFPArgs.h" -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFPArgs.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #include "src/shaders/gradients/SkGradientShaderPriv.h" #include "src/shaders/gradients/SkLinearGradient.h" #include "src/shaders/gradients/SkRadialGradient.h" diff --git a/src/gpu/gradients/README.md b/src/gpu/ganesh/gradients/README.md similarity index 100% rename from src/gpu/gradients/README.md rename to src/gpu/ganesh/gradients/README.md diff --git a/src/gpu/mock/BUILD.bazel b/src/gpu/ganesh/mock/BUILD.bazel similarity index 68% rename from src/gpu/mock/BUILD.bazel rename to src/gpu/ganesh/mock/BUILD.bazel index fd2e971afd..7e181d6349 100644 --- a/src/gpu/mock/BUILD.bazel +++ b/src/gpu/ganesh/mock/BUILD.bazel @@ -6,8 +6,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMockGpu_hdr", - "//src/gpu:GrAttachment_hdr", - "//src/gpu:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", ], ) @@ -17,8 +17,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMockGpu_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", ], ) @@ -28,8 +28,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/mock:GrMockTypes_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -40,7 +40,7 @@ generated_cc_atom( deps = [ ":GrMockCaps_hdr", "//src/core:SkMathPriv_hdr", - "//src/gpu:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", ], ) @@ -50,10 +50,10 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/private:SkTHash_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -68,7 +68,7 @@ generated_cc_atom( ":GrMockGpu_hdr", ":GrMockOpsRenderPass_hdr", ":GrMockTexture_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", ], ) @@ -78,11 +78,11 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDstProxyView_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrMeshDrawTarget_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDstProxyView_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrMeshDrawTarget_hdr", ], ) @@ -92,8 +92,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMockGpu_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -101,14 +101,14 @@ generated_cc_atom( name = "GrMockRenderTask_hdr", hdrs = ["GrMockRenderTask.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrRenderTask_hdr"], + deps = ["//src/gpu/ganesh:GrRenderTask_hdr"], ) generated_cc_atom( name = "GrMockSurfaceProxy_hdr", hdrs = ["GrMockSurfaceProxy.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrSurfaceProxy_hdr"], + deps = ["//src/gpu/ganesh:GrSurfaceProxy_hdr"], ) generated_cc_atom( @@ -118,9 +118,9 @@ generated_cc_atom( deps = [ ":GrMockGpu_hdr", "//include/gpu/mock:GrMockTypes_hdr", - "//src/gpu:GrAttachment_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) diff --git a/src/gpu/mock/GrMockAttachment.h b/src/gpu/ganesh/mock/GrMockAttachment.h similarity index 88% rename from src/gpu/mock/GrMockAttachment.h rename to src/gpu/ganesh/mock/GrMockAttachment.h index 773a2f177f..226192281f 100644 --- a/src/gpu/mock/GrMockAttachment.h +++ b/src/gpu/ganesh/mock/GrMockAttachment.h @@ -8,9 +8,9 @@ #ifndef GrMockAttachment_DEFINED #define GrMockAttachment_DEFINED -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/mock/GrMockGpu.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" class GrMockAttachment : public GrAttachment { public: diff --git a/src/gpu/mock/GrMockBuffer.h b/src/gpu/ganesh/mock/GrMockBuffer.h similarity index 88% rename from src/gpu/mock/GrMockBuffer.h rename to src/gpu/ganesh/mock/GrMockBuffer.h index dc44cf9030..fa4efc6d18 100644 --- a/src/gpu/mock/GrMockBuffer.h +++ b/src/gpu/ganesh/mock/GrMockBuffer.h @@ -8,9 +8,9 @@ #ifndef GrMockBuffer_DEFINED #define GrMockBuffer_DEFINED -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/mock/GrMockGpu.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" class GrMockBuffer : public GrGpuBuffer { public: diff --git a/src/gpu/mock/GrMockCaps.cpp b/src/gpu/ganesh/mock/GrMockCaps.cpp similarity index 98% rename from src/gpu/mock/GrMockCaps.cpp rename to src/gpu/ganesh/mock/GrMockCaps.cpp index f332a0541b..0150ba957e 100644 --- a/src/gpu/mock/GrMockCaps.cpp +++ b/src/gpu/ganesh/mock/GrMockCaps.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/mock/GrMockCaps.h" +#include "src/gpu/ganesh/mock/GrMockCaps.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProgramDesc.h" int GrMockCaps::getRenderTargetSampleCount(int requestCount, GrColorType ct) const { requestCount = std::max(requestCount, 1); diff --git a/src/gpu/mock/GrMockCaps.h b/src/gpu/ganesh/mock/GrMockCaps.h similarity index 99% rename from src/gpu/mock/GrMockCaps.h rename to src/gpu/ganesh/mock/GrMockCaps.h index 27d7ce0a69..56a10d5ca6 100644 --- a/src/gpu/mock/GrMockCaps.h +++ b/src/gpu/ganesh/mock/GrMockCaps.h @@ -9,8 +9,8 @@ #define GrMockCaps_DEFINED #include "include/gpu/mock/GrMockTypes.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/SkGr.h" class GrMockCaps : public GrCaps { public: diff --git a/src/gpu/mock/GrMockGpu.cpp b/src/gpu/ganesh/mock/GrMockGpu.cpp similarity index 97% rename from src/gpu/mock/GrMockGpu.cpp rename to src/gpu/ganesh/mock/GrMockGpu.cpp index f9c3a7b30d..5d19d7aae7 100644 --- a/src/gpu/mock/GrMockGpu.cpp +++ b/src/gpu/ganesh/mock/GrMockGpu.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/mock/GrMockGpu.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/mock/GrMockAttachment.h" -#include "src/gpu/mock/GrMockBuffer.h" -#include "src/gpu/mock/GrMockCaps.h" -#include "src/gpu/mock/GrMockOpsRenderPass.h" -#include "src/gpu/mock/GrMockTexture.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/mock/GrMockAttachment.h" +#include "src/gpu/ganesh/mock/GrMockBuffer.h" +#include "src/gpu/ganesh/mock/GrMockCaps.h" +#include "src/gpu/ganesh/mock/GrMockOpsRenderPass.h" +#include "src/gpu/ganesh/mock/GrMockTexture.h" #include diff --git a/src/gpu/mock/GrMockGpu.h b/src/gpu/ganesh/mock/GrMockGpu.h similarity index 98% rename from src/gpu/mock/GrMockGpu.h rename to src/gpu/ganesh/mock/GrMockGpu.h index 6af831957e..4ee0ffb32c 100644 --- a/src/gpu/mock/GrMockGpu.h +++ b/src/gpu/ganesh/mock/GrMockGpu.h @@ -9,10 +9,10 @@ #define GrMockGpu_DEFINED #include "include/private/SkTHash.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrTexture.h" class GrMockOpsRenderPass; struct GrMockOptions; diff --git a/src/gpu/mock/GrMockOpTarget.h b/src/gpu/ganesh/mock/GrMockOpTarget.h similarity index 96% rename from src/gpu/mock/GrMockOpTarget.h rename to src/gpu/ganesh/mock/GrMockOpTarget.h index be9cd23e10..3f9714a6cc 100644 --- a/src/gpu/mock/GrMockOpTarget.h +++ b/src/gpu/ganesh/mock/GrMockOpTarget.h @@ -9,11 +9,11 @@ #define GrMockOpTarget_DEFINED #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDstProxyView.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDstProxyView.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" // This is a mock GrMeshDrawTarget implementation that just gives back pointers into // pre-allocated CPU buffers, rather than allocating and mapping GPU buffers. diff --git a/src/gpu/mock/GrMockOpsRenderPass.h b/src/gpu/ganesh/mock/GrMockOpsRenderPass.h similarity index 95% rename from src/gpu/mock/GrMockOpsRenderPass.h rename to src/gpu/ganesh/mock/GrMockOpsRenderPass.h index e9ab5fb66f..c6e95cf0e4 100644 --- a/src/gpu/mock/GrMockOpsRenderPass.h +++ b/src/gpu/ganesh/mock/GrMockOpsRenderPass.h @@ -8,10 +8,10 @@ #ifndef GrMockOpsRenderPass_DEFINED #define GrMockOpsRenderPass_DEFINED -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/mock/GrMockGpu.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" class GrMockOpsRenderPass : public GrOpsRenderPass { public: diff --git a/src/gpu/mock/GrMockRenderTask.h b/src/gpu/ganesh/mock/GrMockRenderTask.h similarity index 97% rename from src/gpu/mock/GrMockRenderTask.h rename to src/gpu/ganesh/mock/GrMockRenderTask.h index 2eb7a25cda..16a3c6d8dd 100644 --- a/src/gpu/mock/GrMockRenderTask.h +++ b/src/gpu/ganesh/mock/GrMockRenderTask.h @@ -8,7 +8,7 @@ #ifndef GrMockRenderTask_DEFINED #define GrMockRenderTask_DEFINED -#include "src/gpu/GrRenderTask.h" +#include "src/gpu/ganesh/GrRenderTask.h" class GrMockRenderTask : public GrRenderTask { public: diff --git a/src/gpu/mock/GrMockSurfaceProxy.h b/src/gpu/ganesh/mock/GrMockSurfaceProxy.h similarity index 96% rename from src/gpu/mock/GrMockSurfaceProxy.h rename to src/gpu/ganesh/mock/GrMockSurfaceProxy.h index af541f24d2..0166ec1b3a 100644 --- a/src/gpu/mock/GrMockSurfaceProxy.h +++ b/src/gpu/ganesh/mock/GrMockSurfaceProxy.h @@ -8,7 +8,7 @@ #ifndef GrMockSurfaceProxy_DEFINED #define GrMockSurfaceProxy_DEFINED -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" class GrMockSurfaceProxy : public GrSurfaceProxy { public: diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/ganesh/mock/GrMockTexture.h similarity index 98% rename from src/gpu/mock/GrMockTexture.h rename to src/gpu/ganesh/mock/GrMockTexture.h index 1c223c6117..2dcc826726 100644 --- a/src/gpu/mock/GrMockTexture.h +++ b/src/gpu/ganesh/mock/GrMockTexture.h @@ -8,10 +8,10 @@ #define GrMockTexture_DEFINED #include "include/gpu/mock/GrMockTypes.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/mock/GrMockGpu.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" class GrMockTexture : public GrTexture { public: diff --git a/src/gpu/mock/GrMockTypes.cpp b/src/gpu/ganesh/mock/GrMockTypes.cpp similarity index 100% rename from src/gpu/mock/GrMockTypes.cpp rename to src/gpu/ganesh/mock/GrMockTypes.cpp diff --git a/src/gpu/mtl/BUILD.bazel b/src/gpu/ganesh/mtl/BUILD.bazel similarity index 78% rename from src/gpu/mtl/BUILD.bazel rename to src/gpu/ganesh/mtl/BUILD.bazel index 8eea005834..efa37ea21e 100644 --- a/src/gpu/mtl/BUILD.bazel +++ b/src/gpu/ganesh/mtl/BUILD.bazel @@ -6,7 +6,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/mtl:GrMtlTypes_hdr", - "//src/gpu:GrAttachment_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", ], ) @@ -16,7 +16,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMtlUniformHandler_hdr", - "//src/gpu:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", ], ) @@ -27,7 +27,7 @@ generated_cc_atom( deps = [ ":GrMtlAttachment_hdr", "//include/private:SkTDArray_hdr", - "//src/gpu:GrCaps_hdr", + "//src/gpu/ganesh:GrCaps_hdr", ], ) @@ -40,10 +40,10 @@ generated_cc_atom( ":GrMtlUtil_hdr", "//include/core:SkRefCnt_hdr", "//include/gpu:GrTypes_hdr", - "//src/gpu:GrBuffer_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu:GrRefCnt_hdr", - "//src/gpu:GrSurface_hdr", + "//src/gpu/ganesh:GrBuffer_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh:GrRefCnt_hdr", + "//src/gpu/ganesh:GrSurface_hdr", ], ) @@ -65,7 +65,7 @@ generated_cc_atom( deps = [ "//include/gpu:GrTypes_hdr", "//src/core:SkOpts_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -93,13 +93,13 @@ generated_cc_atom( "//include/gpu/mtl:GrMtlBackendContext_hdr", "//include/private:GrMtlTypesPriv_hdr", "//include/private:SkDeque_hdr", - "//src/gpu:GrFinishCallbacks_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrRingBuffer_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrStagingBufferManager_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrFinishCallbacks_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrRingBuffer_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrStagingBufferManager_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -109,8 +109,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMtlGpu_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", ], ) @@ -122,8 +122,8 @@ generated_cc_atom( ":GrMtlUniformHandler_hdr", ":GrMtlVaryingHandler_hdr", "//include/gpu:GrContextOptions_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", "//src/sksl:SkSLCompiler_hdr", ], ) @@ -135,7 +135,7 @@ generated_cc_atom( deps = [ ":GrMtlUniformHandler_hdr", "//src/core:SkAutoMalloc_hdr", - "//src/gpu:GrUniformDataManager_hdr", + "//src/gpu/ganesh:GrUniformDataManager_hdr", ], ) @@ -148,8 +148,8 @@ generated_cc_atom( ":GrMtlPipelineStateDataManager_hdr", ":GrMtlPipeline_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", ], ) @@ -157,7 +157,7 @@ generated_cc_atom( name = "GrMtlPipeline_hdr", hdrs = ["GrMtlPipeline.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrManagedResource_hdr"], + deps = ["//src/gpu/ganesh:GrManagedResource_hdr"], ) generated_cc_atom( @@ -168,7 +168,7 @@ generated_cc_atom( ":GrMtlSampler_hdr", ":GrMtlUniformHandler_hdr", ":GrMtlUtil_hdr", - "//src/gpu:GrSamplerState_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", ], ) @@ -180,8 +180,8 @@ generated_cc_atom( ":GrMtlAttachment_hdr", ":GrMtlFramebuffer_hdr", "//include/gpu:GrBackendSurface_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", ], ) @@ -198,8 +198,8 @@ generated_cc_atom( "//include/private:SkTArray_hdr", "//src/core:SkLRUCache_hdr", "//src/core:SkTDynamicHash_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", ], ) @@ -209,7 +209,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkOpts_hdr", - "//src/gpu:GrManagedResource_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", ], ) @@ -221,8 +221,8 @@ generated_cc_atom( ":GrMtlUtil_hdr", "//include/gpu:GrBackendSemaphore_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu:GrSemaphore_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", ], ) @@ -242,7 +242,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMtlAttachment_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -262,8 +262,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkTBlockList_hdr", - "//src/gpu:GrShaderVar_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -284,5 +284,5 @@ generated_cc_atom( name = "GrMtlVaryingHandler_hdr", hdrs = ["GrMtlVaryingHandler.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/glsl:GrGLSLVarying_hdr"], + deps = ["//src/gpu/ganesh/glsl:GrGLSLVarying_hdr"], ) diff --git a/src/gpu/mtl/GrMtlAttachment.h b/src/gpu/ganesh/mtl/GrMtlAttachment.h similarity index 98% rename from src/gpu/mtl/GrMtlAttachment.h rename to src/gpu/ganesh/mtl/GrMtlAttachment.h index d9e48e13c7..cfa6d83e84 100644 --- a/src/gpu/mtl/GrMtlAttachment.h +++ b/src/gpu/ganesh/mtl/GrMtlAttachment.h @@ -9,7 +9,7 @@ #define GrMtlAttachment_DEFINED #include "include/gpu/mtl/GrMtlTypes.h" -#include "src/gpu/GrAttachment.h" +#include "src/gpu/ganesh/GrAttachment.h" #import diff --git a/src/gpu/mtl/GrMtlAttachment.mm b/src/gpu/ganesh/mtl/GrMtlAttachment.mm similarity index 98% rename from src/gpu/mtl/GrMtlAttachment.mm rename to src/gpu/ganesh/mtl/GrMtlAttachment.mm index e2105f3655..1fc4a84a86 100644 --- a/src/gpu/mtl/GrMtlAttachment.mm +++ b/src/gpu/ganesh/mtl/GrMtlAttachment.mm @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlAttachment.h" +#include "src/gpu/ganesh/mtl/GrMtlAttachment.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlBuffer.h b/src/gpu/ganesh/mtl/GrMtlBuffer.h similarity index 93% rename from src/gpu/mtl/GrMtlBuffer.h rename to src/gpu/ganesh/mtl/GrMtlBuffer.h index c327fe6c7a..fe1f57d70e 100644 --- a/src/gpu/mtl/GrMtlBuffer.h +++ b/src/gpu/ganesh/mtl/GrMtlBuffer.h @@ -8,8 +8,8 @@ #ifndef GrMtlBuffer_DEFINED #define GrMtlBuffer_DEFINED -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/mtl/GrMtlUniformHandler.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlUniformHandler.h" #import diff --git a/src/gpu/mtl/GrMtlBuffer.mm b/src/gpu/ganesh/mtl/GrMtlBuffer.mm similarity index 96% rename from src/gpu/mtl/GrMtlBuffer.mm rename to src/gpu/ganesh/mtl/GrMtlBuffer.mm index ede327541b..b7d551e0e8 100644 --- a/src/gpu/mtl/GrMtlBuffer.mm +++ b/src/gpu/ganesh/mtl/GrMtlBuffer.mm @@ -6,11 +6,11 @@ */ #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrStagingBufferManager.h" -#include "src/gpu/mtl/GrMtlBuffer.h" -#include "src/gpu/mtl/GrMtlCommandBuffer.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" +#include "src/gpu/ganesh/mtl/GrMtlBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlCommandBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlCaps.h b/src/gpu/ganesh/mtl/GrMtlCaps.h similarity index 98% rename from src/gpu/mtl/GrMtlCaps.h rename to src/gpu/ganesh/mtl/GrMtlCaps.h index 37e988cfb2..8767027d35 100644 --- a/src/gpu/mtl/GrMtlCaps.h +++ b/src/gpu/ganesh/mtl/GrMtlCaps.h @@ -9,8 +9,8 @@ #define GrMtlCaps_DEFINED #include "include/private/SkTDArray.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/mtl/GrMtlAttachment.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/mtl/GrMtlAttachment.h" #import diff --git a/src/gpu/mtl/GrMtlCaps.mm b/src/gpu/ganesh/mtl/GrMtlCaps.mm similarity index 98% rename from src/gpu/mtl/GrMtlCaps.mm rename to src/gpu/ganesh/mtl/GrMtlCaps.mm index 8374507491..d7dafb8c56 100644 --- a/src/gpu/mtl/GrMtlCaps.mm +++ b/src/gpu/ganesh/mtl/GrMtlCaps.mm @@ -5,24 +5,24 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlCaps.h" +#include "src/gpu/ganesh/mtl/GrMtlCaps.h" #include "include/core/SkRect.h" #include "include/gpu/GrBackendSurface.h" #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkReadBuffer.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrSurfaceProxy.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/mtl/GrMtlRenderTarget.h" -#include "src/gpu/mtl/GrMtlTexture.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlCommandBuffer.h b/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h similarity index 93% rename from src/gpu/mtl/GrMtlCommandBuffer.h rename to src/gpu/ganesh/mtl/GrMtlCommandBuffer.h index 17439e26fb..0caaeb4266 100644 --- a/src/gpu/mtl/GrMtlCommandBuffer.h +++ b/src/gpu/ganesh/mtl/GrMtlCommandBuffer.h @@ -12,12 +12,12 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/GrRefCnt.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/mtl/GrMtlRenderCommandEncoder.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/GrRefCnt.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" class GrMtlEvent; class GrMtlGpu; diff --git a/src/gpu/mtl/GrMtlCommandBuffer.mm b/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm similarity index 97% rename from src/gpu/mtl/GrMtlCommandBuffer.mm rename to src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm index d8ffc16eca..47c303d64e 100644 --- a/src/gpu/mtl/GrMtlCommandBuffer.mm +++ b/src/gpu/ganesh/mtl/GrMtlCommandBuffer.mm @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlCommandBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlCommandBuffer.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlOpsRenderPass.h" -#include "src/gpu/mtl/GrMtlPipelineState.h" -#include "src/gpu/mtl/GrMtlRenderCommandEncoder.h" -#include "src/gpu/mtl/GrMtlSemaphore.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineState.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h" +#include "src/gpu/ganesh/mtl/GrMtlSemaphore.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlCppUtil.h b/src/gpu/ganesh/mtl/GrMtlCppUtil.h similarity index 100% rename from src/gpu/mtl/GrMtlCppUtil.h rename to src/gpu/ganesh/mtl/GrMtlCppUtil.h diff --git a/src/gpu/mtl/GrMtlDepthStencil.h b/src/gpu/ganesh/mtl/GrMtlDepthStencil.h similarity index 98% rename from src/gpu/mtl/GrMtlDepthStencil.h rename to src/gpu/ganesh/mtl/GrMtlDepthStencil.h index b1d6f15a73..f92b61ba8b 100644 --- a/src/gpu/mtl/GrMtlDepthStencil.h +++ b/src/gpu/ganesh/mtl/GrMtlDepthStencil.h @@ -12,7 +12,7 @@ #include "include/gpu/GrTypes.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" #include class GrMtlGpu; diff --git a/src/gpu/mtl/GrMtlDepthStencil.mm b/src/gpu/ganesh/mtl/GrMtlDepthStencil.mm similarity index 97% rename from src/gpu/mtl/GrMtlDepthStencil.mm rename to src/gpu/ganesh/mtl/GrMtlDepthStencil.mm index ba07fb3240..69d3edfc24 100644 --- a/src/gpu/mtl/GrMtlDepthStencil.mm +++ b/src/gpu/ganesh/mtl/GrMtlDepthStencil.mm @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/mtl/GrMtlDepthStencil.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/mtl/GrMtlDepthStencil.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlFramebuffer.h b/src/gpu/ganesh/mtl/GrMtlFramebuffer.h similarity index 100% rename from src/gpu/mtl/GrMtlFramebuffer.h rename to src/gpu/ganesh/mtl/GrMtlFramebuffer.h diff --git a/src/gpu/mtl/GrMtlFramebuffer.mm b/src/gpu/ganesh/mtl/GrMtlFramebuffer.mm similarity index 91% rename from src/gpu/mtl/GrMtlFramebuffer.mm rename to src/gpu/ganesh/mtl/GrMtlFramebuffer.mm index 28b45d3a8b..abfc95690c 100644 --- a/src/gpu/mtl/GrMtlFramebuffer.mm +++ b/src/gpu/ganesh/mtl/GrMtlFramebuffer.mm @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlFramebuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlFramebuffer.h" -#include "src/gpu/mtl/GrMtlAttachment.h" +#include "src/gpu/ganesh/mtl/GrMtlAttachment.h" sk_sp GrMtlFramebuffer::Make( GrMtlAttachment* colorAttachment, diff --git a/src/gpu/mtl/GrMtlGpu.h b/src/gpu/ganesh/mtl/GrMtlGpu.h similarity index 96% rename from src/gpu/mtl/GrMtlGpu.h rename to src/gpu/ganesh/mtl/GrMtlGpu.h index c389cfb57c..2518eb7a29 100644 --- a/src/gpu/mtl/GrMtlGpu.h +++ b/src/gpu/ganesh/mtl/GrMtlGpu.h @@ -12,19 +12,19 @@ #include "include/private/GrMtlTypesPriv.h" #include "include/private/SkDeque.h" -#include "src/gpu/GrFinishCallbacks.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrRingBuffer.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrStagingBufferManager.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrFinishCallbacks.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRingBuffer.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" +#include "src/gpu/ganesh/GrTexture.h" -#include "src/gpu/mtl/GrMtlAttachment.h" -#include "src/gpu/mtl/GrMtlCaps.h" -#include "src/gpu/mtl/GrMtlCommandBuffer.h" -#include "src/gpu/mtl/GrMtlResourceProvider.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlAttachment.h" +#include "src/gpu/ganesh/mtl/GrMtlCaps.h" +#include "src/gpu/ganesh/mtl/GrMtlCommandBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlResourceProvider.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #import diff --git a/src/gpu/mtl/GrMtlGpu.mm b/src/gpu/ganesh/mtl/GrMtlGpu.mm similarity index 98% rename from src/gpu/mtl/GrMtlGpu.mm rename to src/gpu/ganesh/mtl/GrMtlGpu.mm index 52185d570e..71bcf2e997 100644 --- a/src/gpu/mtl/GrMtlGpu.mm +++ b/src/gpu/ganesh/mtl/GrMtlGpu.mm @@ -5,29 +5,29 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkConvertPixels.h" #include "src/core/SkMathPriv.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/mtl/GrMtlBuffer.h" -#include "src/gpu/mtl/GrMtlCommandBuffer.h" -#include "src/gpu/mtl/GrMtlOpsRenderPass.h" -#include "src/gpu/mtl/GrMtlPipelineStateBuilder.h" -#include "src/gpu/mtl/GrMtlRenderCommandEncoder.h" -#include "src/gpu/mtl/GrMtlSemaphore.h" -#include "src/gpu/mtl/GrMtlTexture.h" -#include "src/gpu/mtl/GrMtlTextureRenderTarget.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlCommandBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h" +#include "src/gpu/ganesh/mtl/GrMtlSemaphore.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #import diff --git a/src/gpu/mtl/GrMtlOpsRenderPass.h b/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h similarity index 96% rename from src/gpu/mtl/GrMtlOpsRenderPass.h rename to src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h index 7790e927ff..a47dd21606 100644 --- a/src/gpu/mtl/GrMtlOpsRenderPass.h +++ b/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h @@ -8,9 +8,9 @@ #ifndef GrMtlOpsRenderPass_DEFINED #define GrMtlOpsRenderPass_DEFINED -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #import diff --git a/src/gpu/mtl/GrMtlOpsRenderPass.mm b/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm similarity index 97% rename from src/gpu/mtl/GrMtlOpsRenderPass.mm rename to src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm index d9292befb7..6b69107bef 100644 --- a/src/gpu/mtl/GrMtlOpsRenderPass.mm +++ b/src/gpu/ganesh/mtl/GrMtlOpsRenderPass.mm @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlOpsRenderPass.h" +#include "src/gpu/ganesh/mtl/GrMtlOpsRenderPass.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/mtl/GrMtlCommandBuffer.h" -#include "src/gpu/mtl/GrMtlPipelineState.h" -#include "src/gpu/mtl/GrMtlPipelineStateBuilder.h" -#include "src/gpu/mtl/GrMtlRenderCommandEncoder.h" -#include "src/gpu/mtl/GrMtlRenderTarget.h" -#include "src/gpu/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlCommandBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineState.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlPipeline.h b/src/gpu/ganesh/mtl/GrMtlPipeline.h similarity index 96% rename from src/gpu/mtl/GrMtlPipeline.h rename to src/gpu/ganesh/mtl/GrMtlPipeline.h index a3fe4d20e8..6e15754a68 100644 --- a/src/gpu/mtl/GrMtlPipeline.h +++ b/src/gpu/ganesh/mtl/GrMtlPipeline.h @@ -8,7 +8,7 @@ #ifndef GrMtlPipeline_DEFINED #define GrMtlPipeline_DEFINED -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" #import diff --git a/src/gpu/mtl/GrMtlPipelineState.h b/src/gpu/ganesh/mtl/GrMtlPipelineState.h similarity index 94% rename from src/gpu/mtl/GrMtlPipelineState.h rename to src/gpu/ganesh/mtl/GrMtlPipelineState.h index 05c2322c08..63637e6fdb 100644 --- a/src/gpu/mtl/GrMtlPipelineState.h +++ b/src/gpu/ganesh/mtl/GrMtlPipelineState.h @@ -9,11 +9,11 @@ #define GrMtlPipelineState_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/mtl/GrMtlBuffer.h" -#include "src/gpu/mtl/GrMtlPipeline.h" -#include "src/gpu/mtl/GrMtlPipelineStateDataManager.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlPipeline.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h" #import diff --git a/src/gpu/mtl/GrMtlPipelineState.mm b/src/gpu/ganesh/mtl/GrMtlPipelineState.mm similarity index 94% rename from src/gpu/mtl/GrMtlPipelineState.mm rename to src/gpu/ganesh/mtl/GrMtlPipelineState.mm index 32e2530381..6cbb791ba1 100644 --- a/src/gpu/mtl/GrMtlPipelineState.mm +++ b/src/gpu/ganesh/mtl/GrMtlPipelineState.mm @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlPipelineState.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineState.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/mtl/GrMtlBuffer.h" -#include "src/gpu/mtl/GrMtlFramebuffer.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlRenderCommandEncoder.h" -#include "src/gpu/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/mtl/GrMtlBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlFramebuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlPipelineStateBuilder.h b/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h similarity index 93% rename from src/gpu/mtl/GrMtlPipelineStateBuilder.h rename to src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h index 57142da947..7259925aee 100644 --- a/src/gpu/mtl/GrMtlPipelineStateBuilder.h +++ b/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h @@ -9,10 +9,10 @@ #define GrMtlPipelineStateBuilder_DEFINED #include "include/gpu/GrContextOptions.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/mtl/GrMtlUniformHandler.h" -#include "src/gpu/mtl/GrMtlVaryingHandler.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlUniformHandler.h" +#include "src/gpu/ganesh/mtl/GrMtlVaryingHandler.h" #include "src/sksl/SkSLCompiler.h" #import diff --git a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm b/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm similarity index 98% rename from src/gpu/mtl/GrMtlPipelineStateBuilder.mm rename to src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm index 80a2524d70..21e366fc88 100644 --- a/src/gpu/mtl/GrMtlPipelineStateBuilder.mm +++ b/src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.mm @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlPipelineStateBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkReadBuffer.h" #include "src/core/SkTraceEvent.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPersistentCacheUtils.h" -#include "src/gpu/GrRenderTarget.h" +#include "src/gpu/ganesh/GrAutoLocaleSetter.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrRenderTarget.h" #include "src/utils/SkShaderUtils.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlPipelineState.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineState.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #import diff --git a/src/gpu/mtl/GrMtlPipelineStateDataManager.h b/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h similarity index 93% rename from src/gpu/mtl/GrMtlPipelineStateDataManager.h rename to src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h index 4a4ddda96d..3a07429a7e 100644 --- a/src/gpu/mtl/GrMtlPipelineStateDataManager.h +++ b/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h @@ -9,8 +9,8 @@ #define GrMtlPipelineStateDataManager_DEFINED #include "src/core/SkAutoMalloc.h" -#include "src/gpu/GrUniformDataManager.h" -#include "src/gpu/mtl/GrMtlUniformHandler.h" +#include "src/gpu/ganesh/GrUniformDataManager.h" +#include "src/gpu/ganesh/mtl/GrMtlUniformHandler.h" #import diff --git a/src/gpu/mtl/GrMtlPipelineStateDataManager.mm b/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm similarity index 96% rename from src/gpu/mtl/GrMtlPipelineStateDataManager.mm rename to src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm index d33c3c65c4..658ad69bfd 100644 --- a/src/gpu/mtl/GrMtlPipelineStateDataManager.mm +++ b/src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.mm @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlPipelineStateDataManager.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineStateDataManager.h" -#include "src/gpu/mtl/GrMtlBuffer.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlRenderCommandEncoder.h" +#include "src/gpu/ganesh/mtl/GrMtlBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlRenderCommandEncoder.h b/src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h similarity index 98% rename from src/gpu/mtl/GrMtlRenderCommandEncoder.h rename to src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h index 9558bdef41..8835d1be0e 100644 --- a/src/gpu/mtl/GrMtlRenderCommandEncoder.h +++ b/src/gpu/ganesh/mtl/GrMtlRenderCommandEncoder.h @@ -9,10 +9,10 @@ #define GrMtlRenderCommandEncoder_DEFINED #include -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/mtl/GrMtlSampler.h" -#include "src/gpu/mtl/GrMtlUniformHandler.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/mtl/GrMtlSampler.h" +#include "src/gpu/ganesh/mtl/GrMtlUniformHandler.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" class GrMtlSampler; diff --git a/src/gpu/mtl/GrMtlRenderTarget.h b/src/gpu/ganesh/mtl/GrMtlRenderTarget.h similarity index 95% rename from src/gpu/mtl/GrMtlRenderTarget.h rename to src/gpu/ganesh/mtl/GrMtlRenderTarget.h index c007710d9c..2f4928bd88 100644 --- a/src/gpu/mtl/GrMtlRenderTarget.h +++ b/src/gpu/ganesh/mtl/GrMtlRenderTarget.h @@ -8,12 +8,12 @@ #ifndef GrMtlRenderTarget_DEFINED #define GrMtlRenderTarget_DEFINED -#include "src/gpu/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTarget.h" #include "include/gpu/GrBackendSurface.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/mtl/GrMtlAttachment.h" -#include "src/gpu/mtl/GrMtlFramebuffer.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlAttachment.h" +#include "src/gpu/ganesh/mtl/GrMtlFramebuffer.h" #import diff --git a/src/gpu/mtl/GrMtlRenderTarget.mm b/src/gpu/ganesh/mtl/GrMtlRenderTarget.mm similarity index 95% rename from src/gpu/mtl/GrMtlRenderTarget.mm rename to src/gpu/ganesh/mtl/GrMtlRenderTarget.mm index 90b793fe51..2c7ce83ce8 100644 --- a/src/gpu/mtl/GrMtlRenderTarget.mm +++ b/src/gpu/ganesh/mtl/GrMtlRenderTarget.mm @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderTarget.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/mtl/GrMtlFramebuffer.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/mtl/GrMtlFramebuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlResourceProvider.h b/src/gpu/ganesh/mtl/GrMtlResourceProvider.h similarity index 91% rename from src/gpu/mtl/GrMtlResourceProvider.h rename to src/gpu/ganesh/mtl/GrMtlResourceProvider.h index 49dd254547..2e1c8d8d73 100644 --- a/src/gpu/mtl/GrMtlResourceProvider.h +++ b/src/gpu/ganesh/mtl/GrMtlResourceProvider.h @@ -12,12 +12,12 @@ #include "include/private/SkTArray.h" #include "src/core/SkLRUCache.h" #include "src/core/SkTDynamicHash.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/mtl/GrMtlDepthStencil.h" -#include "src/gpu/mtl/GrMtlPipeline.h" -#include "src/gpu/mtl/GrMtlPipelineStateBuilder.h" -#include "src/gpu/mtl/GrMtlSampler.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlDepthStencil.h" +#include "src/gpu/ganesh/mtl/GrMtlPipeline.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineStateBuilder.h" +#include "src/gpu/ganesh/mtl/GrMtlSampler.h" #import diff --git a/src/gpu/mtl/GrMtlResourceProvider.mm b/src/gpu/ganesh/mtl/GrMtlResourceProvider.mm similarity index 96% rename from src/gpu/mtl/GrMtlResourceProvider.mm rename to src/gpu/ganesh/mtl/GrMtlResourceProvider.mm index 90a4f5e57f..cc70829113 100644 --- a/src/gpu/mtl/GrMtlResourceProvider.mm +++ b/src/gpu/ganesh/mtl/GrMtlResourceProvider.mm @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlResourceProvider.h" +#include "src/gpu/ganesh/mtl/GrMtlResourceProvider.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/mtl/GrMtlCommandBuffer.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlPipelineState.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/mtl/GrMtlCommandBuffer.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlPipelineState.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #include "src/sksl/SkSLCompiler.h" diff --git a/src/gpu/mtl/GrMtlSampler.h b/src/gpu/ganesh/mtl/GrMtlSampler.h similarity index 97% rename from src/gpu/mtl/GrMtlSampler.h rename to src/gpu/ganesh/mtl/GrMtlSampler.h index 32411cccca..943c0f3398 100644 --- a/src/gpu/mtl/GrMtlSampler.h +++ b/src/gpu/ganesh/mtl/GrMtlSampler.h @@ -11,7 +11,7 @@ #import #include "src/core/SkOpts.h" -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" #include class GrSamplerState; diff --git a/src/gpu/mtl/GrMtlSampler.mm b/src/gpu/ganesh/mtl/GrMtlSampler.mm similarity index 97% rename from src/gpu/mtl/GrMtlSampler.mm rename to src/gpu/ganesh/mtl/GrMtlSampler.mm index c6c09a113e..d22380abb3 100644 --- a/src/gpu/mtl/GrMtlSampler.mm +++ b/src/gpu/ganesh/mtl/GrMtlSampler.mm @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlSampler.h" +#include "src/gpu/ganesh/mtl/GrMtlSampler.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlSemaphore.h b/src/gpu/ganesh/mtl/GrMtlSemaphore.h similarity index 95% rename from src/gpu/mtl/GrMtlSemaphore.h rename to src/gpu/ganesh/mtl/GrMtlSemaphore.h index c987470625..5c35e8b789 100644 --- a/src/gpu/mtl/GrMtlSemaphore.h +++ b/src/gpu/ganesh/mtl/GrMtlSemaphore.h @@ -10,9 +10,9 @@ #include "include/gpu/GrBackendSemaphore.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #include diff --git a/src/gpu/mtl/GrMtlSemaphore.mm b/src/gpu/ganesh/mtl/GrMtlSemaphore.mm similarity index 94% rename from src/gpu/mtl/GrMtlSemaphore.mm rename to src/gpu/ganesh/mtl/GrMtlSemaphore.mm index a76cce63d8..f0fa4accaf 100644 --- a/src/gpu/mtl/GrMtlSemaphore.mm +++ b/src/gpu/ganesh/mtl/GrMtlSemaphore.mm @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlSemaphore.h" +#include "src/gpu/ganesh/mtl/GrMtlSemaphore.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlTexture.h b/src/gpu/ganesh/mtl/GrMtlTexture.h similarity index 96% rename from src/gpu/mtl/GrMtlTexture.h rename to src/gpu/ganesh/mtl/GrMtlTexture.h index 461a582683..d80c4ba980 100644 --- a/src/gpu/mtl/GrMtlTexture.h +++ b/src/gpu/ganesh/mtl/GrMtlTexture.h @@ -8,8 +8,8 @@ #ifndef GrMtlTexture_DEFINED #define GrMtlTexture_DEFINED -#include "src/gpu/GrTexture.h" -#include "src/gpu/mtl/GrMtlAttachment.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/mtl/GrMtlAttachment.h" #import class GrMtlGpu; diff --git a/src/gpu/mtl/GrMtlTexture.mm b/src/gpu/ganesh/mtl/GrMtlTexture.mm similarity index 97% rename from src/gpu/mtl/GrMtlTexture.mm rename to src/gpu/ganesh/mtl/GrMtlTexture.mm index 2c31129f11..91d8199edf 100644 --- a/src/gpu/mtl/GrMtlTexture.mm +++ b/src/gpu/ganesh/mtl/GrMtlTexture.mm @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlTextureRenderTarget.h b/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h similarity index 96% rename from src/gpu/mtl/GrMtlTextureRenderTarget.h rename to src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h index 0a0429a660..e5306daa54 100644 --- a/src/gpu/mtl/GrMtlTextureRenderTarget.h +++ b/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h @@ -8,8 +8,8 @@ #ifndef GrMtlTextureRenderTarget_DEFINED #define GrMtlTextureRenderTarget_DEFINED -#include "src/gpu/mtl/GrMtlRenderTarget.h" -#include "src/gpu/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" class GrMtlTextureRenderTarget: public GrMtlTexture, public GrMtlRenderTarget { public: diff --git a/src/gpu/mtl/GrMtlTextureRenderTarget.mm b/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm similarity index 96% rename from src/gpu/mtl/GrMtlTextureRenderTarget.mm rename to src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm index bf2f720f03..bf2b3356d8 100644 --- a/src/gpu/mtl/GrMtlTextureRenderTarget.mm +++ b/src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.mm @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlTextureRenderTarget.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlTrampoline.h b/src/gpu/ganesh/mtl/GrMtlTrampoline.h similarity index 100% rename from src/gpu/mtl/GrMtlTrampoline.h rename to src/gpu/ganesh/mtl/GrMtlTrampoline.h diff --git a/src/gpu/mtl/GrMtlTrampoline.mm b/src/gpu/ganesh/mtl/GrMtlTrampoline.mm similarity index 86% rename from src/gpu/mtl/GrMtlTrampoline.mm rename to src/gpu/ganesh/mtl/GrMtlTrampoline.mm index 840414fee1..fcc7acc7b9 100644 --- a/src/gpu/mtl/GrMtlTrampoline.mm +++ b/src/gpu/ganesh/mtl/GrMtlTrampoline.mm @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlTrampoline.h" +#include "src/gpu/ganesh/mtl/GrMtlTrampoline.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlTypesPriv.mm b/src/gpu/ganesh/mtl/GrMtlTypesPriv.mm similarity index 100% rename from src/gpu/mtl/GrMtlTypesPriv.mm rename to src/gpu/ganesh/mtl/GrMtlTypesPriv.mm diff --git a/src/gpu/mtl/GrMtlUniformHandler.h b/src/gpu/ganesh/mtl/GrMtlUniformHandler.h similarity index 97% rename from src/gpu/mtl/GrMtlUniformHandler.h rename to src/gpu/ganesh/mtl/GrMtlUniformHandler.h index 1b904f2b38..758519c20d 100644 --- a/src/gpu/mtl/GrMtlUniformHandler.h +++ b/src/gpu/ganesh/mtl/GrMtlUniformHandler.h @@ -9,8 +9,8 @@ #define GrMtlUniformHandler_DEFINED #include "src/core/SkTBlockList.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #include diff --git a/src/gpu/mtl/GrMtlUniformHandler.mm b/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm similarity index 98% rename from src/gpu/mtl/GrMtlUniformHandler.mm rename to src/gpu/ganesh/mtl/GrMtlUniformHandler.mm index 99d17a358c..93dec47cc3 100644 --- a/src/gpu/mtl/GrMtlUniformHandler.mm +++ b/src/gpu/ganesh/mtl/GrMtlUniformHandler.mm @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlUniformHandler.h" +#include "src/gpu/ganesh/mtl/GrMtlUniformHandler.h" #include "include/private/GrMtlTypesPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" #if !__has_feature(objc_arc) #error This file must be compiled with Arc. Use -fobjc-arc flag diff --git a/src/gpu/mtl/GrMtlUtil.h b/src/gpu/ganesh/mtl/GrMtlUtil.h similarity index 100% rename from src/gpu/mtl/GrMtlUtil.h rename to src/gpu/ganesh/mtl/GrMtlUtil.h diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/ganesh/mtl/GrMtlUtil.mm similarity index 98% rename from src/gpu/mtl/GrMtlUtil.mm rename to src/gpu/ganesh/mtl/GrMtlUtil.mm index 56e6cc5925..d1f17334f6 100644 --- a/src/gpu/mtl/GrMtlUtil.mm +++ b/src/gpu/ganesh/mtl/GrMtlUtil.mm @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #include "include/gpu/GrBackendSurface.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkMutex.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/mtl/GrMtlGpu.h" -#include "src/gpu/mtl/GrMtlRenderTarget.h" -#include "src/gpu/mtl/GrMtlTexture.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/mtl/GrMtlRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlTexture.h" #include "src/sksl/SkSLCompiler.h" #include "src/utils/SkShaderUtils.h" diff --git a/src/gpu/mtl/GrMtlVaryingHandler.h b/src/gpu/ganesh/mtl/GrMtlVaryingHandler.h similarity index 92% rename from src/gpu/mtl/GrMtlVaryingHandler.h rename to src/gpu/ganesh/mtl/GrMtlVaryingHandler.h index d01bc70977..a897e67d60 100644 --- a/src/gpu/mtl/GrMtlVaryingHandler.h +++ b/src/gpu/ganesh/mtl/GrMtlVaryingHandler.h @@ -8,7 +8,7 @@ #ifndef GrMtlVaryingHandler_DEFINED #define GrMtlVaryingHandler_DEFINED -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" class GrMtlVaryingHandler : public GrGLSLVaryingHandler { public: diff --git a/src/gpu/mtl/GrMtlVaryingHandler.mm b/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm similarity index 96% rename from src/gpu/mtl/GrMtlVaryingHandler.mm rename to src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm index 3d19c0b8b8..4150eca5b0 100644 --- a/src/gpu/mtl/GrMtlVaryingHandler.mm +++ b/src/gpu/ganesh/mtl/GrMtlVaryingHandler.mm @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/mtl/GrMtlVaryingHandler.h" +#include "src/gpu/ganesh/mtl/GrMtlVaryingHandler.h" #include "include/private/GrMtlTypesPriv.h" diff --git a/src/gpu/ops/AAConvexPathRenderer.cpp b/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp similarity index 97% rename from src/gpu/ops/AAConvexPathRenderer.cpp rename to src/gpu/ganesh/ops/AAConvexPathRenderer.cpp index f8e788aa53..611f301ac5 100644 --- a/src/gpu/ops/AAConvexPathRenderer.cpp +++ b/src/gpu/ganesh/ops/AAConvexPathRenderer.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AAConvexPathRenderer.h" +#include "src/gpu/ganesh/ops/AAConvexPathRenderer.h" #include "include/core/SkString.h" #include "include/core/SkTypes.h" @@ -14,23 +14,23 @@ #include "src/core/SkPathPriv.h" #include "src/core/SkPointPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AAConvexPathRenderer.h b/src/gpu/ganesh/ops/AAConvexPathRenderer.h similarity index 93% rename from src/gpu/ops/AAConvexPathRenderer.h rename to src/gpu/ganesh/ops/AAConvexPathRenderer.h index 5acaa0eef0..0d1a33b435 100644 --- a/src/gpu/ops/AAConvexPathRenderer.h +++ b/src/gpu/ganesh/ops/AAConvexPathRenderer.h @@ -8,7 +8,7 @@ #ifndef AAConvexPathRenderer_DEFINED #define AAConvexPathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AAHairLinePathRenderer.cpp b/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp similarity index 98% rename from src/gpu/ops/AAHairLinePathRenderer.cpp rename to src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp index a6bcf70ea7..6a2a79a5f3 100644 --- a/src/gpu/ops/AAHairLinePathRenderer.cpp +++ b/src/gpu/ganesh/ops/AAHairLinePathRenderer.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AAHairLinePathRenderer.h" +#include "src/gpu/ganesh/ops/AAHairLinePathRenderer.h" #include "include/core/SkPoint3.h" #include "include/private/SkTemplates.h" @@ -14,23 +14,23 @@ #include "src/core/SkPointPriv.h" #include "src/core/SkRectPriv.h" #include "src/core/SkStroke.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/effects/GrBezierEffect.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/effects/GrBezierEffect.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #define PREALLOC_PTARRAY(N) SkSTArray<(N),SkPoint, true> diff --git a/src/gpu/ops/AAHairLinePathRenderer.h b/src/gpu/ganesh/ops/AAHairLinePathRenderer.h similarity index 93% rename from src/gpu/ops/AAHairLinePathRenderer.h rename to src/gpu/ganesh/ops/AAHairLinePathRenderer.h index 9d69e402b9..701903509a 100644 --- a/src/gpu/ops/AAHairLinePathRenderer.h +++ b/src/gpu/ganesh/ops/AAHairLinePathRenderer.h @@ -8,7 +8,7 @@ #ifndef AAHairLinePathRenderer_DEFINED #define AAHairLinePathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AALinearizingConvexPathRenderer.cpp b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp similarity index 95% rename from src/gpu/ops/AALinearizingConvexPathRenderer.cpp rename to src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp index a953726df9..ad55a3952c 100644 --- a/src/gpu/ops/AALinearizingConvexPathRenderer.cpp +++ b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.cpp @@ -5,28 +5,28 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AALinearizingConvexPathRenderer.h" +#include "src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h" #include "include/core/SkString.h" #include "src/core/SkGeometry.h" #include "src/core/SkPathPriv.h" #include "src/core/SkTraceEvent.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/geometry/GrAAConvexTessellator.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/geometry/GrAAConvexTessellator.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" /////////////////////////////////////////////////////////////////////////////// namespace skgpu::v1 { diff --git a/src/gpu/ops/AALinearizingConvexPathRenderer.h b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h similarity index 93% rename from src/gpu/ops/AALinearizingConvexPathRenderer.h rename to src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h index cd0a87102e..fc2e877ebf 100644 --- a/src/gpu/ops/AALinearizingConvexPathRenderer.h +++ b/src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h @@ -8,7 +8,7 @@ #ifndef AALinearizingConvexPathRenderer_DEFINED #define AALinearizingConvexPathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AtlasInstancedHelper.cpp b/src/gpu/ganesh/ops/AtlasInstancedHelper.cpp similarity index 95% rename from src/gpu/ops/AtlasInstancedHelper.cpp rename to src/gpu/ganesh/ops/AtlasInstancedHelper.cpp index 23e417e095..f774d616ab 100644 --- a/src/gpu/ops/AtlasInstancedHelper.cpp +++ b/src/gpu/ganesh/ops/AtlasInstancedHelper.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AtlasInstancedHelper.h" +#include "src/gpu/ganesh/ops/AtlasInstancedHelper.h" #include "src/gpu/BufferWriter.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AtlasInstancedHelper.h b/src/gpu/ganesh/ops/AtlasInstancedHelper.h similarity index 96% rename from src/gpu/ops/AtlasInstancedHelper.h rename to src/gpu/ganesh/ops/AtlasInstancedHelper.h index eb166f1d0c..966f3e1b9f 100644 --- a/src/gpu/ops/AtlasInstancedHelper.h +++ b/src/gpu/ganesh/ops/AtlasInstancedHelper.h @@ -9,9 +9,9 @@ #define AtlasInstancedHelper_DEFINED #include "src/core/SkIPoint16.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AtlasPathRenderer.cpp b/src/gpu/ganesh/ops/AtlasPathRenderer.cpp similarity index 97% rename from src/gpu/ops/AtlasPathRenderer.cpp rename to src/gpu/ganesh/ops/AtlasPathRenderer.cpp index ea2d85e96e..86d4846f48 100644 --- a/src/gpu/ops/AtlasPathRenderer.cpp +++ b/src/gpu/ganesh/ops/AtlasPathRenderer.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AtlasPathRenderer.h" +#include "src/gpu/ganesh/ops/AtlasPathRenderer.h" #include "include/private/SkVx.h" #include "src/core/SkIPoint16.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrVx.h" -#include "src/gpu/effects/GrModulateAtlasCoverageEffect.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/AtlasRenderTask.h" -#include "src/gpu/ops/DrawAtlasPathOp.h" -#include "src/gpu/ops/TessellationPathRenderer.h" -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrVx.h" +#include "src/gpu/ganesh/effects/GrModulateAtlasCoverageEffect.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/AtlasRenderTask.h" +#include "src/gpu/ganesh/ops/DrawAtlasPathOp.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" using grvx::float2; using grvx::int2; diff --git a/src/gpu/ops/AtlasPathRenderer.h b/src/gpu/ganesh/ops/AtlasPathRenderer.h similarity index 96% rename from src/gpu/ops/AtlasPathRenderer.h rename to src/gpu/ganesh/ops/AtlasPathRenderer.h index 0588549e7a..2de41234b2 100644 --- a/src/gpu/ops/AtlasPathRenderer.h +++ b/src/gpu/ganesh/ops/AtlasPathRenderer.h @@ -11,10 +11,10 @@ #include "include/gpu/GrTypes.h" #include "include/private/SkTHash.h" #include "src/core/SkIPoint16.h" -#include "src/gpu/GrDynamicAtlas.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/GrDynamicAtlas.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" class GrOp; class GrRecordingContext; diff --git a/src/gpu/ops/AtlasRenderTask.cpp b/src/gpu/ganesh/ops/AtlasRenderTask.cpp similarity index 96% rename from src/gpu/ops/AtlasRenderTask.cpp rename to src/gpu/ganesh/ops/AtlasRenderTask.cpp index 1f421f130c..484b537d02 100644 --- a/src/gpu/ops/AtlasRenderTask.cpp +++ b/src/gpu/ganesh/ops/AtlasRenderTask.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AtlasRenderTask.h" +#include "src/gpu/ganesh/ops/AtlasRenderTask.h" #include "src/core/SkBlendModePriv.h" #include "src/core/SkIPoint16.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsTypes.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/PathStencilCoverOp.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsTypes.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/PathStencilCoverOp.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/AtlasRenderTask.h b/src/gpu/ganesh/ops/AtlasRenderTask.h similarity index 96% rename from src/gpu/ops/AtlasRenderTask.h rename to src/gpu/ganesh/ops/AtlasRenderTask.h index 1c106a25c5..13e2d5af36 100644 --- a/src/gpu/ops/AtlasRenderTask.h +++ b/src/gpu/ganesh/ops/AtlasRenderTask.h @@ -10,9 +10,9 @@ #include "include/core/SkPath.h" #include "src/core/SkTBlockList.h" -#include "src/gpu/GrDynamicAtlas.h" -#include "src/gpu/ops/OpsTask.h" -#include "src/gpu/ops/PathTessellator.h" +#include "src/gpu/ganesh/GrDynamicAtlas.h" +#include "src/gpu/ganesh/ops/OpsTask.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" struct SkIPoint16; diff --git a/src/gpu/ops/AtlasTextOp.cpp b/src/gpu/ganesh/ops/AtlasTextOp.cpp similarity index 97% rename from src/gpu/ops/AtlasTextOp.cpp rename to src/gpu/ganesh/ops/AtlasTextOp.cpp index b8e5ee9f35..3153b0bd97 100644 --- a/src/gpu/ops/AtlasTextOp.cpp +++ b/src/gpu/ganesh/ops/AtlasTextOp.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/AtlasTextOp.h" +#include "src/gpu/ganesh/ops/AtlasTextOp.h" #include "include/core/SkPoint3.h" #include "include/core/SkSpan.h" @@ -14,18 +14,18 @@ #include "src/core/SkMatrixPriv.h" #include "src/core/SkMatrixProvider.h" #include "src/core/SkStrikeCache.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBitmapTextGeoProc.h" -#include "src/gpu/effects/GrDistanceFieldGeoProc.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/text/GrAtlasManager.h" -#include "src/gpu/text/GrDistanceFieldAdjustTable.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBitmapTextGeoProc.h" +#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrDistanceFieldAdjustTable.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include #include @@ -483,7 +483,7 @@ GrGeometryProcessor* AtlasTextOp::setupDfProcessor(SkArenaAlloc* arena, } #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" GrOp::Owner AtlasTextOp::CreateOpTestingOnly(SurfaceDrawContext* sdc, const SkPaint& skPaint, diff --git a/src/gpu/ops/AtlasTextOp.h b/src/gpu/ganesh/ops/AtlasTextOp.h similarity index 98% rename from src/gpu/ops/AtlasTextOp.h rename to src/gpu/ganesh/ops/AtlasTextOp.h index a684125855..a656933c41 100644 --- a/src/gpu/ops/AtlasTextOp.h +++ b/src/gpu/ganesh/ops/AtlasTextOp.h @@ -8,9 +8,9 @@ #ifndef AtlasTextOp_DEFINED #define AtlasTextOp_DEFINED -#include "src/gpu/effects/GrDistanceFieldGeoProc.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/text/GrTextBlob.h" +#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" class GrRecordingContext; diff --git a/src/gpu/ops/BUILD.bazel b/src/gpu/ganesh/ops/BUILD.bazel similarity index 55% rename from src/gpu/ops/BUILD.bazel rename to src/gpu/ganesh/ops/BUILD.bazel index 31ebf37469..3ef4052033 100644 --- a/src/gpu/ops/BUILD.bazel +++ b/src/gpu/ganesh/ops/BUILD.bazel @@ -4,7 +4,7 @@ generated_cc_atom( name = "AAConvexPathRenderer_hdr", hdrs = ["AAConvexPathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -22,21 +22,21 @@ generated_cc_atom( "//src/core:SkPathPriv_hdr", "//src/core:SkPointPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -44,7 +44,7 @@ generated_cc_atom( name = "AAHairLinePathRenderer_hdr", hdrs = ["AAHairLinePathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -62,21 +62,21 @@ generated_cc_atom( "//src/core:SkPointPriv_hdr", "//src/core:SkRectPriv_hdr", "//src/core:SkStroke_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu/effects:GrBezierEffect_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrBuffer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh/effects:GrBezierEffect_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -84,7 +84,7 @@ generated_cc_atom( name = "AALinearizingConvexPathRenderer_hdr", hdrs = ["AALinearizingConvexPathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -100,19 +100,19 @@ generated_cc_atom( "//src/core:SkPathPriv_hdr", "//src/core:SkTraceEvent_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu/geometry:GrAAConvexTessellator_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh/geometry:GrAAConvexTessellator_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -122,9 +122,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkIPoint16_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -136,9 +136,9 @@ generated_cc_atom( ":AtlasInstancedHelper_hdr", "//src/gpu:BufferWriter_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -150,10 +150,10 @@ generated_cc_atom( "//include/gpu:GrTypes_hdr", "//include/private:SkTHash_hdr", "//src/core:SkIPoint16_hdr", - "//src/gpu:GrDynamicAtlas_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrOnFlushResourceProvider_hdr", - "//src/gpu/v1:PathRenderer_hdr", + "//src/gpu/ganesh:GrDynamicAtlas_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrOnFlushResourceProvider_hdr", + "//src/gpu/ganesh/v1:PathRenderer_hdr", ], ) @@ -168,13 +168,13 @@ generated_cc_atom( ":TessellationPathRenderer_hdr", "//include/private:SkVx_hdr", "//src/core:SkIPoint16_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrVx_hdr", - "//src/gpu/effects:GrModulateAtlasCoverageEffect_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/tessellate/shaders:GrTessellationShader_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrVx_hdr", + "//src/gpu/ganesh/effects:GrModulateAtlasCoverageEffect_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrTessellationShader_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -187,7 +187,7 @@ generated_cc_atom( ":PathTessellator_hdr", "//include/core:SkPath_hdr", "//src/core:SkTBlockList_hdr", - "//src/gpu:GrDynamicAtlas_hdr", + "//src/gpu/ganesh:GrDynamicAtlas_hdr", ], ) @@ -201,10 +201,10 @@ generated_cc_atom( ":PathStencilCoverOp_hdr", "//src/core:SkBlendModePriv_hdr", "//src/core:SkIPoint16_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsTypes_hdr", - "//src/gpu/geometry:GrQuad_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsTypes_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", ], ) @@ -214,8 +214,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMeshDrawOp_hdr", - "//src/gpu/effects:GrDistanceFieldGeoProc_hdr", - "//src/gpu/text:GrTextBlob_hdr", + "//src/gpu/ganesh/effects:GrDistanceFieldGeoProc_hdr", + "//src/gpu/ganesh/text:GrTextBlob_hdr", ], ) @@ -233,18 +233,18 @@ generated_cc_atom( "//src/core:SkMatrixPriv_hdr", "//src/core:SkMatrixProvider_hdr", "//src/core:SkStrikeCache_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBitmapTextGeoProc_hdr", - "//src/gpu/effects:GrDistanceFieldGeoProc_hdr", - "//src/gpu/text:GrAtlasManager_hdr", - "//src/gpu/text:GrDistanceFieldAdjustTable_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBitmapTextGeoProc_hdr", + "//src/gpu/ganesh/effects:GrDistanceFieldGeoProc_hdr", + "//src/gpu/ganesh/text:GrAtlasManager_hdr", + "//src/gpu/ganesh/text:GrDistanceFieldAdjustTable_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -255,7 +255,7 @@ generated_cc_atom( deps = [ ":GrOp_hdr", "//include/gpu:GrTypes_hdr", - "//src/gpu:GrScissorState_hdr", + "//src/gpu/ganesh:GrScissorState_hdr", ], ) @@ -266,11 +266,11 @@ generated_cc_atom( deps = [ ":ClearOp_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", ], ) @@ -278,7 +278,7 @@ generated_cc_atom( name = "DashLinePathRenderer_hdr", hdrs = ["DashLinePathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -289,10 +289,10 @@ generated_cc_atom( ":DashLinePathRenderer_hdr", ":DashOp_hdr", ":GrMeshDrawOp_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -318,25 +318,25 @@ generated_cc_atom( "//src/core:SkMatrixPriv_hdr", "//src/core:SkPointPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrStyle_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -344,7 +344,7 @@ generated_cc_atom( name = "DefaultPathRenderer_hdr", hdrs = ["DefaultPathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -362,20 +362,20 @@ generated_cc_atom( "//src/core:SkMatrixPriv_hdr", "//src/core:SkTLazy_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrSimpleMesh_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu/effects:GrDisableColorXP_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrSimpleMesh_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh/effects:GrDisableColorXP_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -402,13 +402,13 @@ generated_cc_atom( "//include/utils:SkRandom_hdr", "//src/core:SkMatrixPriv_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -430,15 +430,15 @@ generated_cc_atom( deps = [ ":DrawAtlasPathOp_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -460,10 +460,10 @@ generated_cc_atom( ":DrawableOp_hdr", "//include/core:SkDrawable_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", ], ) @@ -495,21 +495,21 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//src/core:SkRRectPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrVx_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/geometry:GrShape_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrVx_hdr", + "//src/gpu/ganesh/geometry:GrShape_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -534,19 +534,19 @@ generated_cc_atom( ":QuadPerEdgeAA_hdr", "//include/core:SkMatrix_hdr", "//include/core:SkRect_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrOpsTypes_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/geometry:GrQuadBuffer_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrOpsTypes_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/geometry:GrQuadBuffer_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/glsl:GrGLSLColorSpaceXformHelper_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -557,8 +557,8 @@ generated_cc_atom( deps = [ ":GrOp_hdr", "//src/core:SkIPoint16_hdr", - "//src/gpu:GrDeferredUpload_hdr", - "//src/gpu:GrPipeline_hdr", + "//src/gpu/ganesh:GrDeferredUpload_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", ], ) @@ -568,8 +568,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrDrawOp_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", ], ) @@ -579,10 +579,10 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrMeshDrawOp_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", ], ) @@ -595,11 +595,11 @@ generated_cc_atom( "//include/core:SkRect_hdr", "//include/core:SkString_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrGpuResource_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrTracing_hdr", - "//src/gpu:GrXferProcessor_hdr", + "//src/gpu/ganesh:GrGpuResource_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrTracing_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", ], ) @@ -617,7 +617,7 @@ generated_cc_atom( deps = [ ":GrOp_hdr", "//include/core:SkRefCnt_hdr", - "//src/gpu:GrColor_hdr", + "//src/gpu/ganesh:GrColor_hdr", ], ) @@ -633,21 +633,21 @@ generated_cc_atom( "//src/core:SkMatrixPriv_hdr", "//src/core:SkRRectPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrStyle_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -655,7 +655,7 @@ generated_cc_atom( name = "GrPathStencilSettings_hdr", hdrs = ["GrPathStencilSettings.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrUserStencilSettings_hdr"], + deps = ["//src/gpu/ganesh:GrUserStencilSettings_hdr"], ) generated_cc_atom( @@ -680,10 +680,10 @@ generated_cc_atom( ":GrMeshDrawOp_hdr", ":GrOp_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", ], ) @@ -693,12 +693,12 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrSimpleMeshDrawOpHelper_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrUserStencilSettings_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/geometry:GrRect_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrUserStencilSettings_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", ], ) @@ -709,7 +709,7 @@ generated_cc_atom( deps = [ ":GrOp_hdr", "//include/core:SkRefCnt_hdr", - "//src/gpu:GrSamplerState_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", ], ) @@ -726,20 +726,20 @@ generated_cc_atom( "//src/core:SkLatticeIter_hdr", "//src/core:SkMatrixPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProviderPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProviderPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/glsl:GrGLSLColorSpaceXformHelper_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", ], ) @@ -761,11 +761,11 @@ generated_cc_atom( "//src/core:SkClipStack_hdr", "//src/core:SkStringUtils_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrDstProxyView_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrRenderTask_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrDstProxyView_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrRenderTask_hdr", ], ) @@ -779,19 +779,19 @@ generated_cc_atom( "//src/core:SkRectPriv_hdr", "//src/core:SkScopeExit_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrAttachment_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceAllocator_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/geometry:GrRect_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceAllocator_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", ], ) @@ -802,8 +802,8 @@ generated_cc_atom( deps = [ ":FillPathFlags_hdr", ":GrDrawOp_hdr", - "//src/gpu/geometry:GrInnerFanTriangulator_hdr", - "//src/gpu/tessellate/shaders:GrTessellationShader_hdr", + "//src/gpu/ganesh/geometry:GrInnerFanTriangulator_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrTessellationShader_hdr", ], ) @@ -814,13 +814,13 @@ generated_cc_atom( deps = [ ":PathInnerTriangulateOp_hdr", ":PathTessellator_hdr", - "//src/gpu:GrEagerVertexAllocator_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/tessellate/shaders:GrPathTessellationShader_hdr", + "//src/gpu/ganesh:GrEagerVertexAllocator_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrPathTessellationShader_hdr", ], ) @@ -832,7 +832,7 @@ generated_cc_atom( ":FillPathFlags_hdr", ":GrDrawOp_hdr", ":PathTessellator_hdr", - "//src/gpu/tessellate/shaders:GrTessellationShader_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrTessellationShader_hdr", ], ) @@ -843,19 +843,19 @@ generated_cc_atom( deps = [ ":GrSimpleMeshDrawOpHelper_hdr", ":PathStencilCoverOp_hdr", - "//src/gpu:GrEagerVertexAllocator_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrEagerVertexAllocator_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrPathTessellationShader_hdr", "//src/gpu/tessellate:AffineMatrix_hdr", "//src/gpu/tessellate:FixedCountBufferUtils_hdr", "//src/gpu/tessellate:MiddleOutPolygonTriangulator_hdr", "//src/gpu/tessellate:Tessellation_hdr", - "//src/gpu/tessellate/shaders:GrPathTessellationShader_hdr", ], ) @@ -866,8 +866,8 @@ generated_cc_atom( deps = [ ":GrDrawOp_hdr", ":PathTessellator_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrTessellationShader_hdr", "//src/gpu/tessellate:Tessellation_hdr", - "//src/gpu/tessellate/shaders:GrTessellationShader_hdr", ], ) @@ -877,9 +877,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":PathTessellateOp_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu/tessellate/shaders:GrPathTessellationShader_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrPathTessellationShader_hdr", ], ) @@ -893,11 +893,11 @@ generated_cc_atom( "//include/core:SkPoint_hdr", "//include/private:GrTypesPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/geometry:GrQuad_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", ], ) @@ -908,15 +908,15 @@ generated_cc_atom( deps = [ ":QuadPerEdgeAA_hdr", "//include/private:SkVx_hdr", - "//src/gpu:GrMeshDrawTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrMeshDrawTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/glsl:GrGLSLColorSpaceXformHelper_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -941,12 +941,12 @@ generated_cc_atom( "//include/core:SkRegion_hdr", "//src/core:SkMatrixPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", ], ) @@ -956,7 +956,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrOp_hdr", - "//src/gpu:GrColor_hdr", + "//src/gpu/ganesh:GrColor_hdr", ], ) @@ -970,15 +970,15 @@ generated_cc_atom( "//include/core:SkBitmap_hdr", "//include/gpu:GrRecordingContext_hdr", "//src/core:SkRRectPriv_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrThreadSafeCache_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrShadowGeoProc_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrThreadSafeCache_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrShadowGeoProc_hdr", ], ) @@ -989,8 +989,8 @@ generated_cc_atom( deps = [ "//src/core:SkTDynamicHash_hdr", "//src/core:SkTInternalLList_hdr", - "//src/gpu:GrDrawOpAtlas_hdr", - "//src/gpu:GrOnFlushResourceProvider_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh:GrOnFlushResourceProvider_hdr", ], ) @@ -1001,7 +1001,7 @@ generated_cc_atom( deps = [ ":SmallPathAtlasMgr_hdr", ":SmallPathShapeData_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) @@ -1009,7 +1009,7 @@ generated_cc_atom( name = "SmallPathRenderer_hdr", hdrs = ["SmallPathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -1031,16 +1031,16 @@ generated_cc_atom( "//src/core:SkPointPriv_hdr", "//src/core:SkRasterClip_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrBuffer_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDistanceFieldGenFromVector_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu/effects:GrBitmapTextGeoProc_hdr", - "//src/gpu/effects:GrDistanceFieldGeoProc_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrBuffer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDistanceFieldGenFromVector_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/effects:GrBitmapTextGeoProc_hdr", + "//src/gpu/ganesh/effects:GrDistanceFieldGeoProc_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1050,7 +1050,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkOpts_hdr", - "//src/gpu:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", ], ) @@ -1061,7 +1061,7 @@ generated_cc_atom( deps = [ ":SmallPathShapeData_hdr", "//include/private:SkFixed_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) @@ -1070,8 +1070,8 @@ generated_cc_atom( hdrs = ["SoftwarePathRenderer.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu/v1:PathRenderer_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh/v1:PathRenderer_hdr", ], ) @@ -1086,21 +1086,21 @@ generated_cc_atom( "//include/private:SkSemaphore_hdr", "//src/core:SkTaskGroup_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDeferredProxyUploader_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSWMaskHelper_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDeferredProxyUploader_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSWMaskHelper_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1127,15 +1127,15 @@ generated_cc_atom( "//include/utils:SkRandom_hdr", "//src/core:SkMatrixPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", "//src/gpu:ResourceKey_hdr", - "//src/gpu/geometry:GrQuad_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", ], ) @@ -1147,7 +1147,7 @@ generated_cc_atom( ":GrDrawOp_hdr", ":StrokeTessellator_hdr", "//include/core:SkStrokeRec_hdr", - "//src/gpu/tessellate/shaders:GrTessellationShader_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrTessellationShader_hdr", ], ) @@ -1159,10 +1159,10 @@ generated_cc_atom( ":StrokeTessellateOp_hdr", "//src/core:SkMathPriv_hdr", "//src/core:SkPathPriv_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/tessellate/shaders:GrStrokeTessellationShader_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/tessellate/shaders:GrStrokeTessellationShader_hdr", ], ) @@ -1172,7 +1172,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu:GrTypes_hdr", - "//src/gpu/v1:PathRenderer_hdr", + "//src/gpu/ganesh/v1:PathRenderer_hdr", ], ) @@ -1188,15 +1188,15 @@ generated_cc_atom( ":TessellationPathRenderer_hdr", "//include/private:SkVx_hdr", "//src/core:SkPathPriv_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrVx_hdr", - "//src/gpu/effects:GrDisableColorXP_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrVx_hdr", + "//src/gpu/ganesh/effects:GrDisableColorXP_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//src/gpu/tessellate:Tessellation_hdr", "//src/gpu/tessellate:WangsFormula_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1209,8 +1209,8 @@ generated_cc_atom( "//include/core:SkCanvas_hdr", "//include/core:SkRefCnt_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrSamplerState_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", ], ) @@ -1232,30 +1232,30 @@ generated_cc_atom( "//src/core:SkMathPriv_hdr", "//src/core:SkMatrixPriv_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsTypes_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProviderPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrQuadBuffer_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/geometry:GrRect_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsTypes_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProviderPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrQuadBuffer_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1263,7 +1263,7 @@ generated_cc_atom( name = "TriangulatingPathRenderer_hdr", hdrs = ["TriangulatingPathRenderer.h"], visibility = ["//:__subpackages__"], - deps = ["//src/gpu/v1:PathRenderer_hdr"], + deps = ["//src/gpu/ganesh/v1:PathRenderer_hdr"], ) generated_cc_atom( @@ -1276,24 +1276,24 @@ generated_cc_atom( ":TriangulatingPathRenderer_hdr", "//include/private:SkIDChangeListener_hdr", "//src/core:SkGeometry_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrEagerVertexAllocator_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceCache_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSimpleMesh_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrThreadSafeCache_hdr", - "//src/gpu/geometry:GrAATriangulator_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/geometry:GrTriangulator_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrEagerVertexAllocator_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSimpleMesh_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrThreadSafeCache_hdr", + "//src/gpu/ganesh/geometry:GrAATriangulator_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/geometry:GrTriangulator_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1322,14 +1322,14 @@ generated_cc_atom( "//src/core:SkCustomMeshPriv_hdr", "//src/core:SkVerticesPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLColorSpaceXformHelper_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh/glsl:GrGLSLColorSpaceXformHelper_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", "//src/sksl/codegen:SkSLPipelineStageCodeGenerator_hdr", "//src/sksl/ir:SkSLProgram_hdr", ], @@ -1341,9 +1341,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/core:SkArenaAlloc_hdr", - "//src/gpu:GrGpuBuffer_hdr", - "//src/gpu:GrVertexChunkArray_hdr", - "//src/gpu/geometry:GrInnerFanTriangulator_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrVertexChunkArray_hdr", + "//src/gpu/ganesh/geometry:GrInnerFanTriangulator_hdr", "//src/gpu/tessellate:FixedCountBufferUtils_hdr", "//src/gpu/tessellate:Tessellation_hdr", ], @@ -1356,9 +1356,9 @@ generated_cc_atom( deps = [ ":PathTessellator_hdr", "//src/core:SkPathPriv_hdr", - "//src/gpu:GrMeshDrawTarget_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrMeshDrawTarget_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", "//src/gpu/tessellate:AffineMatrix_hdr", "//src/gpu/tessellate:FixedCountBufferUtils_hdr", "//src/gpu/tessellate:MiddleOutPolygonTriangulator_hdr", @@ -1377,7 +1377,7 @@ generated_cc_atom( "//include/core:SkStrokeRec_hdr", "//include/private:SkColorData_hdr", "//src/core:SkMathPriv_hdr", - "//src/gpu:GrVertexChunkArray_hdr", + "//src/gpu/ganesh:GrVertexChunkArray_hdr", "//src/gpu/tessellate:FixedCountBufferUtils_hdr", "//src/gpu/tessellate:Tessellation_hdr", ], @@ -1391,9 +1391,9 @@ generated_cc_atom( ":StrokeTessellator_hdr", "//src/core:SkGeometry_hdr", "//src/core:SkPathPriv_hdr", - "//src/gpu:GrMeshDrawTarget_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrMeshDrawTarget_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", "//src/gpu/tessellate:PatchWriter_hdr", "//src/gpu/tessellate:StrokeIterator_hdr", "//src/gpu/tessellate:WangsFormula_hdr", diff --git a/src/gpu/ops/ClearOp.cpp b/src/gpu/ganesh/ops/ClearOp.cpp similarity index 92% rename from src/gpu/ops/ClearOp.cpp rename to src/gpu/ganesh/ops/ClearOp.cpp index 33fb97eeb9..b0c85920ca 100644 --- a/src/gpu/ops/ClearOp.cpp +++ b/src/gpu/ganesh/ops/ClearOp.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/ClearOp.h" +#include "src/gpu/ganesh/ops/ClearOp.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" namespace { diff --git a/src/gpu/ops/ClearOp.h b/src/gpu/ganesh/ops/ClearOp.h similarity index 96% rename from src/gpu/ops/ClearOp.h rename to src/gpu/ganesh/ops/ClearOp.h index 26854c6dfe..7a231243ab 100644 --- a/src/gpu/ops/ClearOp.h +++ b/src/gpu/ganesh/ops/ClearOp.h @@ -9,8 +9,8 @@ #define ClearOp_DEFINED #include "include/gpu/GrTypes.h" -#include "src/gpu/GrScissorState.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrScissorState.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrOpFlushState; class GrRecordingContext; diff --git a/src/gpu/ops/DashLinePathRenderer.cpp b/src/gpu/ganesh/ops/DashLinePathRenderer.cpp similarity index 85% rename from src/gpu/ops/DashLinePathRenderer.cpp rename to src/gpu/ganesh/ops/DashLinePathRenderer.cpp index ccfd5bad65..c4601862a5 100644 --- a/src/gpu/ops/DashLinePathRenderer.cpp +++ b/src/gpu/ganesh/ops/DashLinePathRenderer.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DashLinePathRenderer.h" +#include "src/gpu/ganesh/ops/DashLinePathRenderer.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/DashOp.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/DashOp.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/DashLinePathRenderer.h b/src/gpu/ganesh/ops/DashLinePathRenderer.h similarity index 94% rename from src/gpu/ops/DashLinePathRenderer.h rename to src/gpu/ganesh/ops/DashLinePathRenderer.h index fa1134b10c..67dc342d56 100644 --- a/src/gpu/ops/DashLinePathRenderer.h +++ b/src/gpu/ganesh/ops/DashLinePathRenderer.h @@ -8,7 +8,7 @@ #ifndef DashLinePathRenderer_DEFINED #define DashLinePathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" class GrGpu; diff --git a/src/gpu/ops/DashOp.cpp b/src/gpu/ganesh/ops/DashOp.cpp similarity index 98% rename from src/gpu/ops/DashOp.cpp rename to src/gpu/ganesh/ops/DashOp.cpp index efc8895e03..5f4400413f 100644 --- a/src/gpu/ops/DashOp.cpp +++ b/src/gpu/ganesh/ops/DashOp.cpp @@ -5,32 +5,32 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DashOp.h" +#include "src/gpu/ganesh/ops/DashOp.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkMatrixPriv.h" #include "src/core/SkPointPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrStyle.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" using AAMode = skgpu::v1::DashOp::AAMode; @@ -1228,7 +1228,7 @@ bool CanDrawDashLine(const SkPoint pts[2], const GrStyle& style, const SkMatrix& #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" GR_DRAW_OP_TEST_DEFINE(DashOpImpl) { SkMatrix viewMatrix = GrTest::TestMatrixPreservesRightAngles(random); diff --git a/src/gpu/ops/DashOp.h b/src/gpu/ganesh/ops/DashOp.h similarity index 96% rename from src/gpu/ops/DashOp.h rename to src/gpu/ganesh/ops/DashOp.h index 18f9b9e0ff..37e5368769 100644 --- a/src/gpu/ops/DashOp.h +++ b/src/gpu/ganesh/ops/DashOp.h @@ -9,7 +9,7 @@ #define DashOp_DEFINED #include "include/gpu/GrTypes.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrPaint; class GrRecordingContext; diff --git a/src/gpu/ops/DefaultPathRenderer.cpp b/src/gpu/ganesh/ops/DefaultPathRenderer.cpp similarity index 97% rename from src/gpu/ops/DefaultPathRenderer.cpp rename to src/gpu/ganesh/ops/DefaultPathRenderer.cpp index 77c0b7d554..924cb9933f 100644 --- a/src/gpu/ops/DefaultPathRenderer.cpp +++ b/src/gpu/ganesh/ops/DefaultPathRenderer.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DefaultPathRenderer.h" +#include "src/gpu/ganesh/ops/DefaultPathRenderer.h" #include "include/core/SkString.h" #include "include/core/SkStrokeRec.h" @@ -13,23 +13,23 @@ #include "src/core/SkMatrixPriv.h" #include "src/core/SkTLazy.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrSimpleMesh.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/effects/GrDisableColorXP.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrPathStencilSettings.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrSimpleMesh.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrPathStencilSettings.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" //////////////////////////////////////////////////////////////////////////////// // Helpers for drawPath diff --git a/src/gpu/ops/DefaultPathRenderer.h b/src/gpu/ganesh/ops/DefaultPathRenderer.h similarity index 96% rename from src/gpu/ops/DefaultPathRenderer.h rename to src/gpu/ganesh/ops/DefaultPathRenderer.h index afbe17f33f..5294efb65b 100644 --- a/src/gpu/ops/DefaultPathRenderer.h +++ b/src/gpu/ganesh/ops/DefaultPathRenderer.h @@ -8,7 +8,7 @@ #ifndef DefaultPathRenderer_DEFINED #define DefaultPathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/DrawAtlasOp.cpp b/src/gpu/ganesh/ops/DrawAtlasOp.cpp similarity index 97% rename from src/gpu/ops/DrawAtlasOp.cpp rename to src/gpu/ganesh/ops/DrawAtlasOp.cpp index 4df1f8b6d7..29cde62789 100644 --- a/src/gpu/ops/DrawAtlasOp.cpp +++ b/src/gpu/ganesh/ops/DrawAtlasOp.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DrawAtlasOp.h" +#include "src/gpu/ganesh/ops/DrawAtlasOp.h" #include "include/core/SkRSXform.h" #include "include/gpu/GrRecordingContext.h" #include "include/utils/SkRandom.h" #include "src/core/SkMatrixPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" namespace { @@ -326,7 +326,7 @@ GrOp::Owner Make(GrRecordingContext* context, } // namespace skgpu::v1::DrawAtlasOp #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" static SkRSXform random_xform(SkRandom* random) { static const SkScalar kMinExtent = -100.f; diff --git a/src/gpu/ops/DrawAtlasOp.h b/src/gpu/ganesh/ops/DrawAtlasOp.h similarity index 95% rename from src/gpu/ops/DrawAtlasOp.h rename to src/gpu/ganesh/ops/DrawAtlasOp.h index 9665f806ba..4ccd9103a0 100644 --- a/src/gpu/ops/DrawAtlasOp.h +++ b/src/gpu/ganesh/ops/DrawAtlasOp.h @@ -10,7 +10,7 @@ #include "include/core/SkRefCnt.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrPaint; class GrRecordingContext; diff --git a/src/gpu/ops/DrawAtlasPathOp.cpp b/src/gpu/ganesh/ops/DrawAtlasPathOp.cpp similarity index 95% rename from src/gpu/ops/DrawAtlasPathOp.cpp rename to src/gpu/ganesh/ops/DrawAtlasPathOp.cpp index f362a8a44f..0d4702e777 100644 --- a/src/gpu/ops/DrawAtlasPathOp.cpp +++ b/src/gpu/ganesh/ops/DrawAtlasPathOp.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DrawAtlasPathOp.h" +#include "src/gpu/ganesh/ops/DrawAtlasPathOp.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" namespace { diff --git a/src/gpu/ops/DrawAtlasPathOp.h b/src/gpu/ganesh/ops/DrawAtlasPathOp.h similarity index 97% rename from src/gpu/ops/DrawAtlasPathOp.h rename to src/gpu/ganesh/ops/DrawAtlasPathOp.h index 659686b9dc..8941f5a134 100644 --- a/src/gpu/ops/DrawAtlasPathOp.h +++ b/src/gpu/ganesh/ops/DrawAtlasPathOp.h @@ -9,8 +9,8 @@ #define DrawAtlasPathOp_DEFINED #include "src/core/SkIPoint16.h" -#include "src/gpu/ops/AtlasInstancedHelper.h" -#include "src/gpu/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/AtlasInstancedHelper.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/DrawCustomMeshOp.cpp b/src/gpu/ganesh/ops/DrawCustomMeshOp.cpp similarity index 98% rename from src/gpu/ops/DrawCustomMeshOp.cpp rename to src/gpu/ganesh/ops/DrawCustomMeshOp.cpp index 80e64c0a3d..42f6a053a4 100644 --- a/src/gpu/ops/DrawCustomMeshOp.cpp +++ b/src/gpu/ganesh/ops/DrawCustomMeshOp.cpp @@ -5,22 +5,22 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DrawCustomMeshOp.h" +#include "src/gpu/ganesh/ops/DrawCustomMeshOp.h" #include "include/core/SkCustomMesh.h" #include "src/core/SkArenaAlloc.h" #include "src/core/SkCustomMeshPriv.h" #include "src/core/SkVerticesPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" #include "src/sksl/codegen/SkSLPipelineStageCodeGenerator.h" #include "src/sksl/ir/SkSLProgram.h" diff --git a/src/gpu/ops/DrawCustomMeshOp.h b/src/gpu/ganesh/ops/DrawCustomMeshOp.h similarity index 96% rename from src/gpu/ops/DrawCustomMeshOp.h rename to src/gpu/ganesh/ops/DrawCustomMeshOp.h index 1e10ecf624..b21793c79d 100644 --- a/src/gpu/ops/DrawCustomMeshOp.h +++ b/src/gpu/ganesh/ops/DrawCustomMeshOp.h @@ -12,7 +12,7 @@ #include "include/core/SkCustomMesh.h" #include "include/core/SkRefCnt.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrColorSpaceXform; class GrPaint; diff --git a/src/gpu/ops/DrawableOp.cpp b/src/gpu/ganesh/ops/DrawableOp.cpp similarity index 81% rename from src/gpu/ops/DrawableOp.cpp rename to src/gpu/ganesh/ops/DrawableOp.cpp index 679b914853..37e631e717 100644 --- a/src/gpu/ops/DrawableOp.cpp +++ b/src/gpu/ganesh/ops/DrawableOp.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/DrawableOp.h" +#include "src/gpu/ganesh/ops/DrawableOp.h" #include "include/core/SkDrawable.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/DrawableOp.h b/src/gpu/ganesh/ops/DrawableOp.h similarity index 97% rename from src/gpu/ops/DrawableOp.h rename to src/gpu/ganesh/ops/DrawableOp.h index 3dd1d941cd..72a94ba932 100644 --- a/src/gpu/ops/DrawableOp.h +++ b/src/gpu/ganesh/ops/DrawableOp.h @@ -9,7 +9,7 @@ #define DrawableOp_DEFINED #include "include/core/SkDrawable.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrRecordingContext; diff --git a/src/gpu/ops/FillPathFlags.h b/src/gpu/ganesh/ops/FillPathFlags.h similarity index 100% rename from src/gpu/ops/FillPathFlags.h rename to src/gpu/ganesh/ops/FillPathFlags.h diff --git a/src/gpu/ops/FillRRectOp.cpp b/src/gpu/ganesh/ops/FillRRectOp.cpp similarity index 98% rename from src/gpu/ops/FillRRectOp.cpp rename to src/gpu/ganesh/ops/FillRRectOp.cpp index b9e0d7f526..da883ab8c8 100644 --- a/src/gpu/ops/FillRRectOp.cpp +++ b/src/gpu/ganesh/ops/FillRRectOp.cpp @@ -5,27 +5,27 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/FillRRectOp.h" +#include "src/gpu/ganesh/ops/FillRRectOp.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkRRectPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrVx.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/geometry/GrShape.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrVx.h" +#include "src/gpu/ganesh/geometry/GrShape.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" namespace skgpu::v1::FillRRectOp { @@ -922,7 +922,7 @@ GrOp::Owner Make(GrRecordingContext* ctx, #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" GR_DRAW_OP_TEST_DEFINE(FillRRectOp) { SkArenaAlloc arena(64 * sizeof(float)); diff --git a/src/gpu/ops/FillRRectOp.h b/src/gpu/ganesh/ops/FillRRectOp.h similarity index 96% rename from src/gpu/ops/FillRRectOp.h rename to src/gpu/ganesh/ops/FillRRectOp.h index 0443b0f55d..af1b4ba5d8 100644 --- a/src/gpu/ops/FillRRectOp.h +++ b/src/gpu/ganesh/ops/FillRRectOp.h @@ -9,7 +9,7 @@ #define FillRRectOp_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrCaps; class GrPaint; diff --git a/src/gpu/ops/FillRectOp.cpp b/src/gpu/ganesh/ops/FillRectOp.cpp similarity index 96% rename from src/gpu/ops/FillRectOp.cpp rename to src/gpu/ganesh/ops/FillRectOp.cpp index b08899162c..e15c8103fa 100644 --- a/src/gpu/ops/FillRectOp.cpp +++ b/src/gpu/ganesh/ops/FillRectOp.cpp @@ -5,25 +5,25 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" #include "include/core/SkMatrix.h" #include "include/core/SkRect.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrOpsTypes.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrQuadBuffer.h" -#include "src/gpu/geometry/GrQuadUtils.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/ops/QuadPerEdgeAA.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrOpsTypes.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuadBuffer.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/ops/QuadPerEdgeAA.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { @@ -559,8 +559,8 @@ uint32_t skgpu::v1::FillRectOp::ClassID() { return FillRectOpImpl::ClassID(); } -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/SkGr.h" GR_DRAW_OP_TEST_DEFINE(FillRectOp) { SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random); diff --git a/src/gpu/ops/FillRectOp.h b/src/gpu/ganesh/ops/FillRectOp.h similarity index 98% rename from src/gpu/ops/FillRectOp.h rename to src/gpu/ganesh/ops/FillRectOp.h index db3380b3a5..38ce46d5d3 100644 --- a/src/gpu/ops/FillRectOp.h +++ b/src/gpu/ganesh/ops/FillRectOp.h @@ -9,7 +9,7 @@ #define FillRectOp_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" struct DrawQuad; class GrClip; diff --git a/src/gpu/ops/GrDrawOp.h b/src/gpu/ganesh/ops/GrDrawOp.h similarity index 97% rename from src/gpu/ops/GrDrawOp.h rename to src/gpu/ganesh/ops/GrDrawOp.h index 19de7dbb51..a15e311c3f 100644 --- a/src/gpu/ops/GrDrawOp.h +++ b/src/gpu/ganesh/ops/GrDrawOp.h @@ -10,9 +10,9 @@ #include #include "src/core/SkIPoint16.h" -#include "src/gpu/GrDeferredUpload.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrAppliedClip; namespace skgpu { namespace v1 { class SurfaceDrawContext; }} diff --git a/src/gpu/ops/GrMeshDrawOp.cpp b/src/gpu/ganesh/ops/GrMeshDrawOp.cpp similarity index 96% rename from src/gpu/ops/GrMeshDrawOp.cpp rename to src/gpu/ganesh/ops/GrMeshDrawOp.cpp index 8ea25d5027..4fdf90b038 100644 --- a/src/gpu/ops/GrMeshDrawOp.cpp +++ b/src/gpu/ganesh/ops/GrMeshDrawOp.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" GrMeshDrawOp::GrMeshDrawOp(uint32_t classID) : INHERITED(classID) {} diff --git a/src/gpu/ops/GrMeshDrawOp.h b/src/gpu/ganesh/ops/GrMeshDrawOp.h similarity index 97% rename from src/gpu/ops/GrMeshDrawOp.h rename to src/gpu/ganesh/ops/GrMeshDrawOp.h index 6cc0c3f083..297e1afe44 100644 --- a/src/gpu/ops/GrMeshDrawOp.h +++ b/src/gpu/ganesh/ops/GrMeshDrawOp.h @@ -8,9 +8,9 @@ #ifndef GrMeshDrawOp_DEFINED #define GrMeshDrawOp_DEFINED -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/ops/GrDrawOp.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" #include class SkArenaAlloc; diff --git a/src/gpu/ops/GrOp.cpp b/src/gpu/ganesh/ops/GrOp.cpp similarity index 98% rename from src/gpu/ops/GrOp.cpp rename to src/gpu/ganesh/ops/GrOp.cpp index 994cddfd80..de88468466 100644 --- a/src/gpu/ops/GrOp.cpp +++ b/src/gpu/ganesh/ops/GrOp.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" std::atomic GrOp::gCurrOpClassID {GrOp::kIllegalOpID + 1}; std::atomic GrOp::gCurrOpUniqueID{GrOp::kIllegalOpID + 1}; diff --git a/src/gpu/ops/GrOp.h b/src/gpu/ganesh/ops/GrOp.h similarity index 98% rename from src/gpu/ops/GrOp.h rename to src/gpu/ganesh/ops/GrOp.h index 6b3a173adc..8268f4b0f4 100644 --- a/src/gpu/ops/GrOp.h +++ b/src/gpu/ganesh/ops/GrOp.h @@ -12,11 +12,11 @@ #include "include/core/SkRect.h" #include "include/core/SkString.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/GrXferProcessor.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/GrXferProcessor.h" #include #include diff --git a/src/gpu/ops/GrOvalOpFactory.cpp b/src/gpu/ganesh/ops/GrOvalOpFactory.cpp similarity index 99% rename from src/gpu/ops/GrOvalOpFactory.cpp rename to src/gpu/ganesh/ops/GrOvalOpFactory.cpp index 163005628f..afdd0525c1 100644 --- a/src/gpu/ops/GrOvalOpFactory.cpp +++ b/src/gpu/ganesh/ops/GrOvalOpFactory.cpp @@ -5,29 +5,29 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/GrOvalOpFactory.h" +#include "src/gpu/ganesh/ops/GrOvalOpFactory.h" #include "include/core/SkStrokeRec.h" #include "src/core/SkMatrixPriv.h" #include "src/core/SkRRectPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrStyle.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" #include diff --git a/src/gpu/ops/GrOvalOpFactory.h b/src/gpu/ganesh/ops/GrOvalOpFactory.h similarity index 97% rename from src/gpu/ops/GrOvalOpFactory.h rename to src/gpu/ganesh/ops/GrOvalOpFactory.h index fa17c6b0b3..bd069894bb 100644 --- a/src/gpu/ops/GrOvalOpFactory.h +++ b/src/gpu/ganesh/ops/GrOvalOpFactory.h @@ -9,8 +9,8 @@ #define GrOvalOpFactory_DEFINED #include "include/core/SkRefCnt.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrDrawOp; class GrPaint; diff --git a/src/gpu/ops/GrPathStencilSettings.h b/src/gpu/ganesh/ops/GrPathStencilSettings.h similarity index 98% rename from src/gpu/ops/GrPathStencilSettings.h rename to src/gpu/ganesh/ops/GrPathStencilSettings.h index 8d221736ab..7e3e193762 100644 --- a/src/gpu/ops/GrPathStencilSettings.h +++ b/src/gpu/ganesh/ops/GrPathStencilSettings.h @@ -8,7 +8,7 @@ #ifndef GrPathStencilSettings_DEFINED #define GrPathStencilSettings_DEFINED -#include "src/gpu/GrUserStencilSettings.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" //////////////////////////////////////////////////////////////////////////////// // Stencil rules for paths diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp similarity index 97% rename from src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp rename to src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp index 94c82e7ba2..16f4169524 100644 --- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.cpp +++ b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/geometry/GrRect.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/geometry/GrRect.h" GrSimpleMeshDrawOpHelper::GrSimpleMeshDrawOpHelper(GrProcessorSet* processorSet, GrAAType aaType, diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h similarity index 97% rename from src/gpu/ops/GrSimpleMeshDrawOpHelper.h rename to src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h index a5aeb88819..7339bd1b76 100644 --- a/src/gpu/ops/GrSimpleMeshDrawOpHelper.h +++ b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h @@ -9,12 +9,12 @@ #define GrSimpleMeshDrawOpHelper_DEFINED #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" #include struct SkRect; diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp similarity index 98% rename from src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp rename to src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp index a7a8a4dc84..5ea0e201cb 100644 --- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp +++ b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" GrSimpleMeshDrawOpHelperWithStencil::GrSimpleMeshDrawOpHelperWithStencil( GrProcessorSet* processorSet, diff --git a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h similarity index 98% rename from src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h rename to src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h index c174ae8afe..e178c17e54 100644 --- a/src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h +++ b/src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h @@ -8,7 +8,7 @@ #ifndef GrSimpleMeshDrawOpHelperWithStencil_DEFINED #define GrSimpleMeshDrawOpHelperWithStencil_DEFINED -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" /** * This class extends GrSimpleMeshDrawOpHelper to support an optional GrUserStencilSettings. This diff --git a/src/gpu/ops/LatticeOp.cpp b/src/gpu/ganesh/ops/LatticeOp.cpp similarity index 96% rename from src/gpu/ops/LatticeOp.cpp rename to src/gpu/ganesh/ops/LatticeOp.cpp index 55e2b238bd..d7723dfe97 100644 --- a/src/gpu/ops/LatticeOp.cpp +++ b/src/gpu/ganesh/ops/LatticeOp.cpp @@ -5,26 +5,26 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/LatticeOp.h" +#include "src/gpu/ganesh/ops/LatticeOp.h" #include "include/core/SkBitmap.h" #include "include/core/SkRect.h" #include "src/core/SkLatticeIter.h" #include "src/core/SkMatrixPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrResourceProviderPriv.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" namespace skgpu::v1::LatticeOp { @@ -412,9 +412,9 @@ GrOp::Owner MakeNonAA(GrRecordingContext* context, } // namespace skgpu::v1::LatticeOp #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" /** Randomly divides subset into count divs. */ static void init_random_divs(int divs[], int count, int subsetStart, int subsetStop, diff --git a/src/gpu/ops/LatticeOp.h b/src/gpu/ganesh/ops/LatticeOp.h similarity index 91% rename from src/gpu/ops/LatticeOp.h rename to src/gpu/ganesh/ops/LatticeOp.h index 99d9e6614a..4deec7d836 100644 --- a/src/gpu/ops/LatticeOp.h +++ b/src/gpu/ganesh/ops/LatticeOp.h @@ -10,8 +10,8 @@ #include #include "include/core/SkRefCnt.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrColorSpaceXform; class GrPaint; diff --git a/src/gpu/ops/OpsTask.cpp b/src/gpu/ganesh/ops/OpsTask.cpp similarity index 98% rename from src/gpu/ops/OpsTask.cpp rename to src/gpu/ganesh/ops/OpsTask.cpp index c691ceff06..f63f5ef8c6 100644 --- a/src/gpu/ops/OpsTask.cpp +++ b/src/gpu/ganesh/ops/OpsTask.cpp @@ -5,25 +5,25 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/OpsTask.h" +#include "src/gpu/ganesh/ops/OpsTask.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkRectPriv.h" #include "src/core/SkScopeExit.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceAllocator.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/geometry/GrRect.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/geometry/GrRect.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/ops/OpsTask.h b/src/gpu/ganesh/ops/OpsTask.h similarity index 97% rename from src/gpu/ops/OpsTask.h rename to src/gpu/ganesh/ops/OpsTask.h index e37d58f6ca..0bcc837ffb 100644 --- a/src/gpu/ops/OpsTask.h +++ b/src/gpu/ganesh/ops/OpsTask.h @@ -20,12 +20,12 @@ #include "src/core/SkClipStack.h" #include "src/core/SkStringUtils.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrDstProxyView.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrRenderTask.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrDstProxyView.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrRenderTask.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrAuditTrail; class GrCaps; diff --git a/src/gpu/ops/PathInnerTriangulateOp.cpp b/src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp similarity index 98% rename from src/gpu/ops/PathInnerTriangulateOp.cpp rename to src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp index 180333dba5..ac4f8f2c5d 100644 --- a/src/gpu/ops/PathInnerTriangulateOp.cpp +++ b/src/gpu/ganesh/ops/PathInnerTriangulateOp.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/PathInnerTriangulateOp.h" +#include "src/gpu/ganesh/ops/PathInnerTriangulateOp.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/PathTessellator.h" -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/PathInnerTriangulateOp.h b/src/gpu/ganesh/ops/PathInnerTriangulateOp.h similarity index 94% rename from src/gpu/ops/PathInnerTriangulateOp.h rename to src/gpu/ganesh/ops/PathInnerTriangulateOp.h index b013315719..14ad570d56 100644 --- a/src/gpu/ops/PathInnerTriangulateOp.h +++ b/src/gpu/ganesh/ops/PathInnerTriangulateOp.h @@ -8,10 +8,10 @@ #ifndef PathInnerTriangulateOp_DEFINED #define PathInnerTriangulateOp_DEFINED -#include "src/gpu/geometry/GrInnerFanTriangulator.h" -#include "src/gpu/ops/FillPathFlags.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" +#include "src/gpu/ganesh/geometry/GrInnerFanTriangulator.h" +#include "src/gpu/ganesh/ops/FillPathFlags.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/PathStencilCoverOp.cpp b/src/gpu/ganesh/ops/PathStencilCoverOp.cpp similarity index 96% rename from src/gpu/ops/PathStencilCoverOp.cpp rename to src/gpu/ganesh/ops/PathStencilCoverOp.cpp index bf5b9b4d80..9346ec9956 100644 --- a/src/gpu/ops/PathStencilCoverOp.cpp +++ b/src/gpu/ganesh/ops/PathStencilCoverOp.cpp @@ -5,22 +5,22 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/PathStencilCoverOp.h" +#include "src/gpu/ganesh/ops/PathStencilCoverOp.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" #include "src/gpu/tessellate/AffineMatrix.h" #include "src/gpu/tessellate/FixedCountBufferUtils.h" #include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h" #include "src/gpu/tessellate/Tessellation.h" -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" namespace { diff --git a/src/gpu/ops/PathStencilCoverOp.h b/src/gpu/ganesh/ops/PathStencilCoverOp.h similarity index 95% rename from src/gpu/ops/PathStencilCoverOp.h rename to src/gpu/ganesh/ops/PathStencilCoverOp.h index 89652817c7..f40bb80a6c 100644 --- a/src/gpu/ops/PathStencilCoverOp.h +++ b/src/gpu/ganesh/ops/PathStencilCoverOp.h @@ -8,10 +8,10 @@ #ifndef PathStencilCoverOp_DEFINED #define PathStencilCoverOp_DEFINED -#include "src/gpu/ops/FillPathFlags.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/PathTessellator.h" -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" +#include "src/gpu/ganesh/ops/FillPathFlags.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/PathTessellateOp.cpp b/src/gpu/ganesh/ops/PathTessellateOp.cpp similarity index 96% rename from src/gpu/ops/PathTessellateOp.cpp rename to src/gpu/ganesh/ops/PathTessellateOp.cpp index b56388b1ae..7b8b708b40 100644 --- a/src/gpu/ops/PathTessellateOp.cpp +++ b/src/gpu/ganesh/ops/PathTessellateOp.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/PathTessellateOp.h" +#include "src/gpu/ganesh/ops/PathTessellateOp.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/PathTessellateOp.h b/src/gpu/ganesh/ops/PathTessellateOp.h similarity index 95% rename from src/gpu/ops/PathTessellateOp.h rename to src/gpu/ganesh/ops/PathTessellateOp.h index 2c0a4f09cd..8cd98c26c9 100644 --- a/src/gpu/ops/PathTessellateOp.h +++ b/src/gpu/ganesh/ops/PathTessellateOp.h @@ -8,10 +8,10 @@ #ifndef PathTessellateOp_DEFINED #define PathTessellateOp_DEFINED -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/PathTessellator.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" #include "src/gpu/tessellate/Tessellation.h" -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/PathTessellator.cpp b/src/gpu/ganesh/ops/PathTessellator.cpp similarity index 98% rename from src/gpu/ops/PathTessellator.cpp rename to src/gpu/ganesh/ops/PathTessellator.cpp index 8201980b69..0b13b69a5e 100644 --- a/src/gpu/ops/PathTessellator.cpp +++ b/src/gpu/ganesh/ops/PathTessellator.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/PathTessellator.h" +#include "src/gpu/ganesh/ops/PathTessellator.h" #include "src/core/SkPathPriv.h" -#include "src/gpu/GrMeshDrawTarget.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrResourceProvider.h" #include "src/gpu/tessellate/AffineMatrix.h" #include "src/gpu/tessellate/FixedCountBufferUtils.h" #include "src/gpu/tessellate/MiddleOutPolygonTriangulator.h" diff --git a/src/gpu/ops/PathTessellator.h b/src/gpu/ganesh/ops/PathTessellator.h similarity index 98% rename from src/gpu/ops/PathTessellator.h rename to src/gpu/ganesh/ops/PathTessellator.h index 6d2e96eb76..3433d48118 100644 --- a/src/gpu/ops/PathTessellator.h +++ b/src/gpu/ganesh/ops/PathTessellator.h @@ -9,9 +9,9 @@ #define PathTessellator_DEFINED #include "src/core/SkArenaAlloc.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrVertexChunkArray.h" -#include "src/gpu/geometry/GrInnerFanTriangulator.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrVertexChunkArray.h" +#include "src/gpu/ganesh/geometry/GrInnerFanTriangulator.h" #include "src/gpu/tessellate/FixedCountBufferUtils.h" #include "src/gpu/tessellate/Tessellation.h" diff --git a/src/gpu/ops/QuadPerEdgeAA.cpp b/src/gpu/ganesh/ops/QuadPerEdgeAA.cpp similarity index 99% rename from src/gpu/ops/QuadPerEdgeAA.cpp rename to src/gpu/ganesh/ops/QuadPerEdgeAA.cpp index d29798331b..89aeefc4e6 100644 --- a/src/gpu/ops/QuadPerEdgeAA.cpp +++ b/src/gpu/ganesh/ops/QuadPerEdgeAA.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/QuadPerEdgeAA.h" +#include "src/gpu/ganesh/ops/QuadPerEdgeAA.h" #include "include/private/SkVx.h" -#include "src/gpu/GrMeshDrawTarget.h" -#include "src/gpu/GrResourceProvider.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/geometry/GrQuadUtils.h" -#include "src/gpu/glsl/GrGLSLColorSpaceXformHelper.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/glsl/GrGLSLColorSpaceXformHelper.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" static_assert((int)GrQuadAAFlags::kLeft == SkCanvas::kLeft_QuadAAFlag); static_assert((int)GrQuadAAFlags::kTop == SkCanvas::kTop_QuadAAFlag); diff --git a/src/gpu/ops/QuadPerEdgeAA.h b/src/gpu/ganesh/ops/QuadPerEdgeAA.h similarity index 97% rename from src/gpu/ops/QuadPerEdgeAA.h rename to src/gpu/ganesh/ops/QuadPerEdgeAA.h index 65d4287734..28fc2712a7 100644 --- a/src/gpu/ops/QuadPerEdgeAA.h +++ b/src/gpu/ganesh/ops/QuadPerEdgeAA.h @@ -12,12 +12,12 @@ #include "include/core/SkPoint3.h" #include "include/private/GrTypesPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrQuadUtils.h" -#include "src/gpu/ops/TextureOp.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/ops/TextureOp.h" class GrCaps; class GrColorSpaceXform; diff --git a/src/gpu/ops/RegionOp.cpp b/src/gpu/ganesh/ops/RegionOp.cpp similarity index 95% rename from src/gpu/ops/RegionOp.cpp rename to src/gpu/ganesh/ops/RegionOp.cpp index 61289bf2d9..899ab9e094 100644 --- a/src/gpu/ops/RegionOp.cpp +++ b/src/gpu/ganesh/ops/RegionOp.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/RegionOp.h" +#include "src/gpu/ganesh/ops/RegionOp.h" #include "include/core/SkRegion.h" #include "src/core/SkMatrixPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" namespace skgpu::v1::RegionOp { @@ -216,7 +216,7 @@ GrOp::Owner Make(GrRecordingContext* context, #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" GR_DRAW_OP_TEST_DEFINE(RegionOp) { SkRegion region; diff --git a/src/gpu/ops/RegionOp.h b/src/gpu/ganesh/ops/RegionOp.h similarity index 95% rename from src/gpu/ops/RegionOp.h rename to src/gpu/ganesh/ops/RegionOp.h index 5086c8392f..1e4e3f06e5 100644 --- a/src/gpu/ops/RegionOp.h +++ b/src/gpu/ganesh/ops/RegionOp.h @@ -9,7 +9,7 @@ #define RegionOp_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrPaint; class GrRecordingContext; diff --git a/src/gpu/ops/ShadowRRectOp.cpp b/src/gpu/ganesh/ops/ShadowRRectOp.cpp similarity index 98% rename from src/gpu/ops/ShadowRRectOp.cpp rename to src/gpu/ganesh/ops/ShadowRRectOp.cpp index 92dc53a66b..719eeb1774 100644 --- a/src/gpu/ops/ShadowRRectOp.cpp +++ b/src/gpu/ganesh/ops/ShadowRRectOp.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/ShadowRRectOp.h" +#include "src/gpu/ganesh/ops/ShadowRRectOp.h" #include "include/core/SkBitmap.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkRRectPriv.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrShadowGeoProc.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrShadowGeoProc.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" namespace { @@ -749,7 +749,7 @@ GrOp::Owner Make(GrRecordingContext* context, #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" GR_DRAW_OP_TEST_DEFINE(ShadowRRectOp) { // We may choose matrix and inset values that cause the factory to fail. We loop until we find diff --git a/src/gpu/ops/ShadowRRectOp.h b/src/gpu/ganesh/ops/ShadowRRectOp.h similarity index 89% rename from src/gpu/ops/ShadowRRectOp.h rename to src/gpu/ganesh/ops/ShadowRRectOp.h index 74a87afa30..803c7d28a6 100644 --- a/src/gpu/ops/ShadowRRectOp.h +++ b/src/gpu/ganesh/ops/ShadowRRectOp.h @@ -9,8 +9,8 @@ #define ShadowRRectOp_DEFINED #include -#include "src/gpu/GrColor.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrRecordingContext; diff --git a/src/gpu/ops/SmallPathAtlasMgr.cpp b/src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp similarity index 96% rename from src/gpu/ops/SmallPathAtlasMgr.cpp rename to src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp index bdd8027cdd..bfaf491c00 100644 --- a/src/gpu/ops/SmallPathAtlasMgr.cpp +++ b/src/gpu/ganesh/ops/SmallPathAtlasMgr.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/SmallPathAtlasMgr.h" +#include "src/gpu/ganesh/ops/SmallPathAtlasMgr.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/SmallPathShapeData.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/SmallPathShapeData.h" #ifdef DF_PATH_TRACKING static int g_NumCachedShapes = 0; diff --git a/src/gpu/ops/SmallPathAtlasMgr.h b/src/gpu/ganesh/ops/SmallPathAtlasMgr.h similarity index 96% rename from src/gpu/ops/SmallPathAtlasMgr.h rename to src/gpu/ganesh/ops/SmallPathAtlasMgr.h index ec229aea22..e0edf06739 100644 --- a/src/gpu/ops/SmallPathAtlasMgr.h +++ b/src/gpu/ganesh/ops/SmallPathAtlasMgr.h @@ -10,8 +10,8 @@ #include "src/core/SkTDynamicHash.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" class GrStyledShape; diff --git a/src/gpu/ops/SmallPathRenderer.cpp b/src/gpu/ganesh/ops/SmallPathRenderer.cpp similarity index 97% rename from src/gpu/ops/SmallPathRenderer.cpp rename to src/gpu/ganesh/ops/SmallPathRenderer.cpp index 43d5feab3f..564be5e19f 100644 --- a/src/gpu/ops/SmallPathRenderer.cpp +++ b/src/gpu/ganesh/ops/SmallPathRenderer.cpp @@ -6,7 +6,7 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/SmallPathRenderer.h" +#include "src/gpu/ganesh/ops/SmallPathRenderer.h" #include "include/core/SkPaint.h" #include "src/core/SkAutoPixmapStorage.h" @@ -17,20 +17,20 @@ #include "src/core/SkPointPriv.h" #include "src/core/SkRasterClip.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrBuffer.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDistanceFieldGenFromVector.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/effects/GrBitmapTextGeoProc.h" -#include "src/gpu/effects/GrDistanceFieldGeoProc.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/ops/SmallPathAtlasMgr.h" -#include "src/gpu/ops/SmallPathShapeData.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrBuffer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDistanceFieldGenFromVector.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/effects/GrBitmapTextGeoProc.h" +#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/ops/SmallPathAtlasMgr.h" +#include "src/gpu/ganesh/ops/SmallPathShapeData.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/SmallPathRenderer.h b/src/gpu/ganesh/ops/SmallPathRenderer.h similarity index 94% rename from src/gpu/ops/SmallPathRenderer.h rename to src/gpu/ganesh/ops/SmallPathRenderer.h index 09a359f774..bc18e15bd3 100644 --- a/src/gpu/ops/SmallPathRenderer.h +++ b/src/gpu/ganesh/ops/SmallPathRenderer.h @@ -8,7 +8,7 @@ #ifndef SmallPathRenderer_DEFINED #define SmallPathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" class GrStyledShape; diff --git a/src/gpu/ops/SmallPathShapeData.cpp b/src/gpu/ganesh/ops/SmallPathShapeData.cpp similarity index 94% rename from src/gpu/ops/SmallPathShapeData.cpp rename to src/gpu/ganesh/ops/SmallPathShapeData.cpp index b60aedc75a..4223fdb208 100644 --- a/src/gpu/ops/SmallPathShapeData.cpp +++ b/src/gpu/ganesh/ops/SmallPathShapeData.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/SmallPathShapeData.h" +#include "src/gpu/ganesh/ops/SmallPathShapeData.h" #include "include/private/SkFixed.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" namespace skgpu::v1 { diff --git a/src/gpu/ops/SmallPathShapeData.h b/src/gpu/ganesh/ops/SmallPathShapeData.h similarity index 97% rename from src/gpu/ops/SmallPathShapeData.h rename to src/gpu/ganesh/ops/SmallPathShapeData.h index 1bf5befdbf..ebad27626f 100644 --- a/src/gpu/ops/SmallPathShapeData.h +++ b/src/gpu/ganesh/ops/SmallPathShapeData.h @@ -9,7 +9,7 @@ #define SmallPathShapeData_DEFINED #include "src/core/SkOpts.h" -#include "src/gpu/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" class GrStyledShape; diff --git a/src/gpu/ops/SoftwarePathRenderer.cpp b/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp similarity index 95% rename from src/gpu/ops/SoftwarePathRenderer.cpp rename to src/gpu/ganesh/ops/SoftwarePathRenderer.cpp index 9db3387ce9..edd6f466a8 100644 --- a/src/gpu/ops/SoftwarePathRenderer.cpp +++ b/src/gpu/ganesh/ops/SoftwarePathRenderer.cpp @@ -5,28 +5,28 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/SoftwarePathRenderer.h" +#include "src/gpu/ganesh/ops/SoftwarePathRenderer.h" #include "include/gpu/GrDirectContext.h" #include "include/private/SkSemaphore.h" #include "src/core/SkTaskGroup.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDeferredProxyUploader.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSWMaskHelper.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDeferredProxyUploader.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSWMaskHelper.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/src/gpu/ops/SoftwarePathRenderer.h b/src/gpu/ganesh/ops/SoftwarePathRenderer.h similarity index 97% rename from src/gpu/ops/SoftwarePathRenderer.h rename to src/gpu/ganesh/ops/SoftwarePathRenderer.h index de1dc8c130..b4a9be48db 100644 --- a/src/gpu/ops/SoftwarePathRenderer.h +++ b/src/gpu/ganesh/ops/SoftwarePathRenderer.h @@ -8,8 +8,8 @@ #ifndef SoftwarePathRenderer_DEFINED #define SoftwarePathRenderer_DEFINED -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" class GrProxyProvider; diff --git a/src/gpu/ops/StrokeRectOp.cpp b/src/gpu/ganesh/ops/StrokeRectOp.cpp similarity index 98% rename from src/gpu/ops/StrokeRectOp.cpp rename to src/gpu/ganesh/ops/StrokeRectOp.cpp index c6c700368d..c2af1c06af 100644 --- a/src/gpu/ops/StrokeRectOp.cpp +++ b/src/gpu/ganesh/ops/StrokeRectOp.cpp @@ -5,24 +5,24 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/StrokeRectOp.h" +#include "src/gpu/ganesh/ops/StrokeRectOp.h" #include "include/core/SkStrokeRec.h" #include "include/utils/SkRandom.h" #include "src/core/SkMatrixPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" #include "src/gpu/ResourceKey.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" namespace skgpu::v1::StrokeRectOp { @@ -987,7 +987,7 @@ GrOp::Owner MakeNested(GrRecordingContext* context, #if GR_TEST_UTILS -#include "src/gpu/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" GR_DRAW_OP_TEST_DEFINE(NonAAStrokeRectOp) { SkMatrix viewMatrix = GrTest::TestMatrix(random); diff --git a/src/gpu/ops/StrokeRectOp.h b/src/gpu/ganesh/ops/StrokeRectOp.h similarity index 97% rename from src/gpu/ops/StrokeRectOp.h rename to src/gpu/ganesh/ops/StrokeRectOp.h index 1af01b1875..a494b23bbe 100644 --- a/src/gpu/ops/StrokeRectOp.h +++ b/src/gpu/ganesh/ops/StrokeRectOp.h @@ -9,7 +9,7 @@ #define StrokeRectOp_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrPaint; class GrRecordingContext; diff --git a/src/gpu/ops/StrokeTessellateOp.cpp b/src/gpu/ganesh/ops/StrokeTessellateOp.cpp similarity index 98% rename from src/gpu/ops/StrokeTessellateOp.cpp rename to src/gpu/ganesh/ops/StrokeTessellateOp.cpp index 47836ea2ab..11aa71afdc 100644 --- a/src/gpu/ops/StrokeTessellateOp.cpp +++ b/src/gpu/ganesh/ops/StrokeTessellateOp.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/StrokeTessellateOp.h" +#include "src/gpu/ganesh/ops/StrokeTessellateOp.h" #include "src/core/SkMathPriv.h" #include "src/core/SkPathPriv.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/tessellate/shaders/GrStrokeTessellationShader.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h" namespace { diff --git a/src/gpu/ops/StrokeTessellateOp.h b/src/gpu/ganesh/ops/StrokeTessellateOp.h similarity index 95% rename from src/gpu/ops/StrokeTessellateOp.h rename to src/gpu/ganesh/ops/StrokeTessellateOp.h index 19fc688a58..60d516e225 100644 --- a/src/gpu/ops/StrokeTessellateOp.h +++ b/src/gpu/ganesh/ops/StrokeTessellateOp.h @@ -9,9 +9,9 @@ #define StrokeTessellateOp_DEFINED #include "include/core/SkStrokeRec.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/StrokeTessellator.h" -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/StrokeTessellator.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" class GrRecordingContext; class GrStrokeTessellationShader; diff --git a/src/gpu/ops/StrokeTessellator.cpp b/src/gpu/ganesh/ops/StrokeTessellator.cpp similarity index 99% rename from src/gpu/ops/StrokeTessellator.cpp rename to src/gpu/ganesh/ops/StrokeTessellator.cpp index 48dd4c9e10..8a8dd32665 100644 --- a/src/gpu/ops/StrokeTessellator.cpp +++ b/src/gpu/ganesh/ops/StrokeTessellator.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/StrokeTessellator.h" +#include "src/gpu/ganesh/ops/StrokeTessellator.h" #include "src/core/SkGeometry.h" #include "src/core/SkPathPriv.h" -#include "src/gpu/GrMeshDrawTarget.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrResourceProvider.h" #include "src/gpu/tessellate/PatchWriter.h" #include "src/gpu/tessellate/StrokeIterator.h" #include "src/gpu/tessellate/WangsFormula.h" diff --git a/src/gpu/ops/StrokeTessellator.h b/src/gpu/ganesh/ops/StrokeTessellator.h similarity index 98% rename from src/gpu/ops/StrokeTessellator.h rename to src/gpu/ganesh/ops/StrokeTessellator.h index 43fa042ffe..01612fbacd 100644 --- a/src/gpu/ops/StrokeTessellator.h +++ b/src/gpu/ganesh/ops/StrokeTessellator.h @@ -12,7 +12,7 @@ #include "include/core/SkStrokeRec.h" #include "include/private/SkColorData.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrVertexChunkArray.h" +#include "src/gpu/ganesh/GrVertexChunkArray.h" #include "src/gpu/tessellate/FixedCountBufferUtils.h" #include "src/gpu/tessellate/Tessellation.h" diff --git a/src/gpu/ops/TessellationPathRenderer.cpp b/src/gpu/ganesh/ops/TessellationPathRenderer.cpp similarity index 95% rename from src/gpu/ops/TessellationPathRenderer.cpp rename to src/gpu/ganesh/ops/TessellationPathRenderer.cpp index a6adca5f07..37d9545d4f 100644 --- a/src/gpu/ops/TessellationPathRenderer.cpp +++ b/src/gpu/ganesh/ops/TessellationPathRenderer.cpp @@ -5,23 +5,23 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" #include "include/private/SkVx.h" #include "src/core/SkPathPriv.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrVx.h" -#include "src/gpu/effects/GrDisableColorXP.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/PathInnerTriangulateOp.h" -#include "src/gpu/ops/PathStencilCoverOp.h" -#include "src/gpu/ops/PathTessellateOp.h" -#include "src/gpu/ops/StrokeTessellateOp.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrVx.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/PathInnerTriangulateOp.h" +#include "src/gpu/ganesh/ops/PathStencilCoverOp.h" +#include "src/gpu/ganesh/ops/PathTessellateOp.h" +#include "src/gpu/ganesh/ops/StrokeTessellateOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/gpu/tessellate/Tessellation.h" #include "src/gpu/tessellate/WangsFormula.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/src/gpu/ops/TessellationPathRenderer.h b/src/gpu/ganesh/ops/TessellationPathRenderer.h similarity index 96% rename from src/gpu/ops/TessellationPathRenderer.h rename to src/gpu/ganesh/ops/TessellationPathRenderer.h index 96c1b00527..2e5bb4c2c4 100644 --- a/src/gpu/ops/TessellationPathRenderer.h +++ b/src/gpu/ganesh/ops/TessellationPathRenderer.h @@ -9,7 +9,7 @@ #define TessellationPathRenderer_DEFINED #include "include/gpu/GrTypes.h" -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" class GrCaps; diff --git a/src/gpu/ops/TextureOp.cpp b/src/gpu/ganesh/ops/TextureOp.cpp similarity index 97% rename from src/gpu/ops/TextureOp.cpp rename to src/gpu/ganesh/ops/TextureOp.cpp index c951c714cc..b418867728 100644 --- a/src/gpu/ops/TextureOp.cpp +++ b/src/gpu/ganesh/ops/TextureOp.cpp @@ -15,34 +15,34 @@ #include "src/core/SkMathPriv.h" #include "src/core/SkMatrixPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsTypes.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrResourceProviderPriv.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrQuadBuffer.h" -#include "src/gpu/geometry/GrQuadUtils.h" -#include "src/gpu/geometry/GrRect.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/ops/QuadPerEdgeAA.h" -#include "src/gpu/ops/TextureOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsTypes.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuadBuffer.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/geometry/GrRect.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/ops/QuadPerEdgeAA.h" +#include "src/gpu/ganesh/ops/TextureOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { @@ -1385,8 +1385,8 @@ void TextureOp::AddTextureSetOps(SurfaceDrawContext* sdc, #if GR_TEST_UTILS #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" GR_DRAW_OP_TEST_DEFINE(TextureOpImpl) { SkISize dims; diff --git a/src/gpu/ops/TextureOp.h b/src/gpu/ganesh/ops/TextureOp.h similarity index 96% rename from src/gpu/ops/TextureOp.h rename to src/gpu/ganesh/ops/TextureOp.h index 998578c0fa..f9415534b7 100644 --- a/src/gpu/ops/TextureOp.h +++ b/src/gpu/ganesh/ops/TextureOp.h @@ -10,9 +10,9 @@ #include "include/core/SkCanvas.h" #include "include/core/SkRefCnt.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/ops/GrOp.h" struct DrawQuad; class GrClip; diff --git a/src/gpu/ops/TriangulatingPathRenderer.cpp b/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp similarity index 95% rename from src/gpu/ops/TriangulatingPathRenderer.cpp rename to src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp index efeb9b292a..eea5b7d6ee 100644 --- a/src/gpu/ops/TriangulatingPathRenderer.cpp +++ b/src/gpu/ganesh/ops/TriangulatingPathRenderer.cpp @@ -5,30 +5,30 @@ * found in the LICENSE file. */ -#include "src/gpu/ops/TriangulatingPathRenderer.h" +#include "src/gpu/ganesh/ops/TriangulatingPathRenderer.h" #include "include/private/SkIDChangeListener.h" #include "src/core/SkGeometry.h" -#include "src/gpu/GrAuditTrail.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSimpleMesh.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/geometry/GrAATriangulator.h" -#include "src/gpu/geometry/GrPathUtils.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/geometry/GrTriangulator.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelperWithStencil.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAuditTrail.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSimpleMesh.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/geometry/GrAATriangulator.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/geometry/GrTriangulator.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelperWithStencil.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include diff --git a/src/gpu/ops/TriangulatingPathRenderer.h b/src/gpu/ganesh/ops/TriangulatingPathRenderer.h similarity index 95% rename from src/gpu/ops/TriangulatingPathRenderer.h rename to src/gpu/ganesh/ops/TriangulatingPathRenderer.h index 93d3fced13..d53e73120a 100644 --- a/src/gpu/ops/TriangulatingPathRenderer.h +++ b/src/gpu/ganesh/ops/TriangulatingPathRenderer.h @@ -8,7 +8,7 @@ #ifndef TriangulatingPathRenderer_DEFINED #define TriangulatingPathRenderer_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" namespace skgpu::v1 { diff --git a/src/gpu/tessellate/shaders/BUILD.bazel b/src/gpu/ganesh/tessellate/shaders/BUILD.bazel similarity index 73% rename from src/gpu/tessellate/shaders/BUILD.bazel rename to src/gpu/ganesh/tessellate/shaders/BUILD.bazel index 91a0e806a8..20ae546b9c 100644 --- a/src/gpu/tessellate/shaders/BUILD.bazel +++ b/src/gpu/ganesh/tessellate/shaders/BUILD.bazel @@ -6,7 +6,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrPathTessellationShader_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", "//src/gpu/tessellate:Tessellation_hdr", "//src/gpu/tessellate:WangsFormula_hdr", ], @@ -20,7 +20,7 @@ generated_cc_atom( ":GrPathTessellationShader_hdr", "//src/core:SkMathPriv_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", "//src/gpu/tessellate:FixedCountBufferUtils_hdr", "//src/gpu/tessellate:Tessellation_hdr", "//src/gpu/tessellate:WangsFormula_hdr", @@ -43,10 +43,10 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrPathTessellationShader_hdr", - "//src/gpu/effects:GrDisableColorXP_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/effects:GrDisableColorXP_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -56,9 +56,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrStrokeTessellationShader_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", "//src/gpu/tessellate:WangsFormula_hdr", ], ) @@ -69,8 +69,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrStrokeTessellationShader_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", "//src/gpu/tessellate:FixedCountBufferUtils_hdr", "//src/gpu/tessellate:WangsFormula_hdr", ], @@ -83,8 +83,8 @@ generated_cc_atom( deps = [ ":GrTessellationShader_hdr", "//include/core:SkStrokeRec_hdr", - "//src/gpu:GrVx_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh:GrVx_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", "//src/gpu/tessellate:Tessellation_hdr", ], ) @@ -96,9 +96,9 @@ generated_cc_atom( deps = [ ":GrStrokeTessellationShader_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", ], ) @@ -108,8 +108,8 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", ], ) diff --git a/src/gpu/tessellate/shaders/GrPathTessellationShader.cpp b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.cpp similarity index 96% rename from src/gpu/tessellate/shaders/GrPathTessellationShader.cpp rename to src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.cpp index 5abae997d1..4fa7b79665 100644 --- a/src/gpu/tessellate/shaders/GrPathTessellationShader.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" -#include "src/gpu/effects/GrDisableColorXP.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" using skgpu::PatchAttribs; diff --git a/src/gpu/tessellate/shaders/GrPathTessellationShader.h b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h similarity index 99% rename from src/gpu/tessellate/shaders/GrPathTessellationShader.h rename to src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h index 305b403006..d7c9e96dad 100644 --- a/src/gpu/tessellate/shaders/GrPathTessellationShader.h +++ b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h @@ -8,8 +8,8 @@ #ifndef GrPathTessellationShader_DEFINED #define GrPathTessellationShader_DEFINED +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" #include "src/gpu/tessellate/Tessellation.h" -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" // This is the base class for shaders in the GPU tessellator that fill paths. class GrPathTessellationShader : public GrTessellationShader { diff --git a/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_Hardware.cpp similarity index 99% rename from src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp rename to src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_Hardware.cpp index 0c3f914574..4f410a8f03 100644 --- a/src/gpu/tessellate/shaders/GrPathTessellationShader_Hardware.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_Hardware.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" #include "src/gpu/tessellate/Tessellation.h" #include "src/gpu/tessellate/WangsFormula.h" diff --git a/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp similarity index 98% rename from src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp rename to src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp index ee974fbe62..cb05dff4d9 100644 --- a/src/gpu/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader_MiddleOut.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrPathTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrPathTessellationShader.h" #include "src/core/SkMathPriv.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" #include "src/gpu/tessellate/FixedCountBufferUtils.h" #include "src/gpu/tessellate/Tessellation.h" #include "src/gpu/tessellate/WangsFormula.h" diff --git a/src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.cpp similarity index 98% rename from src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp rename to src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.cpp index 7cbd31a512..cef410d289 100644 --- a/src/gpu/tessellate/shaders/GrStrokeTessellationShader.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrStrokeTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" GrStrokeTessellationShader::GrStrokeTessellationShader(const GrShaderCaps& shaderCaps, Mode mode, diff --git a/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h similarity index 98% rename from src/gpu/tessellate/shaders/GrStrokeTessellationShader.h rename to src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h index 9182253019..2f252b48ea 100644 --- a/src/gpu/tessellate/shaders/GrStrokeTessellationShader.h +++ b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h @@ -8,11 +8,11 @@ #ifndef GrStrokeTessellationShader_DEFINED #define GrStrokeTessellationShader_DEFINED -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" #include "include/core/SkStrokeRec.h" -#include "src/gpu/GrVx.h" -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/GrVx.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" #include "src/gpu/tessellate/Tessellation.h" // Tessellates a batch of stroke patches directly to the canvas. Tessellated stroking works by diff --git a/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp similarity index 99% rename from src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp rename to src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp index 2a4399b12d..b1242b23fd 100644 --- a/src/gpu/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_HardwareImpl.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrStrokeTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" #include "src/gpu/tessellate/WangsFormula.h" void GrStrokeTessellationShader::HardwareImpl::onEmitCode(EmitArgs& args, GrGPArgs* gpArgs) { diff --git a/src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp similarity index 98% rename from src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp rename to src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp index 5ac5ff64e1..44d981730a 100644 --- a/src/gpu/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader_InstancedImpl.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrStrokeTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrStrokeTessellationShader.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" #include "src/gpu/tessellate/FixedCountBufferUtils.h" #include "src/gpu/tessellate/WangsFormula.h" diff --git a/src/gpu/tessellate/shaders/GrTessellationShader.cpp b/src/gpu/ganesh/tessellate/shaders/GrTessellationShader.cpp similarity index 92% rename from src/gpu/tessellate/shaders/GrTessellationShader.cpp rename to src/gpu/ganesh/tessellate/shaders/GrTessellationShader.cpp index 532145c802..9d1d316364 100644 --- a/src/gpu/tessellate/shaders/GrTessellationShader.cpp +++ b/src/gpu/ganesh/tessellate/shaders/GrTessellationShader.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/tessellate/shaders/GrTessellationShader.h" +#include "src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h" const GrPipeline* GrTessellationShader::MakePipeline(const ProgramArgs& args, GrAAType aaType, diff --git a/src/gpu/tessellate/shaders/GrTessellationShader.h b/src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h similarity index 97% rename from src/gpu/tessellate/shaders/GrTessellationShader.h rename to src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h index f5c43da62f..e0724f8760 100644 --- a/src/gpu/tessellate/shaders/GrTessellationShader.h +++ b/src/gpu/ganesh/tessellate/shaders/GrTessellationShader.h @@ -9,8 +9,8 @@ #define GrTessellationShader_DEFINED #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrProgramInfo.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrProgramInfo.h" class SkArenaAlloc; diff --git a/src/gpu/text/BUILD.bazel b/src/gpu/ganesh/text/BUILD.bazel similarity index 81% rename from src/gpu/text/BUILD.bazel rename to src/gpu/ganesh/text/BUILD.bazel index ab880c0ac3..fc1e3208cc 100644 --- a/src/gpu/text/BUILD.bazel +++ b/src/gpu/ganesh/text/BUILD.bazel @@ -5,10 +5,10 @@ generated_cc_atom( hdrs = ["GrAtlasManager.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDrawOpAtlas_hdr", - "//src/gpu:GrOnFlushResourceProvider_hdr", - "//src/gpu:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh:GrOnFlushResourceProvider_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", ], ) @@ -26,12 +26,12 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/codec:SkMasks_hdr", "//src/core:SkAutoMalloc_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGlyph_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SurfaceContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGlyph_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", ], ) @@ -133,7 +133,7 @@ generated_cc_atom( ":GrStrikeCache_hdr", "//src/core:SkArenaAlloc_hdr", "//src/core:SkStrikeSpec_hdr", - "//src/gpu:GrGlyph_hdr", + "//src/gpu/ganesh:GrGlyph_hdr", ], ) @@ -153,9 +153,9 @@ generated_cc_atom( "//src/core:SkStrikeSpec_hdr", "//src/core:SkTInternalLList_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrSubRunAllocator_hdr", - "//src/gpu/ops:GrOp_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrSubRunAllocator_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", ], ) @@ -184,19 +184,19 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkStrikeCache_hdr", "//src/core:SkStrikeSpec_hdr", - "//src/gpu:GrBlurUtils_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrGlyph_hdr", - "//src/gpu:GrMeshDrawTarget_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrSubRunAllocator_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrDistanceFieldGeoProc_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/ops:AtlasTextOp_hdr", - "//src/gpu/v1:Device_v1_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrBlurUtils_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrGlyph_hdr", + "//src/gpu/ganesh:GrMeshDrawTarget_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrSubRunAllocator_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrDistanceFieldGeoProc_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/ops:AtlasTextOp_hdr", + "//src/gpu/ganesh/v1:Device_v1_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -221,7 +221,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":GrTextBlobRedrawCoordinator_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -234,9 +234,9 @@ generated_cc_atom( "//include/core:SkSpan_hdr", "//src/core:SkGlyphBuffer_hdr", "//src/core:SkGlyph_hdr", - "//src/gpu:GrGlyph_hdr", - "//src/gpu:GrMeshDrawTarget_hdr", - "//src/gpu:GrSubRunAllocator_hdr", + "//src/gpu/ganesh:GrGlyph_hdr", + "//src/gpu/ganesh:GrMeshDrawTarget_hdr", + "//src/gpu/ganesh:GrSubRunAllocator_hdr", ], ) diff --git a/src/gpu/text/GrAtlasManager.cpp b/src/gpu/ganesh/text/GrAtlasManager.cpp similarity index 97% rename from src/gpu/text/GrAtlasManager.cpp rename to src/gpu/ganesh/text/GrAtlasManager.cpp index 8a84bf6bb2..e6e329ace8 100644 --- a/src/gpu/text/GrAtlasManager.cpp +++ b/src/gpu/ganesh/text/GrAtlasManager.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" #include "include/core/SkColorSpace.h" #include "src/codec/SkMasks.h" #include "src/core/SkAutoMalloc.h" -#include "src/gpu/GrGlyph.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/text/GrStrikeCache.h" +#include "src/gpu/ganesh/GrGlyph.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" GrAtlasManager::GrAtlasManager(GrProxyProvider* proxyProvider, size_t maxTextureBytes, @@ -208,10 +208,10 @@ void GrAtlasManager::addGlyphToBulkAndSetUseToken(GrDrawOpAtlas::BulkUseTokenUpd #ifdef SK_DEBUG #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "include/core/SkBitmap.h" #include "include/core/SkImageEncoder.h" diff --git a/src/gpu/text/GrAtlasManager.h b/src/gpu/ganesh/text/GrAtlasManager.h similarity index 97% rename from src/gpu/text/GrAtlasManager.h rename to src/gpu/ganesh/text/GrAtlasManager.h index b9b91fedd0..c6a9b2913e 100644 --- a/src/gpu/text/GrAtlasManager.h +++ b/src/gpu/ganesh/text/GrAtlasManager.h @@ -8,10 +8,10 @@ #ifndef GrAtlasManager_DEFINED #define GrAtlasManager_DEFINED -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/GrProxyProvider.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrProxyProvider.h" class GrGlyph; class GrResourceProvider; diff --git a/src/gpu/text/GrDistanceFieldAdjustTable.cpp b/src/gpu/ganesh/text/GrDistanceFieldAdjustTable.cpp similarity index 98% rename from src/gpu/text/GrDistanceFieldAdjustTable.cpp rename to src/gpu/ganesh/text/GrDistanceFieldAdjustTable.cpp index c6c0992204..80244f5843 100644 --- a/src/gpu/text/GrDistanceFieldAdjustTable.cpp +++ b/src/gpu/ganesh/text/GrDistanceFieldAdjustTable.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/text/GrDistanceFieldAdjustTable.h" +#include "src/gpu/ganesh/text/GrDistanceFieldAdjustTable.h" #include "src/core/SkScalerContext.h" diff --git a/src/gpu/text/GrDistanceFieldAdjustTable.h b/src/gpu/ganesh/text/GrDistanceFieldAdjustTable.h similarity index 100% rename from src/gpu/text/GrDistanceFieldAdjustTable.h rename to src/gpu/ganesh/text/GrDistanceFieldAdjustTable.h diff --git a/src/gpu/text/GrGlyphVector.cpp b/src/gpu/ganesh/text/GrGlyphVector.cpp similarity index 98% rename from src/gpu/text/GrGlyphVector.cpp rename to src/gpu/ganesh/text/GrGlyphVector.cpp index 7811b44e2a..50da568039 100644 --- a/src/gpu/text/GrGlyphVector.cpp +++ b/src/gpu/ganesh/text/GrGlyphVector.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/text/GrGlyphVector.h" +#include "src/gpu/ganesh/text/GrGlyphVector.h" #include "include/private/chromium/SkChromeRemoteGlyphCache.h" #include "src/core/SkReadBuffer.h" #include "src/core/SkStrikeCache.h" #include "src/core/SkStrikeSpec.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" GrGlyphVector::GrGlyphVector(sk_sp&& strike, SkSpan glyphs) : fStrike{std::move(strike)} diff --git a/src/gpu/text/GrGlyphVector.h b/src/gpu/ganesh/text/GrGlyphVector.h similarity index 93% rename from src/gpu/text/GrGlyphVector.h rename to src/gpu/ganesh/text/GrGlyphVector.h index baa2c48607..3176b92e5a 100644 --- a/src/gpu/text/GrGlyphVector.h +++ b/src/gpu/ganesh/text/GrGlyphVector.h @@ -11,10 +11,10 @@ #include "include/core/SkSpan.h" #include "src/core/SkGlyph.h" #include "src/core/SkGlyphBuffer.h" -#include "src/gpu/GrGlyph.h" -#include "src/gpu/GrMeshDrawTarget.h" -#include "src/gpu/GrSubRunAllocator.h" -#include "src/gpu/text/GrStrikeCache.h" +#include "src/gpu/ganesh/GrGlyph.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrSubRunAllocator.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" class SkStrikeClient; diff --git a/src/gpu/text/GrSDFMaskFilter.cpp b/src/gpu/ganesh/text/GrSDFMaskFilter.cpp similarity index 98% rename from src/gpu/text/GrSDFMaskFilter.cpp rename to src/gpu/ganesh/text/GrSDFMaskFilter.cpp index 8e77a18155..d802a6340c 100644 --- a/src/gpu/text/GrSDFMaskFilter.cpp +++ b/src/gpu/ganesh/text/GrSDFMaskFilter.cpp @@ -11,7 +11,7 @@ #include "src/core/SkReadBuffer.h" #include "src/core/SkSafeMath.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/text/GrSDFMaskFilter.h" +#include "src/gpu/ganesh/text/GrSDFMaskFilter.h" class GrSDFMaskFilterImpl : public SkMaskFilterBase { public: diff --git a/src/gpu/text/GrSDFMaskFilter.h b/src/gpu/ganesh/text/GrSDFMaskFilter.h similarity index 100% rename from src/gpu/text/GrSDFMaskFilter.h rename to src/gpu/ganesh/text/GrSDFMaskFilter.h diff --git a/src/gpu/text/GrSDFTControl.cpp b/src/gpu/ganesh/text/GrSDFTControl.cpp similarity index 99% rename from src/gpu/text/GrSDFTControl.cpp rename to src/gpu/ganesh/text/GrSDFTControl.cpp index bd838d067e..411a43b46a 100644 --- a/src/gpu/text/GrSDFTControl.cpp +++ b/src/gpu/ganesh/text/GrSDFTControl.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" #include "include/core/SkFont.h" #include "include/core/SkGraphics.h" diff --git a/src/gpu/text/GrSDFTControl.h b/src/gpu/ganesh/text/GrSDFTControl.h similarity index 100% rename from src/gpu/text/GrSDFTControl.h rename to src/gpu/ganesh/text/GrSDFTControl.h diff --git a/src/gpu/text/GrSlug.cpp b/src/gpu/ganesh/text/GrSlug.cpp similarity index 100% rename from src/gpu/text/GrSlug.cpp rename to src/gpu/ganesh/text/GrSlug.cpp diff --git a/src/gpu/text/GrStrikeCache.cpp b/src/gpu/ganesh/text/GrStrikeCache.cpp similarity index 95% rename from src/gpu/text/GrStrikeCache.cpp rename to src/gpu/ganesh/text/GrStrikeCache.cpp index 2c869eea27..1d522f8a38 100644 --- a/src/gpu/text/GrStrikeCache.cpp +++ b/src/gpu/ganesh/text/GrStrikeCache.cpp @@ -7,8 +7,8 @@ #include "src/core/SkArenaAlloc.h" #include "src/core/SkStrikeSpec.h" -#include "src/gpu/GrGlyph.h" -#include "src/gpu/text/GrStrikeCache.h" +#include "src/gpu/ganesh/GrGlyph.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" GrStrikeCache::~GrStrikeCache() { this->freeAll(); diff --git a/src/gpu/text/GrStrikeCache.h b/src/gpu/ganesh/text/GrStrikeCache.h similarity index 100% rename from src/gpu/text/GrStrikeCache.h rename to src/gpu/ganesh/text/GrStrikeCache.h diff --git a/src/gpu/text/GrTextBlob.cpp b/src/gpu/ganesh/text/GrTextBlob.cpp similarity index 99% rename from src/gpu/text/GrTextBlob.cpp rename to src/gpu/ganesh/text/GrTextBlob.cpp index da55fd6b63..138875c518 100644 --- a/src/gpu/text/GrTextBlob.cpp +++ b/src/gpu/ganesh/text/GrTextBlob.cpp @@ -20,25 +20,25 @@ #include "src/core/SkReadBuffer.h" #include "src/core/SkStrikeCache.h" #include "src/core/SkStrikeSpec.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrGlyph.h" -#include "src/gpu/GrMeshDrawTarget.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrSubRunAllocator.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrDistanceFieldGeoProc.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/text/GrAtlasManager.h" -#include "src/gpu/text/GrGlyphVector.h" -#include "src/gpu/text/GrSDFTControl.h" -#include "src/gpu/text/GrStrikeCache.h" -#include "src/gpu/text/GrTextBlob.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrGlyph.h" +#include "src/gpu/ganesh/GrMeshDrawTarget.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrSubRunAllocator.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrDistanceFieldGeoProc.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrGlyphVector.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" -#include "src/gpu/GrBlurUtils.h" -#include "src/gpu/ops/AtlasTextOp.h" -#include "src/gpu/v1/Device_v1.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrBlurUtils.h" +#include "src/gpu/ganesh/ops/AtlasTextOp.h" +#include "src/gpu/ganesh/v1/Device_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" using AtlasTextOp = skgpu::v1::AtlasTextOp; diff --git a/src/gpu/text/GrTextBlob.h b/src/gpu/ganesh/text/GrTextBlob.h similarity index 99% rename from src/gpu/text/GrTextBlob.h rename to src/gpu/ganesh/text/GrTextBlob.h index 813a629290..b4c1171b2e 100644 --- a/src/gpu/text/GrTextBlob.h +++ b/src/gpu/ganesh/text/GrTextBlob.h @@ -22,9 +22,9 @@ #include "src/core/SkStrikeSpec.h" #include "src/core/SkTInternalLList.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrSubRunAllocator.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrSubRunAllocator.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrAtlasManager; class GrDeferredUploadTarget; diff --git a/src/gpu/text/GrTextBlobRedrawCoordinator.cpp b/src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.cpp similarity index 98% rename from src/gpu/text/GrTextBlobRedrawCoordinator.cpp rename to src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.cpp index eae4001415..c8710e0cfe 100644 --- a/src/gpu/text/GrTextBlobRedrawCoordinator.cpp +++ b/src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" DECLARE_SKMESSAGEBUS_MESSAGE(GrTextBlobRedrawCoordinator::PurgeBlobMessage, uint32_t, true) diff --git a/src/gpu/text/GrTextBlobRedrawCoordinator.h b/src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h similarity index 98% rename from src/gpu/text/GrTextBlobRedrawCoordinator.h rename to src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h index bf6a3fedc2..fb8c09d8df 100644 --- a/src/gpu/text/GrTextBlobRedrawCoordinator.h +++ b/src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h @@ -14,7 +14,7 @@ #include "include/private/SkTHash.h" #include "src/core/SkMessageBus.h" #include "src/core/SkTextBlobPriv.h" -#include "src/gpu/text/GrTextBlob.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" #include diff --git a/src/gpu/v1/BUILD.bazel b/src/gpu/ganesh/v1/BUILD.bazel similarity index 53% rename from src/gpu/v1/BUILD.bazel rename to src/gpu/ganesh/v1/BUILD.bazel index adc101454d..62393e77f8 100644 --- a/src/gpu/v1/BUILD.bazel +++ b/src/gpu/ganesh/v1/BUILD.bazel @@ -9,10 +9,10 @@ generated_cc_atom( "//include/core:SkMatrix_hdr", "//include/core:SkShader_hdr", "//src/core:SkTBlockList_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", "//src/gpu:ResourceKey_hdr", - "//src/gpu/geometry:GrShape_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh/geometry:GrShape_hdr", ], ) @@ -31,20 +31,20 @@ generated_cc_atom( "//src/core:SkRRectPriv_hdr", "//src/core:SkRectPriv_hdr", "//src/core:SkTaskGroup_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDeferredProxyUploader_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSWMaskHelper_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrConvexPolyEffect_hdr", - "//src/gpu/effects:GrRRectEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/ops:AtlasPathRenderer_hdr", - "//src/gpu/ops:GrDrawOp_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDeferredProxyUploader_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSWMaskHelper_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrConvexPolyEffect_hdr", + "//src/gpu/ganesh/effects:GrRRectEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/ops:AtlasPathRenderer_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", ], ) @@ -62,18 +62,18 @@ generated_cc_atom( "//src/core:SkImagePriv_hdr", "//src/core:SkMaskFilterBase_hdr", "//src/core:SkSpecialImage_hdr", - "//src/gpu:GrBlurUtils_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrOpsTypes_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrRect_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh:GrBlurUtils_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrOpsTypes_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_Gpu_hdr", ], @@ -113,17 +113,17 @@ generated_cc_atom( "//src/core:SkTLazy_hdr", "//src/core:SkVerticesPriv_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrBlurUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrTracing_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrDisableColorXP_hdr", - "//src/gpu/effects:GrRRectEffect_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh:GrBlurUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrTracing_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrDisableColorXP_hdr", + "//src/gpu/ganesh/effects:GrRRectEffect_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkReadPixelsRec_hdr", "//src/image:SkSurface_Gpu_hdr", @@ -143,8 +143,8 @@ generated_cc_atom( "//include/core:SkRegion_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrTypes_hdr", - "//src/gpu:BaseDevice_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:BaseDevice_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -169,21 +169,21 @@ generated_cc_atom( ":PathRendererChain_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/ops:AAConvexPathRenderer_hdr", - "//src/gpu/ops:AAHairLinePathRenderer_hdr", - "//src/gpu/ops:AALinearizingConvexPathRenderer_hdr", - "//src/gpu/ops:AtlasPathRenderer_hdr", - "//src/gpu/ops:DashLinePathRenderer_hdr", - "//src/gpu/ops:DefaultPathRenderer_hdr", - "//src/gpu/ops:SmallPathRenderer_hdr", - "//src/gpu/ops:TessellationPathRenderer_hdr", - "//src/gpu/ops:TriangulatingPathRenderer_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/ops:AAConvexPathRenderer_hdr", + "//src/gpu/ganesh/ops:AAHairLinePathRenderer_hdr", + "//src/gpu/ganesh/ops:AALinearizingConvexPathRenderer_hdr", + "//src/gpu/ganesh/ops:AtlasPathRenderer_hdr", + "//src/gpu/ganesh/ops:DashLinePathRenderer_hdr", + "//src/gpu/ganesh/ops:DefaultPathRenderer_hdr", + "//src/gpu/ganesh/ops:SmallPathRenderer_hdr", + "//src/gpu/ganesh/ops:TessellationPathRenderer_hdr", + "//src/gpu/ganesh/ops:TriangulatingPathRenderer_hdr", ], ) @@ -207,11 +207,11 @@ generated_cc_atom( ":SurfaceDrawContext_v1_hdr", "//include/gpu:GrRecordingContext_hdr", "//src/core:SkDrawProcs_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrUserStencilSettings_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrUserStencilSettings_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) @@ -220,8 +220,8 @@ generated_cc_atom( hdrs = ["StencilClip.h"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrFixedClip_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrFixedClip_hdr", ], ) @@ -241,11 +241,11 @@ generated_cc_atom( ":SurfaceDrawContext_v1_hdr", "//include/core:SkMatrix_hdr", "//include/core:SkPath_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu/effects:GrDisableColorXP_hdr", - "//src/gpu/geometry:GrShape_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh/effects:GrDisableColorXP_hdr", + "//src/gpu/ganesh/geometry:GrShape_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) @@ -276,51 +276,51 @@ generated_cc_atom( "//src/core:SkMatrixPriv_hdr", "//src/core:SkMatrixProvider_hdr", "//src/core:SkRRectPriv_hdr", - "//src/gpu:GrAppliedClip_hdr", - "//src/gpu:GrAttachment_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrTracing_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrDisableColorXP_hdr", - "//src/gpu/effects:GrRRectEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/ops:ClearOp_hdr", - "//src/gpu/ops:DrawAtlasOp_hdr", - "//src/gpu/ops:DrawCustomMeshOp_hdr", - "//src/gpu/ops:DrawableOp_hdr", - "//src/gpu/ops:FillRRectOp_hdr", - "//src/gpu/ops:FillRectOp_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/ops:GrOvalOpFactory_hdr", - "//src/gpu/ops:LatticeOp_hdr", - "//src/gpu/ops:RegionOp_hdr", - "//src/gpu/ops:ShadowRRectOp_hdr", - "//src/gpu/ops:StrokeRectOp_hdr", - "//src/gpu/ops:TextureOp_hdr", - "//src/gpu/text:GrSDFTControl_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", + "//src/gpu/ganesh:GrAppliedClip_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrTracing_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrDisableColorXP_hdr", + "//src/gpu/ganesh/effects:GrRRectEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/ops:ClearOp_hdr", + "//src/gpu/ganesh/ops:DrawAtlasOp_hdr", + "//src/gpu/ganesh/ops:DrawCustomMeshOp_hdr", + "//src/gpu/ganesh/ops:DrawableOp_hdr", + "//src/gpu/ganesh/ops:FillRRectOp_hdr", + "//src/gpu/ganesh/ops:FillRectOp_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/ops:GrOvalOpFactory_hdr", + "//src/gpu/ganesh/ops:LatticeOp_hdr", + "//src/gpu/ganesh/ops:RegionOp_hdr", + "//src/gpu/ganesh/ops:ShadowRRectOp_hdr", + "//src/gpu/ganesh/ops:StrokeRectOp_hdr", + "//src/gpu/ganesh/ops:TextureOp_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", ], ) @@ -337,12 +337,12 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkGlyphRunPainter_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/ops:OpsTask_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/ops:OpsTask_hdr", ], ) @@ -353,10 +353,10 @@ generated_cc_atom( deps = [ "//include/core:SkSize_hdr", "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:SurfaceFillContext_hdr", "//src/gpu:Swizzle_hdr", - "//src/gpu/ops:OpsTask_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/ops:OpsTask_hdr", ], ) @@ -368,13 +368,13 @@ generated_cc_atom( ":SurfaceDrawContext_v1_hdr", ":SurfaceFillContext_v1_hdr", "//include/private:GrImageContext_hdr", - "//src/gpu:GrDstProxyView_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrTextureResolveRenderTask_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/geometry:GrRect_hdr", - "//src/gpu/ops:ClearOp_hdr", - "//src/gpu/ops:FillRectOp_hdr", + "//src/gpu/ganesh:GrDstProxyView_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrTextureResolveRenderTask_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/geometry:GrRect_hdr", + "//src/gpu/ganesh/ops:ClearOp_hdr", + "//src/gpu/ganesh/ops:FillRectOp_hdr", ], ) diff --git a/src/gpu/v1/ClipStack.cpp b/src/gpu/ganesh/v1/ClipStack.cpp similarity index 98% rename from src/gpu/v1/ClipStack.cpp rename to src/gpu/ganesh/v1/ClipStack.cpp index e34efd2ccd..6447ff30f1 100644 --- a/src/gpu/v1/ClipStack.cpp +++ b/src/gpu/ganesh/v1/ClipStack.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/ClipStack.h" +#include "src/gpu/ganesh/v1/ClipStack.h" #include "include/core/SkColorSpace.h" #include "include/core/SkMatrix.h" @@ -14,22 +14,22 @@ #include "src/core/SkRRectPriv.h" #include "src/core/SkRectPriv.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDeferredProxyUploader.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSWMaskHelper.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrConvexPolyEffect.h" -#include "src/gpu/effects/GrRRectEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrQuadUtils.h" -#include "src/gpu/ops/AtlasPathRenderer.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/StencilMaskHelper.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDeferredProxyUploader.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSWMaskHelper.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrConvexPolyEffect.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/ops/AtlasPathRenderer.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/StencilMaskHelper.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/src/gpu/v1/ClipStack.h b/src/gpu/ganesh/v1/ClipStack.h similarity index 99% rename from src/gpu/v1/ClipStack.h rename to src/gpu/ganesh/v1/ClipStack.h index abb9c1cf98..2db990774a 100644 --- a/src/gpu/v1/ClipStack.h +++ b/src/gpu/ganesh/v1/ClipStack.h @@ -12,10 +12,10 @@ #include "include/core/SkMatrix.h" #include "include/core/SkShader.h" #include "src/core/SkTBlockList.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrSurfaceProxyView.h" #include "src/gpu/ResourceKey.h" -#include "src/gpu/geometry/GrShape.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/geometry/GrShape.h" class GrAppliedClip; class GrProxyProvider; diff --git a/src/gpu/v1/Device.cpp b/src/gpu/ganesh/v1/Device.cpp similarity index 99% rename from src/gpu/v1/Device.cpp rename to src/gpu/ganesh/v1/Device.cpp index 1a9de89547..f5663022ff 100644 --- a/src/gpu/v1/Device.cpp +++ b/src/gpu/ganesh/v1/Device.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/Device_v1.h" +#include "src/gpu/ganesh/v1/Device_v1.h" #include "include/core/SkImageFilter.h" #include "include/core/SkMaskFilter.h" @@ -34,17 +34,17 @@ #include "src/core/SkTLazy.h" #include "src/core/SkVerticesPriv.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/GrBlurUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrDisableColorXP.h" -#include "src/gpu/effects/GrRRectEffect.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/GrBlurUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #include "src/image/SkImage_Base.h" #include "src/image/SkReadPixelsRec.h" #include "src/image/SkSurface_Gpu.h" diff --git a/src/gpu/v1/Device_drawTexture.cpp b/src/gpu/ganesh/v1/Device_drawTexture.cpp similarity index 98% rename from src/gpu/v1/Device_drawTexture.cpp rename to src/gpu/ganesh/v1/Device_drawTexture.cpp index 46b2b83c64..69e5be2b88 100644 --- a/src/gpu/v1/Device_drawTexture.cpp +++ b/src/gpu/ganesh/v1/Device_drawTexture.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/Device_v1.h" +#include "src/gpu/ganesh/v1/Device_v1.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" @@ -14,19 +14,19 @@ #include "src/core/SkImagePriv.h" #include "src/core/SkMaskFilterBase.h" #include "src/core/SkSpecialImage.h" -#include "src/gpu/GrBlurUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrOpsTypes.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrRect.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrBlurUtils.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrOpsTypes.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrRect.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" diff --git a/src/gpu/v1/Device_v1.h b/src/gpu/ganesh/v1/Device_v1.h similarity index 98% rename from src/gpu/v1/Device_v1.h rename to src/gpu/ganesh/v1/Device_v1.h index 8680626e55..649de4e38a 100644 --- a/src/gpu/v1/Device_v1.h +++ b/src/gpu/ganesh/v1/Device_v1.h @@ -13,10 +13,10 @@ #include "include/core/SkRegion.h" #include "include/core/SkSurface.h" #include "include/gpu/GrTypes.h" -#include "src/gpu/BaseDevice.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/v1/ClipStack.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/v1/ClipStack.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" class SkSpecialImage; class SkSurface; diff --git a/src/gpu/v1/PathRenderer.cpp b/src/gpu/ganesh/v1/PathRenderer.cpp similarity index 91% rename from src/gpu/v1/PathRenderer.cpp rename to src/gpu/ganesh/v1/PathRenderer.cpp index c9a40ae2fe..0c6d5eaca7 100644 --- a/src/gpu/v1/PathRenderer.cpp +++ b/src/gpu/ganesh/v1/PathRenderer.cpp @@ -5,17 +5,17 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" #include "include/gpu/GrRecordingContext.h" #include "src/core/SkDrawProcs.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #ifdef SK_DEBUG -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #endif namespace skgpu::v1 { diff --git a/src/gpu/v1/PathRenderer.h b/src/gpu/ganesh/v1/PathRenderer.h similarity index 100% rename from src/gpu/v1/PathRenderer.h rename to src/gpu/ganesh/v1/PathRenderer.h diff --git a/src/gpu/v1/PathRendererChain.cpp b/src/gpu/ganesh/v1/PathRendererChain.cpp similarity index 83% rename from src/gpu/v1/PathRendererChain.cpp rename to src/gpu/ganesh/v1/PathRendererChain.cpp index e4d8d5f7ed..50b5a94e47 100644 --- a/src/gpu/v1/PathRendererChain.cpp +++ b/src/gpu/ganesh/v1/PathRendererChain.cpp @@ -6,25 +6,25 @@ */ -#include "src/gpu/v1/PathRendererChain.h" +#include "src/gpu/ganesh/v1/PathRendererChain.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/AAConvexPathRenderer.h" -#include "src/gpu/ops/AAHairLinePathRenderer.h" -#include "src/gpu/ops/AALinearizingConvexPathRenderer.h" -#include "src/gpu/ops/AtlasPathRenderer.h" -#include "src/gpu/ops/DashLinePathRenderer.h" -#include "src/gpu/ops/DefaultPathRenderer.h" -#include "src/gpu/ops/SmallPathRenderer.h" -#include "src/gpu/ops/TessellationPathRenderer.h" -#include "src/gpu/ops/TriangulatingPathRenderer.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/AAConvexPathRenderer.h" +#include "src/gpu/ganesh/ops/AAHairLinePathRenderer.h" +#include "src/gpu/ganesh/ops/AALinearizingConvexPathRenderer.h" +#include "src/gpu/ganesh/ops/AtlasPathRenderer.h" +#include "src/gpu/ganesh/ops/DashLinePathRenderer.h" +#include "src/gpu/ganesh/ops/DefaultPathRenderer.h" +#include "src/gpu/ganesh/ops/SmallPathRenderer.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/ops/TriangulatingPathRenderer.h" namespace skgpu::v1 { diff --git a/src/gpu/v1/PathRendererChain.h b/src/gpu/ganesh/v1/PathRendererChain.h similarity index 98% rename from src/gpu/v1/PathRendererChain.h rename to src/gpu/ganesh/v1/PathRendererChain.h index 2a23d46219..bca771964c 100644 --- a/src/gpu/v1/PathRendererChain.h +++ b/src/gpu/ganesh/v1/PathRendererChain.h @@ -8,7 +8,7 @@ #ifndef PathRendererChain_DEFINED #define PathRendererChain_DEFINED -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" #include "include/core/SkTypes.h" #include "include/private/GrTypesPriv.h" diff --git a/src/gpu/v1/StencilClip.h b/src/gpu/ganesh/v1/StencilClip.h similarity index 96% rename from src/gpu/v1/StencilClip.h rename to src/gpu/ganesh/v1/StencilClip.h index d0b1b88e4d..6e766702d2 100644 --- a/src/gpu/v1/StencilClip.h +++ b/src/gpu/ganesh/v1/StencilClip.h @@ -8,8 +8,8 @@ #ifndef StencilClip_DEFINED #define StencilClip_DEFINED -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrFixedClip.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrFixedClip.h" namespace skgpu::v1 { diff --git a/src/gpu/v1/StencilMaskHelper.cpp b/src/gpu/ganesh/v1/StencilMaskHelper.cpp similarity index 98% rename from src/gpu/v1/StencilMaskHelper.cpp rename to src/gpu/ganesh/v1/StencilMaskHelper.cpp index 8ebe3e0a88..a57e27e717 100644 --- a/src/gpu/v1/StencilMaskHelper.cpp +++ b/src/gpu/ganesh/v1/StencilMaskHelper.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/StencilMaskHelper.h" +#include "src/gpu/ganesh/v1/StencilMaskHelper.h" #include "include/core/SkMatrix.h" #include "include/core/SkPath.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/effects/GrDisableColorXP.h" -#include "src/gpu/geometry/GrShape.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/geometry/GrShape.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/src/gpu/v1/StencilMaskHelper.h b/src/gpu/ganesh/v1/StencilMaskHelper.h similarity index 98% rename from src/gpu/v1/StencilMaskHelper.h rename to src/gpu/ganesh/v1/StencilMaskHelper.h index ee5dca6e18..ba019b1282 100644 --- a/src/gpu/v1/StencilMaskHelper.h +++ b/src/gpu/ganesh/v1/StencilMaskHelper.h @@ -8,7 +8,7 @@ #ifndef StencilMaskHelper_DEFINED #define StencilMaskHelper_DEFINED -#include "src/gpu/v1/StencilClip.h" +#include "src/gpu/ganesh/v1/StencilClip.h" class GrShape; class GrRecordingContext; diff --git a/src/gpu/v1/SurfaceDrawContext.cpp b/src/gpu/ganesh/v1/SurfaceDrawContext.cpp similarity index 97% rename from src/gpu/v1/SurfaceDrawContext.cpp rename to src/gpu/ganesh/v1/SurfaceDrawContext.cpp index 736f58b583..7bdb8f56fd 100644 --- a/src/gpu/v1/SurfaceDrawContext.cpp +++ b/src/gpu/ganesh/v1/SurfaceDrawContext.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "include/core/SkColorSpace.h" #include "include/core/SkDrawable.h" @@ -27,52 +27,52 @@ #include "src/core/SkMatrixPriv.h" #include "src/core/SkMatrixProvider.h" #include "src/core/SkRRectPriv.h" -#include "src/gpu/GrAppliedClip.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrTracing.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrDisableColorXP.h" -#include "src/gpu/effects/GrRRectEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrQuadUtils.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/ClearOp.h" -#include "src/gpu/ops/DrawAtlasOp.h" -#include "src/gpu/ops/DrawCustomMeshOp.h" -#include "src/gpu/ops/DrawableOp.h" -#include "src/gpu/ops/FillRRectOp.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/ops/GrOvalOpFactory.h" -#include "src/gpu/ops/LatticeOp.h" -#include "src/gpu/ops/RegionOp.h" -#include "src/gpu/ops/ShadowRRectOp.h" -#include "src/gpu/ops/StrokeRectOp.h" -#include "src/gpu/ops/TextureOp.h" -#include "src/gpu/text/GrSDFTControl.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" -#include "src/gpu/v1/PathRenderer.h" +#include "src/gpu/ganesh/GrAppliedClip.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrTracing.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrDisableColorXP.h" +#include "src/gpu/ganesh/effects/GrRRectEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/ClearOp.h" +#include "src/gpu/ganesh/ops/DrawAtlasOp.h" +#include "src/gpu/ganesh/ops/DrawCustomMeshOp.h" +#include "src/gpu/ganesh/ops/DrawableOp.h" +#include "src/gpu/ganesh/ops/FillRRectOp.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/ops/GrOvalOpFactory.h" +#include "src/gpu/ganesh/ops/LatticeOp.h" +#include "src/gpu/ganesh/ops/RegionOp.h" +#include "src/gpu/ganesh/ops/ShadowRRectOp.h" +#include "src/gpu/ganesh/ops/StrokeRectOp.h" +#include "src/gpu/ganesh/ops/TextureOp.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/v1/PathRenderer.h" #define ASSERT_OWNED_RESOURCE(R) SkASSERT(!(R) || (R)->getContext() == this->drawingManager()->getContext()) #define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner()) diff --git a/src/gpu/v1/SurfaceDrawContext_v1.h b/src/gpu/ganesh/v1/SurfaceDrawContext_v1.h similarity index 99% rename from src/gpu/v1/SurfaceDrawContext_v1.h rename to src/gpu/ganesh/v1/SurfaceDrawContext_v1.h index a8032768e7..8cbfa074bf 100644 --- a/src/gpu/v1/SurfaceDrawContext_v1.h +++ b/src/gpu/ganesh/v1/SurfaceDrawContext_v1.h @@ -15,13 +15,13 @@ #include "include/core/SkSurfaceProps.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkGlyphRunPainter.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/ops/OpsTask.h" -#include "src/gpu/v1/SurfaceFillContext_v1.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/ops/OpsTask.h" +#include "src/gpu/ganesh/v1/SurfaceFillContext_v1.h" class GrBackendSemaphore; class GrClip; diff --git a/src/gpu/v1/SurfaceFillContext_v1.cpp b/src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp similarity index 95% rename from src/gpu/v1/SurfaceFillContext_v1.cpp rename to src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp index 90b10641e5..66c19fbdb2 100644 --- a/src/gpu/v1/SurfaceFillContext_v1.cpp +++ b/src/gpu/ganesh/v1/SurfaceFillContext_v1.cpp @@ -5,18 +5,18 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/SurfaceFillContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceFillContext_v1.h" #include "include/private/GrImageContext.h" -#include "src/gpu/GrDstProxyView.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrTextureResolveRenderTask.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/geometry/GrRect.h" -#include "src/gpu/ops/ClearOp.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDstProxyView.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrTextureResolveRenderTask.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/geometry/GrRect.h" +#include "src/gpu/ganesh/ops/ClearOp.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #define ASSERT_SINGLE_OWNER SKGPU_ASSERT_SINGLE_OWNER(this->singleOwner()) #define RETURN_IF_ABANDONED if (fContext->abandoned()) { return; } diff --git a/src/gpu/v1/SurfaceFillContext_v1.h b/src/gpu/ganesh/v1/SurfaceFillContext_v1.h similarity index 96% rename from src/gpu/v1/SurfaceFillContext_v1.h rename to src/gpu/ganesh/v1/SurfaceFillContext_v1.h index dcfc63653b..1e9c8515f6 100644 --- a/src/gpu/v1/SurfaceFillContext_v1.h +++ b/src/gpu/ganesh/v1/SurfaceFillContext_v1.h @@ -10,10 +10,10 @@ #include "include/core/SkSize.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/SurfaceFillContext.h" #include "src/gpu/Swizzle.h" -#include "src/gpu/ops/OpsTask.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/ops/OpsTask.h" #include #include diff --git a/src/gpu/ganesh/vk/BUILD.bazel b/src/gpu/ganesh/vk/BUILD.bazel new file mode 100644 index 0000000000..5ba1aeb19d --- /dev/null +++ b/src/gpu/ganesh/vk/BUILD.bazel @@ -0,0 +1,1037 @@ +load("//bazel:macros.bzl", "generated_cc_atom") + +generated_cc_atom( + name = "GrVkAMDMemoryAllocator_hdr", + hdrs = ["GrVkAMDMemoryAllocator.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/vk:GrVkMemoryAllocator_hdr", + "//third_party:vulkanmemoryallocator", + ], +) + +generated_cc_atom( + name = "GrVkAMDMemoryAllocator_src", + srcs = ["GrVkAMDMemoryAllocator.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkAMDMemoryAllocator_hdr", + ":GrVkInterface_hdr", + ":GrVkMemory_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkExtensions_hdr", + "//src/core:SkTraceEvent_hdr", + ], +) + +generated_cc_atom( + name = "GrVkBuffer_hdr", + hdrs = ["GrVkBuffer.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + ], +) + +generated_cc_atom( + name = "GrVkBuffer_src", + srcs = ["GrVkBuffer.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkBuffer_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkGpu_hdr", + ":GrVkMemory_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrVkCaps_hdr", + hdrs = ["GrVkCaps.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:SkTDArray_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + ], +) + +generated_cc_atom( + name = "GrVkCaps_src", + srcs = ["GrVkCaps.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCaps_hdr", + ":GrVkGpu_hdr", + ":GrVkImage_hdr", + ":GrVkInterface_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkTexture_hdr", + ":GrVkUniformHandler_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrContextOptions_hdr", + "//include/gpu/vk:GrVkBackendContext_hdr", + "//include/gpu/vk:GrVkExtensions_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh:SkGr_hdr", + ], +) + +generated_cc_atom( + name = "GrVkCommandBuffer_hdr", + hdrs = ["GrVkCommandBuffer.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkSemaphore_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh:GrRefCnt_hdr", + ], +) + +generated_cc_atom( + name = "GrVkCommandBuffer_src", + srcs = ["GrVkCommandBuffer.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkBuffer_hdr", + ":GrVkCommandBuffer_hdr", + ":GrVkCommandPool_hdr", + ":GrVkFramebuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkImage_hdr", + ":GrVkPipelineState_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderPass_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkUtil_hdr", + "//include/core:SkRect_hdr", + "//src/core:SkTraceEvent_hdr", + ], +) + +generated_cc_atom( + name = "GrVkCommandPool_hdr", + hdrs = ["GrVkCommandPool.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkInterface_hdr", + ":GrVkManagedResource_hdr", + ":GrVkResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrVkCommandPool_src", + srcs = ["GrVkCommandPool.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCommandBuffer_hdr", + ":GrVkCommandPool_hdr", + ":GrVkGpu_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + ], +) + +generated_cc_atom( + name = "GrVkDescriptorPool_hdr", + hdrs = ["GrVkDescriptorPool.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkDescriptorPool_src", + srcs = ["GrVkDescriptorPool.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorPool_hdr", + ":GrVkGpu_hdr", + "//include/private:SkTemplates_hdr", + ], +) + +generated_cc_atom( + name = "GrVkDescriptorSetManager_hdr", + hdrs = ["GrVkDescriptorSetManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorPool_hdr", + ":GrVkSampler_hdr", + "//include/core:SkRefCnt_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:SkTArray_hdr", + "//src/gpu/ganesh:GrResourceHandle_hdr", + ], +) + +generated_cc_atom( + name = "GrVkDescriptorSetManager_src", + srcs = ["GrVkDescriptorSetManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorPool_hdr", + ":GrVkDescriptorSetManager_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkGpu_hdr", + ":GrVkUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrVkDescriptorSet_hdr", + hdrs = ["GrVkDescriptorSet.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorSetManager_hdr", + ":GrVkManagedResource_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkDescriptorSet_src", + srcs = ["GrVkDescriptorSet.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorPool_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkGpu_hdr", + ":GrVkResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrVkExtensions_src", + srcs = ["GrVkExtensions.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/vk:GrVkBackendContext_hdr", + "//include/gpu/vk:GrVkExtensions_hdr", + "//src/core:SkTSearch_hdr", + "//src/core:SkTSort_hdr", + ], +) + +generated_cc_atom( + name = "GrVkFramebuffer_hdr", + hdrs = ["GrVkFramebuffer.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + ":GrVkResourceProvider_hdr", + "//include/gpu:GrTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkFramebuffer_src", + srcs = ["GrVkFramebuffer.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCommandBuffer_hdr", + ":GrVkFramebuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkImage_hdr", + ":GrVkRenderPass_hdr", + ], +) + +generated_cc_atom( + name = "GrVkGpu_hdr", + hdrs = ["GrVkGpu.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCaps_hdr", + ":GrVkMSAALoadManager_hdr", + ":GrVkMemory_hdr", + ":GrVkResourceProvider_hdr", + ":GrVkSemaphore_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkBackendContext_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrStagingBufferManager_hdr", + ], +) + +generated_cc_atom( + name = "GrVkGpu_src", + srcs = ["GrVkGpu.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkAMDMemoryAllocator_hdr", + ":GrVkBuffer_hdr", + ":GrVkCommandBuffer_hdr", + ":GrVkCommandPool_hdr", + ":GrVkFramebuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkImage_hdr", + ":GrVkInterface_hdr", + ":GrVkMemory_hdr", + ":GrVkOpsRenderPass_hdr", + ":GrVkPipelineState_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderPass_hdr", + ":GrVkResourceProvider_hdr", + ":GrVkSemaphore_hdr", + ":GrVkTextureRenderTarget_hdr", + ":GrVkTexture_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrContextOptions_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu/vk:GrVkExtensions_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:SkTo_hdr", + "//src/core:SkCompressedDataUtils_hdr", + "//src/core:SkConvertPixels_hdr", + "//src/core:SkMipmap_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpuResourceCacheAccess_hdr", + "//src/gpu/ganesh:GrNativeRect_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/image:SkImage_Gpu_hdr", + "//src/image:SkSurface_Gpu_hdr", + ], +) + +generated_cc_atom( + name = "GrVkImageLayout_hdr", + hdrs = ["GrVkImageLayout.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkImageView_hdr", + hdrs = ["GrVkImageView.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + "//include/gpu:GrTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkImageView_src", + srcs = ["GrVkImageView.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkSamplerYcbcrConversion_hdr", + ":GrVkUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrVkImage_hdr", + hdrs = ["GrVkImage.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorSet_hdr", + "//include/core:SkTypes_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:GrVkTypesPriv_hdr", + "//src/gpu/ganesh:GrAttachment_hdr", + "//src/gpu/ganesh:GrBackendSurfaceMutableStateImpl_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh:GrRefCnt_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrVkImage_src", + srcs = ["GrVkImage.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkImage_hdr", + ":GrVkMemory_hdr", + ":GrVkTexture_hdr", + ":GrVkUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrVkInterface_hdr", + hdrs = ["GrVkInterface.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/gpu/vk:GrVkBackendContext_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkInterface_src", + srcs = ["GrVkInterface.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkInterface_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkBackendContext_hdr", + "//include/gpu/vk:GrVkExtensions_hdr", + ], +) + +generated_cc_atom( + name = "GrVkMSAALoadManager_hdr", + hdrs = ["GrVkMSAALoadManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorSetManager_hdr", + "//include/gpu:GrTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrNativeRect_hdr", + ], +) + +generated_cc_atom( + name = "GrVkMSAALoadManager_src", + srcs = ["GrVkMSAALoadManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkBuffer_hdr", + ":GrVkCommandBuffer_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkMSAALoadManager_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkResourceProvider_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrVkManagedResource_hdr", + hdrs = ["GrVkManagedResource.h"], + visibility = ["//:__subpackages__"], + deps = ["//src/gpu/ganesh:GrManagedResource_hdr"], +) + +generated_cc_atom( + name = "GrVkMemory_hdr", + hdrs = ["GrVkMemory.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/gpu/vk:GrVkMemoryAllocator_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//include/private:SkTArray_hdr", + ], +) + +generated_cc_atom( + name = "GrVkMemory_src", + srcs = ["GrVkMemory.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkMemory_hdr", + ":GrVkUtil_hdr", + ], +) + +generated_cc_atom( + name = "GrVkOpsRenderPass_hdr", + hdrs = ["GrVkOpsRenderPass.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkPipelineState_hdr", + ":GrVkRenderPass_hdr", + "//include/gpu:GrTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + ], +) + +generated_cc_atom( + name = "GrVkOpsRenderPass_src", + srcs = ["GrVkOpsRenderPass.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkBuffer_hdr", + ":GrVkCommandBuffer_hdr", + ":GrVkCommandPool_hdr", + ":GrVkFramebuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkImage_hdr", + ":GrVkOpsRenderPass_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderPass_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkResourceProvider_hdr", + ":GrVkSemaphore_hdr", + ":GrVkTexture_hdr", + "//include/core:SkDrawable_hdr", + "//include/core:SkRect_hdr", + "//include/gpu:GrBackendDrawableInfo_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineStateBuilder_hdr", + hdrs = ["GrVkPipelineStateBuilder.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkPipelineState_hdr", + ":GrVkUniformHandler_hdr", + ":GrVkVaryingHandler_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + "//src/sksl:SkSLCompiler_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineStateBuilder_src", + srcs = ["GrVkPipelineStateBuilder.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorSetManager_hdr", + ":GrVkGpu_hdr", + ":GrVkPipelineStateBuilder_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderPass_hdr", + ":GrVkRenderTarget_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkReadBuffer_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrAutoLocaleSetter_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPersistentCacheUtils_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/utils:SkShaderUtils_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineStateCache_src", + srcs = ["GrVkPipelineStateCache.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkPipelineStateBuilder_hdr", + ":GrVkPipelineState_hdr", + ":GrVkResourceProvider_hdr", + "//include/gpu:GrContextOptions_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkOpts_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineStateDataManager_hdr", + hdrs = ["GrVkPipelineStateDataManager.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkUniformHandler_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrUniformDataManager_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineStateDataManager_src", + srcs = ["GrVkPipelineStateDataManager.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCommandBuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkPipelineStateDataManager_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpuBuffer_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineState_hdr", + hdrs = ["GrVkPipelineState.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorSetManager_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkPipelineStateDataManager_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrRefCnt_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipelineState_src", + srcs = ["GrVkPipelineState.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkBuffer_hdr", + ":GrVkCommandBuffer_hdr", + ":GrVkDescriptorPool_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkMemory_hdr", + ":GrVkPipelineState_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkSampler_hdr", + ":GrVkTexture_hdr", + "//src/core:SkMipmap_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipeline_hdr", + hdrs = ["GrVkPipeline.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + ], +) + +generated_cc_atom( + name = "GrVkPipeline_src", + srcs = ["GrVkPipeline.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCommandBuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkUtil_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + ], +) + +generated_cc_atom( + name = "GrVkRenderPass_hdr", + hdrs = ["GrVkRenderPass.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + "//include/gpu:GrTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:SkMacros_hdr", + ], +) + +generated_cc_atom( + name = "GrVkRenderPass_src", + srcs = ["GrVkRenderPass.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkFramebuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkRenderPass_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkUtil_hdr", + "//src/gpu:KeyBuilder_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + ], +) + +generated_cc_atom( + name = "GrVkRenderTarget_hdr", + hdrs = ["GrVkRenderTarget.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkImage_hdr", + ":GrVkRenderPass_hdr", + ":GrVkResourceProvider_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + ], +) + +generated_cc_atom( + name = "GrVkRenderTarget_src", + srcs = ["GrVkRenderTarget.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCommandBuffer_hdr", + ":GrVkDescriptorSet_hdr", + ":GrVkFramebuffer_hdr", + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkResourceProvider_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrBackendSurface_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrBackendSurfaceMutableStateImpl_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + ], +) + +generated_cc_atom( + name = "GrVkResourceProvider_hdr", + hdrs = ["GrVkResourceProvider.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorPool_hdr", + ":GrVkDescriptorSetManager_hdr", + ":GrVkPipelineStateBuilder_hdr", + ":GrVkRenderPass_hdr", + ":GrVkSamplerYcbcrConversion_hdr", + ":GrVkSampler_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:SkMutex_hdr", + "//include/private:SkTArray_hdr", + "//src/core:SkLRUCache_hdr", + "//src/core:SkTDynamicHash_hdr", + "//src/core:SkTInternalLList_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrManagedResource_hdr", + "//src/gpu/ganesh:GrProgramDesc_hdr", + "//src/gpu/ganesh:GrResourceHandle_hdr", + "//src/gpu/ganesh:GrThreadSafePipelineBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrVkResourceProvider_src", + srcs = ["GrVkResourceProvider.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkCommandBuffer_hdr", + ":GrVkCommandPool_hdr", + ":GrVkGpu_hdr", + ":GrVkPipeline_hdr", + ":GrVkRenderTarget_hdr", + ":GrVkResourceProvider_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkTaskGroup_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrStencilSettings_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSamplerYcbcrConversion_hdr", + hdrs = ["GrVkSamplerYcbcrConversion.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/core:SkOpts_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSamplerYcbcrConversion_src", + srcs = ["GrVkSamplerYcbcrConversion.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkSamplerYcbcrConversion_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSampler_hdr", + hdrs = ["GrVkSampler.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + ":GrVkSamplerYcbcrConversion_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/core:SkOpts_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSampler_src", + srcs = ["GrVkSampler.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkSamplerYcbcrConversion_hdr", + ":GrVkSampler_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSecondaryCBDrawContext_src", + srcs = ["GrVkSecondaryCBDrawContext.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkSecondaryCBDrawContext_impl_hdr", + "//include/core:SkDeferredDisplayList_hdr", + "//include/core:SkImageInfo_hdr", + "//include/core:SkSurfaceCharacterization_hdr", + "//include/gpu:GrDirectContext_hdr", + "//include/gpu:GrRecordingContext_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/core:SkSurfacePriv_hdr", + "//src/gpu/ganesh:GrContextThreadSafeProxyPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSemaphore_hdr", + hdrs = ["GrVkSemaphore.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkManagedResource_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:GrTypesPriv_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + ], +) + +generated_cc_atom( + name = "GrVkSemaphore_src", + srcs = ["GrVkSemaphore.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkSemaphore_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrBackendSemaphore_hdr", + ], +) + +generated_cc_atom( + name = "GrVkTextureRenderTarget_hdr", + hdrs = ["GrVkTextureRenderTarget.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkRenderTarget_hdr", + ":GrVkTexture_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + ], +) + +generated_cc_atom( + name = "GrVkTextureRenderTarget_src", + srcs = ["GrVkTextureRenderTarget.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkImage_hdr", + ":GrVkTextureRenderTarget_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/core:SkMipmap_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrVkTexture_hdr", + hdrs = ["GrVkTexture.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkImage_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/core:SkLRUCache_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrVkTexture_src", + srcs = ["GrVkTexture.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkDescriptorSet_hdr", + ":GrVkGpu_hdr", + ":GrVkImageView_hdr", + ":GrVkTextureRenderTarget_hdr", + ":GrVkTexture_hdr", + ":GrVkUtil_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + ], +) + +generated_cc_atom( + name = "GrVkTypesPriv_src", + srcs = ["GrVkTypesPriv.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkImageLayout_hdr", + "//include/private:GrVkTypesPriv_hdr", + "//src/gpu/ganesh:GrBackendSurfaceMutableStateImpl_hdr", + ], +) + +generated_cc_atom( + name = "GrVkUniformHandler_hdr", + hdrs = ["GrVkUniformHandler.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkSampler_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//src/core:SkTBlockList_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrShaderVar_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + ], +) + +generated_cc_atom( + name = "GrVkUniformHandler_src", + srcs = ["GrVkUniformHandler.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkPipelineStateBuilder_hdr", + ":GrVkTexture_hdr", + ":GrVkUniformHandler_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrUtil_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + ], +) + +generated_cc_atom( + name = "GrVkUtil_hdr", + hdrs = ["GrVkUtil.h"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkInterface_hdr", + "//include/gpu:GrTypes_hdr", + "//include/gpu/vk:GrVkTypes_hdr", + "//include/private:SkMacros_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/sksl/ir:SkSLProgram_hdr", + ], +) + +generated_cc_atom( + name = "GrVkUtil_src", + srcs = ["GrVkUtil.cpp"], + visibility = ["//:__subpackages__"], + deps = [ + ":GrVkGpu_hdr", + ":GrVkUtil_hdr", + "//include/gpu:GrDirectContext_hdr", + "//src/core:SkTraceEvent_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/sksl:SkSLCompiler_hdr", + ], +) + +generated_cc_atom( + name = "GrVkVaryingHandler_hdr", + hdrs = ["GrVkVaryingHandler.h"], + visibility = ["//:__subpackages__"], + deps = ["//src/gpu/ganesh/glsl:GrGLSLVarying_hdr"], +) + +generated_cc_atom( + name = "GrVkVaryingHandler_src", + srcs = ["GrVkVaryingHandler.cpp"], + visibility = ["//:__subpackages__"], + deps = [":GrVkVaryingHandler_hdr"], +) + +generated_cc_atom( + name = "GrVkSecondaryCBDrawContext_impl_hdr", + hdrs = ["GrVkSecondaryCBDrawContext_impl.h"], + visibility = ["//:__subpackages__"], + deps = [ + "//include/core:SkRefCnt_hdr", + "//include/core:SkSurfaceProps_hdr", + "//include/core:SkTypes_hdr", + ], +) diff --git a/src/gpu/vk/GrVkAMDMemoryAllocator.cpp b/src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.cpp similarity index 98% rename from src/gpu/vk/GrVkAMDMemoryAllocator.cpp rename to src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.cpp index 0885aacc12..4206720702 100644 --- a/src/gpu/vk/GrVkAMDMemoryAllocator.cpp +++ b/src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkAMDMemoryAllocator.h" +#include "src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.h" #include "include/gpu/vk/GrVkExtensions.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #ifndef SK_USE_VMA sk_sp GrVkAMDMemoryAllocator::Make(VkInstance instance, diff --git a/src/gpu/vk/GrVkAMDMemoryAllocator.h b/src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.h similarity index 100% rename from src/gpu/vk/GrVkAMDMemoryAllocator.h rename to src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.h diff --git a/src/gpu/vk/GrVkBuffer.cpp b/src/gpu/ganesh/vk/GrVkBuffer.cpp similarity index 97% rename from src/gpu/vk/GrVkBuffer.cpp rename to src/gpu/ganesh/vk/GrVkBuffer.cpp index 284e2eea95..590d3831a3 100644 --- a/src/gpu/vk/GrVkBuffer.cpp +++ b/src/gpu/ganesh/vk/GrVkBuffer.cpp @@ -5,15 +5,15 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkBuffer.h" +#include "src/gpu/ganesh/vk/GrVkBuffer.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #define VK_CALL(GPU, X) GR_VK_CALL(GPU->vkInterface(), X) diff --git a/src/gpu/vk/GrVkBuffer.h b/src/gpu/ganesh/vk/GrVkBuffer.h similarity index 98% rename from src/gpu/vk/GrVkBuffer.h rename to src/gpu/ganesh/vk/GrVkBuffer.h index 2194c02ce1..6509af5a8d 100644 --- a/src/gpu/vk/GrVkBuffer.h +++ b/src/gpu/ganesh/vk/GrVkBuffer.h @@ -9,7 +9,7 @@ #define GrVkBuffer_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" class GrVkDescriptorSet; class GrVkGpu; diff --git a/src/gpu/vk/GrVkCaps.cpp b/src/gpu/ganesh/vk/GrVkCaps.cpp similarity index 99% rename from src/gpu/vk/GrVkCaps.cpp rename to src/gpu/ganesh/vk/GrVkCaps.cpp index e89a0d8dd3..4f61e299d3 100644 --- a/src/gpu/vk/GrVkCaps.cpp +++ b/src/gpu/ganesh/vk/GrVkCaps.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" #include @@ -14,22 +14,22 @@ #include "include/gpu/vk/GrVkBackendContext.h" #include "include/gpu/vk/GrVkExtensions.h" #include "src/core/SkCompressedDataUtils.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/GrUtil.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkTexture.h" -#include "src/gpu/vk/GrVkUniformHandler.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" +#include "src/gpu/ganesh/vk/GrVkUniformHandler.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #ifdef SK_BUILD_FOR_ANDROID #include diff --git a/src/gpu/vk/GrVkCaps.h b/src/gpu/ganesh/vk/GrVkCaps.h similarity index 99% rename from src/gpu/vk/GrVkCaps.h rename to src/gpu/ganesh/vk/GrVkCaps.h index 14d4bebafa..6fedcdc4ea 100644 --- a/src/gpu/vk/GrVkCaps.h +++ b/src/gpu/ganesh/vk/GrVkCaps.h @@ -10,7 +10,7 @@ #include "include/gpu/vk/GrVkTypes.h" #include "include/private/SkTDArray.h" -#include "src/gpu/GrCaps.h" +#include "src/gpu/ganesh/GrCaps.h" class GrVkExtensions; struct GrVkInterface; diff --git a/src/gpu/vk/GrVkCommandBuffer.cpp b/src/gpu/ganesh/vk/GrVkCommandBuffer.cpp similarity index 98% rename from src/gpu/vk/GrVkCommandBuffer.cpp rename to src/gpu/ganesh/vk/GrVkCommandBuffer.cpp index ccd4ef6184..6e9ce1d47c 100644 --- a/src/gpu/vk/GrVkCommandBuffer.cpp +++ b/src/gpu/ganesh/vk/GrVkCommandBuffer.cpp @@ -5,22 +5,22 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" #include "include/core/SkRect.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/vk/GrVkBuffer.h" -#include "src/gpu/vk/GrVkCommandPool.h" -#include "src/gpu/vk/GrVkFramebuffer.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkPipelineState.h" -#include "src/gpu/vk/GrVkPipelineState.h" -#include "src/gpu/vk/GrVkRenderPass.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandPool.h" +#include "src/gpu/ganesh/vk/GrVkFramebuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" void GrVkCommandBuffer::invalidateState() { for (auto& boundInputBuffer : fBoundInputBuffers) { diff --git a/src/gpu/vk/GrVkCommandBuffer.h b/src/gpu/ganesh/vk/GrVkCommandBuffer.h similarity index 98% rename from src/gpu/vk/GrVkCommandBuffer.h rename to src/gpu/ganesh/vk/GrVkCommandBuffer.h index 46cebf2a7c..2f34179fc8 100644 --- a/src/gpu/vk/GrVkCommandBuffer.h +++ b/src/gpu/ganesh/vk/GrVkCommandBuffer.h @@ -9,11 +9,11 @@ #define GrVkCommandBuffer_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/GrRefCnt.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkSemaphore.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/GrRefCnt.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkSemaphore.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" class GrVkFramebuffer; class GrVkImage; diff --git a/src/gpu/vk/GrVkCommandPool.cpp b/src/gpu/ganesh/vk/GrVkCommandPool.cpp similarity index 96% rename from src/gpu/vk/GrVkCommandPool.cpp rename to src/gpu/ganesh/vk/GrVkCommandPool.cpp index bbde9b9624..7e30a7d9b8 100644 --- a/src/gpu/vk/GrVkCommandPool.cpp +++ b/src/gpu/ganesh/vk/GrVkCommandPool.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkCommandPool.h" +#include "src/gpu/ganesh/vk/GrVkCommandPool.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" GrVkCommandPool* GrVkCommandPool::Create(GrVkGpu* gpu) { VkCommandPoolCreateFlags cmdPoolCreateFlags = VK_COMMAND_POOL_CREATE_TRANSIENT_BIT; diff --git a/src/gpu/vk/GrVkCommandPool.h b/src/gpu/ganesh/vk/GrVkCommandPool.h similarity index 92% rename from src/gpu/vk/GrVkCommandPool.h rename to src/gpu/ganesh/vk/GrVkCommandPool.h index 65fa05c6c9..f8cb08166c 100644 --- a/src/gpu/vk/GrVkCommandPool.h +++ b/src/gpu/ganesh/vk/GrVkCommandPool.h @@ -8,9 +8,9 @@ #ifndef GrVkCommandPool_DEFINED #define GrVkCommandPool_DEFINED -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkManagedResource.h" -#include "src/gpu/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" #include diff --git a/src/gpu/vk/GrVkDescriptorPool.cpp b/src/gpu/ganesh/vk/GrVkDescriptorPool.cpp similarity index 95% rename from src/gpu/vk/GrVkDescriptorPool.cpp rename to src/gpu/ganesh/vk/GrVkDescriptorPool.cpp index cac3d4306a..cde0fa8d82 100644 --- a/src/gpu/vk/GrVkDescriptorPool.cpp +++ b/src/gpu/ganesh/vk/GrVkDescriptorPool.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkDescriptorPool.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorPool.h" #include "include/private/SkTemplates.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" GrVkDescriptorPool* GrVkDescriptorPool::Create(GrVkGpu* gpu, VkDescriptorType type, diff --git a/src/gpu/vk/GrVkDescriptorPool.h b/src/gpu/ganesh/vk/GrVkDescriptorPool.h similarity index 96% rename from src/gpu/vk/GrVkDescriptorPool.h rename to src/gpu/ganesh/vk/GrVkDescriptorPool.h index 3afe8bb1d2..237ff37dd4 100644 --- a/src/gpu/vk/GrVkDescriptorPool.h +++ b/src/gpu/ganesh/vk/GrVkDescriptorPool.h @@ -9,7 +9,7 @@ #define GrVkDescriptorPool_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include diff --git a/src/gpu/vk/GrVkDescriptorSet.cpp b/src/gpu/ganesh/vk/GrVkDescriptorSet.cpp similarity index 78% rename from src/gpu/vk/GrVkDescriptorSet.cpp rename to src/gpu/ganesh/vk/GrVkDescriptorSet.cpp index 5b70e56f10..70c5524f0e 100644 --- a/src/gpu/vk/GrVkDescriptorSet.cpp +++ b/src/gpu/ganesh/vk/GrVkDescriptorSet.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkDescriptorPool.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorPool.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" GrVkDescriptorSet::GrVkDescriptorSet(GrVkGpu* gpu, VkDescriptorSet descSet, diff --git a/src/gpu/vk/GrVkDescriptorSet.h b/src/gpu/ganesh/vk/GrVkDescriptorSet.h similarity index 91% rename from src/gpu/vk/GrVkDescriptorSet.h rename to src/gpu/ganesh/vk/GrVkDescriptorSet.h index 3e45d2cdd5..a033035ea0 100644 --- a/src/gpu/vk/GrVkDescriptorSet.h +++ b/src/gpu/ganesh/vk/GrVkDescriptorSet.h @@ -9,8 +9,8 @@ #define GrVkDescriptorSet_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkDescriptorSetManager.h" -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSetManager.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include diff --git a/src/gpu/vk/GrVkDescriptorSetManager.cpp b/src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp similarity index 98% rename from src/gpu/vk/GrVkDescriptorSetManager.cpp rename to src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp index d1882b40d7..79ca679979 100644 --- a/src/gpu/vk/GrVkDescriptorSetManager.cpp +++ b/src/gpu/ganesh/vk/GrVkDescriptorSetManager.cpp @@ -5,12 +5,12 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkDescriptorSetManager.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSetManager.h" -#include "src/gpu/vk/GrVkDescriptorPool.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkUniformHandler.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorPool.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkUniformHandler.h" #if defined(SK_ENABLE_SCOPED_LSAN_SUPPRESSIONS) #include diff --git a/src/gpu/vk/GrVkDescriptorSetManager.h b/src/gpu/ganesh/vk/GrVkDescriptorSetManager.h similarity index 96% rename from src/gpu/vk/GrVkDescriptorSetManager.h rename to src/gpu/ganesh/vk/GrVkDescriptorSetManager.h index c17ee9914c..3cf1152159 100644 --- a/src/gpu/vk/GrVkDescriptorSetManager.h +++ b/src/gpu/ganesh/vk/GrVkDescriptorSetManager.h @@ -11,9 +11,9 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/private/SkTArray.h" -#include "src/gpu/GrResourceHandle.h" -#include "src/gpu/vk/GrVkDescriptorPool.h" -#include "src/gpu/vk/GrVkSampler.h" +#include "src/gpu/ganesh/GrResourceHandle.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorPool.h" +#include "src/gpu/ganesh/vk/GrVkSampler.h" class GrVkDescriptorSet; class GrVkGpu; diff --git a/src/gpu/vk/GrVkExtensions.cpp b/src/gpu/ganesh/vk/GrVkExtensions.cpp similarity index 100% rename from src/gpu/vk/GrVkExtensions.cpp rename to src/gpu/ganesh/vk/GrVkExtensions.cpp diff --git a/src/gpu/vk/GrVkFramebuffer.cpp b/src/gpu/ganesh/vk/GrVkFramebuffer.cpp similarity index 94% rename from src/gpu/vk/GrVkFramebuffer.cpp rename to src/gpu/ganesh/vk/GrVkFramebuffer.cpp index 79c31a34d0..5d859e85f7 100644 --- a/src/gpu/vk/GrVkFramebuffer.cpp +++ b/src/gpu/ganesh/vk/GrVkFramebuffer.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkFramebuffer.h" +#include "src/gpu/ganesh/vk/GrVkFramebuffer.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" sk_sp GrVkFramebuffer::Make( GrVkGpu* gpu, diff --git a/src/gpu/vk/GrVkFramebuffer.h b/src/gpu/ganesh/vk/GrVkFramebuffer.h similarity index 97% rename from src/gpu/vk/GrVkFramebuffer.h rename to src/gpu/ganesh/vk/GrVkFramebuffer.h index 623fe78e8b..6cb0d37c23 100644 --- a/src/gpu/vk/GrVkFramebuffer.h +++ b/src/gpu/ganesh/vk/GrVkFramebuffer.h @@ -10,8 +10,8 @@ #include "include/gpu/GrTypes.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkManagedResource.h" -#include "src/gpu/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" #include diff --git a/src/gpu/vk/GrVkGpu.cpp b/src/gpu/ganesh/vk/GrVkGpu.cpp similarity index 98% rename from src/gpu/vk/GrVkGpu.cpp rename to src/gpu/ganesh/vk/GrVkGpu.cpp index a1fc1f2a59..20b974b3b9 100644 --- a/src/gpu/vk/GrVkGpu.cpp +++ b/src/gpu/ganesh/vk/GrVkGpu.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" #include "include/gpu/GrBackendSemaphore.h" #include "include/gpu/GrBackendSurface.h" @@ -16,34 +16,34 @@ #include "src/core/SkConvertPixels.h" #include "src/core/SkMipmap.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpuResourceCacheAccess.h" -#include "src/gpu/GrNativeRect.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/vk/GrVkAMDMemoryAllocator.h" -#include "src/gpu/vk/GrVkBuffer.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkCommandPool.h" -#include "src/gpu/vk/GrVkFramebuffer.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkOpsRenderPass.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkPipelineState.h" -#include "src/gpu/vk/GrVkRenderPass.h" -#include "src/gpu/vk/GrVkResourceProvider.h" -#include "src/gpu/vk/GrVkSemaphore.h" -#include "src/gpu/vk/GrVkTexture.h" -#include "src/gpu/vk/GrVkTextureRenderTarget.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpuResourceCacheAccess.h" +#include "src/gpu/ganesh/GrNativeRect.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/vk/GrVkAMDMemoryAllocator.h" +#include "src/gpu/ganesh/vk/GrVkBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandPool.h" +#include "src/gpu/ganesh/vk/GrVkFramebuffer.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkOpsRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkSemaphore.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" +#include "src/gpu/ganesh/vk/GrVkTextureRenderTarget.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkSurface_Gpu.h" diff --git a/src/gpu/vk/GrVkGpu.h b/src/gpu/ganesh/vk/GrVkGpu.h similarity index 98% rename from src/gpu/vk/GrVkGpu.h rename to src/gpu/ganesh/vk/GrVkGpu.h index 0a89200bec..e4fe37ef99 100644 --- a/src/gpu/vk/GrVkGpu.h +++ b/src/gpu/ganesh/vk/GrVkGpu.h @@ -10,14 +10,14 @@ #include "include/gpu/vk/GrVkBackendContext.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrStagingBufferManager.h" -#include "src/gpu/vk/GrVkCaps.h" -#include "src/gpu/vk/GrVkMSAALoadManager.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkResourceProvider.h" -#include "src/gpu/vk/GrVkSemaphore.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrStagingBufferManager.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkMSAALoadManager.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkSemaphore.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" class GrDirectContext; class GrPipeline; diff --git a/src/gpu/vk/GrVkImage.cpp b/src/gpu/ganesh/vk/GrVkImage.cpp similarity index 99% rename from src/gpu/vk/GrVkImage.cpp rename to src/gpu/ganesh/vk/GrVkImage.cpp index d3d127e04a..924909d755 100644 --- a/src/gpu/vk/GrVkImage.cpp +++ b/src/gpu/ganesh/vk/GrVkImage.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkTexture.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #define VK_CALL(GPU, X) GR_VK_CALL(GPU->vkInterface(), X) diff --git a/src/gpu/vk/GrVkImage.h b/src/gpu/ganesh/vk/GrVkImage.h similarity index 97% rename from src/gpu/vk/GrVkImage.h rename to src/gpu/ganesh/vk/GrVkImage.h index 6c15d1eb2b..f3fa9314d7 100644 --- a/src/gpu/vk/GrVkImage.h +++ b/src/gpu/ganesh/vk/GrVkImage.h @@ -13,12 +13,12 @@ #include "include/gpu/vk/GrVkTypes.h" #include "include/private/GrTypesPriv.h" #include "include/private/GrVkTypesPriv.h" -#include "src/gpu/GrAttachment.h" -#include "src/gpu/GrBackendSurfaceMutableStateImpl.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/GrRefCnt.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/GrAttachment.h" +#include "src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/GrRefCnt.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" #include diff --git a/src/gpu/vk/GrVkImageLayout.h b/src/gpu/ganesh/vk/GrVkImageLayout.h similarity index 100% rename from src/gpu/vk/GrVkImageLayout.h rename to src/gpu/ganesh/vk/GrVkImageLayout.h diff --git a/src/gpu/vk/GrVkImageView.cpp b/src/gpu/ganesh/vk/GrVkImageView.cpp similarity index 93% rename from src/gpu/vk/GrVkImageView.cpp rename to src/gpu/ganesh/vk/GrVkImageView.cpp index b5ae8e18da..31bac63f3e 100644 --- a/src/gpu/vk/GrVkImageView.cpp +++ b/src/gpu/ganesh/vk/GrVkImageView.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkSamplerYcbcrConversion.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" sk_sp GrVkImageView::Make(GrVkGpu* gpu, VkImage image, diff --git a/src/gpu/vk/GrVkImageView.h b/src/gpu/ganesh/vk/GrVkImageView.h similarity index 96% rename from src/gpu/vk/GrVkImageView.h rename to src/gpu/ganesh/vk/GrVkImageView.h index ec0a2ee9ec..4a7a13f904 100644 --- a/src/gpu/vk/GrVkImageView.h +++ b/src/gpu/ganesh/vk/GrVkImageView.h @@ -10,7 +10,7 @@ #include "include/gpu/GrTypes.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include diff --git a/src/gpu/vk/GrVkInterface.cpp b/src/gpu/ganesh/vk/GrVkInterface.cpp similarity index 99% rename from src/gpu/vk/GrVkInterface.cpp rename to src/gpu/ganesh/vk/GrVkInterface.cpp index acb7bcb82c..2eee9c7625 100644 --- a/src/gpu/vk/GrVkInterface.cpp +++ b/src/gpu/ganesh/vk/GrVkInterface.cpp @@ -7,8 +7,8 @@ #include "include/gpu/vk/GrVkBackendContext.h" #include "include/gpu/vk/GrVkExtensions.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #define ACQUIRE_PROC(name, instance, device) \ fFunctions.f##name = reinterpret_cast(getProc("vk" #name, instance, device)) diff --git a/src/gpu/vk/GrVkInterface.h b/src/gpu/ganesh/vk/GrVkInterface.h similarity index 100% rename from src/gpu/vk/GrVkInterface.h rename to src/gpu/ganesh/vk/GrVkInterface.h diff --git a/src/gpu/vk/GrVkMSAALoadManager.cpp b/src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp similarity index 94% rename from src/gpu/vk/GrVkMSAALoadManager.cpp rename to src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp index 39a878e9e1..887d2d32fb 100644 --- a/src/gpu/vk/GrVkMSAALoadManager.cpp +++ b/src/gpu/ganesh/vk/GrVkMSAALoadManager.cpp @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkMSAALoadManager.h" +#include "src/gpu/ganesh/vk/GrVkMSAALoadManager.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/vk/GrVkBuffer.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkResourceProvider.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" GrVkMSAALoadManager::GrVkMSAALoadManager() : fVertShaderModule(VK_NULL_HANDLE) diff --git a/src/gpu/vk/GrVkMSAALoadManager.h b/src/gpu/ganesh/vk/GrVkMSAALoadManager.h similarity index 93% rename from src/gpu/vk/GrVkMSAALoadManager.h rename to src/gpu/ganesh/vk/GrVkMSAALoadManager.h index 9a5f7cbafd..0bb9c18cb1 100644 --- a/src/gpu/vk/GrVkMSAALoadManager.h +++ b/src/gpu/ganesh/vk/GrVkMSAALoadManager.h @@ -10,8 +10,8 @@ #include "include/gpu/GrTypes.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrNativeRect.h" -#include "src/gpu/vk/GrVkDescriptorSetManager.h" +#include "src/gpu/ganesh/GrNativeRect.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSetManager.h" class GrAttachment; class GrSurface; diff --git a/src/gpu/vk/GrVkManagedResource.h b/src/gpu/ganesh/vk/GrVkManagedResource.h similarity index 94% rename from src/gpu/vk/GrVkManagedResource.h rename to src/gpu/ganesh/vk/GrVkManagedResource.h index 1489be318e..b058b35b24 100644 --- a/src/gpu/vk/GrVkManagedResource.h +++ b/src/gpu/ganesh/vk/GrVkManagedResource.h @@ -8,7 +8,7 @@ #ifndef GrVkManagedResource_DEFINED #define GrVkManagedResource_DEFINED -#include "src/gpu/GrManagedResource.h" +#include "src/gpu/ganesh/GrManagedResource.h" class GrVkGpu; diff --git a/src/gpu/vk/GrVkMemory.cpp b/src/gpu/ganesh/vk/GrVkMemory.cpp similarity index 98% rename from src/gpu/vk/GrVkMemory.cpp rename to src/gpu/ganesh/vk/GrVkMemory.cpp index 6e82ec3a9b..37927bc8ad 100644 --- a/src/gpu/vk/GrVkMemory.cpp +++ b/src/gpu/ganesh/vk/GrVkMemory.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" using AllocationPropertyFlags = GrVkMemoryAllocator::AllocationPropertyFlags; using BufferUsage = GrVkMemoryAllocator::BufferUsage; diff --git a/src/gpu/vk/GrVkMemory.h b/src/gpu/ganesh/vk/GrVkMemory.h similarity index 100% rename from src/gpu/vk/GrVkMemory.h rename to src/gpu/ganesh/vk/GrVkMemory.h diff --git a/src/gpu/vk/GrVkOpsRenderPass.cpp b/src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp similarity index 97% rename from src/gpu/vk/GrVkOpsRenderPass.cpp rename to src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp index f867df419d..6ef2775cae 100644 --- a/src/gpu/vk/GrVkOpsRenderPass.cpp +++ b/src/gpu/ganesh/vk/GrVkOpsRenderPass.cpp @@ -5,30 +5,30 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkOpsRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkOpsRenderPass.h" #include "include/core/SkDrawable.h" #include "include/core/SkRect.h" #include "include/gpu/GrBackendDrawableInfo.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/vk/GrVkBuffer.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkCommandPool.h" -#include "src/gpu/vk/GrVkFramebuffer.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkRenderPass.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkResourceProvider.h" -#include "src/gpu/vk/GrVkSemaphore.h" -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/vk/GrVkBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandPool.h" +#include "src/gpu/ganesh/vk/GrVkFramebuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkSemaphore.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" ///////////////////////////////////////////////////////////////////////////// diff --git a/src/gpu/vk/GrVkOpsRenderPass.h b/src/gpu/ganesh/vk/GrVkOpsRenderPass.h similarity index 96% rename from src/gpu/vk/GrVkOpsRenderPass.h rename to src/gpu/ganesh/vk/GrVkOpsRenderPass.h index 738e2bce01..c129c73ff8 100644 --- a/src/gpu/vk/GrVkOpsRenderPass.h +++ b/src/gpu/ganesh/vk/GrVkOpsRenderPass.h @@ -8,13 +8,13 @@ #ifndef GrVkOpsRenderPass_DEFINED #define GrVkOpsRenderPass_DEFINED -#include "src/gpu/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" #include "include/gpu/GrTypes.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/vk/GrVkPipelineState.h" -#include "src/gpu/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" class GrVkFramebuffer; class GrVkGpu; diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/ganesh/vk/GrVkPipeline.cpp similarity index 98% rename from src/gpu/vk/GrVkPipeline.cpp rename to src/gpu/ganesh/vk/GrVkPipeline.cpp index e0fab55812..df96a3ddd7 100644 --- a/src/gpu/vk/GrVkPipeline.cpp +++ b/src/gpu/ganesh/vk/GrVkPipeline.cpp @@ -5,16 +5,16 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #if defined(SK_ENABLE_SCOPED_LSAN_SUPPRESSIONS) #include diff --git a/src/gpu/vk/GrVkPipeline.h b/src/gpu/ganesh/vk/GrVkPipeline.h similarity index 96% rename from src/gpu/vk/GrVkPipeline.h rename to src/gpu/ganesh/vk/GrVkPipeline.h index 18f9b69611..907fcb93ff 100644 --- a/src/gpu/vk/GrVkPipeline.h +++ b/src/gpu/ganesh/vk/GrVkPipeline.h @@ -10,9 +10,9 @@ #include "include/gpu/vk/GrVkTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/ganesh/vk/GrVkPipelineState.cpp similarity index 93% rename from src/gpu/vk/GrVkPipelineState.cpp rename to src/gpu/ganesh/vk/GrVkPipelineState.cpp index 73d00437ca..1ab06f2742 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/ganesh/vk/GrVkPipelineState.cpp @@ -5,27 +5,27 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/vk/GrVkBuffer.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkDescriptorPool.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkSampler.h" -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/vk/GrVkBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorPool.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkSampler.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" GrVkPipelineState::GrVkPipelineState( GrVkGpu* gpu, diff --git a/src/gpu/vk/GrVkPipelineState.h b/src/gpu/ganesh/vk/GrVkPipelineState.h similarity index 94% rename from src/gpu/vk/GrVkPipelineState.h rename to src/gpu/ganesh/vk/GrVkPipelineState.h index 3a70512259..6fa67124da 100644 --- a/src/gpu/vk/GrVkPipelineState.h +++ b/src/gpu/ganesh/vk/GrVkPipelineState.h @@ -10,11 +10,11 @@ #define GrVkPipelineState_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrRefCnt.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkDescriptorSetManager.h" -#include "src/gpu/vk/GrVkPipelineStateDataManager.h" +#include "src/gpu/ganesh/GrRefCnt.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSetManager.h" +#include "src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h" class GrPipeline; class GrStencilSettings; diff --git a/src/gpu/vk/GrVkPipelineStateBuilder.cpp b/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp similarity index 96% rename from src/gpu/vk/GrVkPipelineStateBuilder.cpp rename to src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp index 16b7fe346f..54bc7f857a 100644 --- a/src/gpu/vk/GrVkPipelineStateBuilder.cpp +++ b/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.cpp @@ -5,21 +5,21 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkPipelineStateBuilder.h" +#include "src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkReadBuffer.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPersistentCacheUtils.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/vk/GrVkDescriptorSetManager.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkRenderPass.h" -#include "src/gpu/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/GrAutoLocaleSetter.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSetManager.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" #include "src/utils/SkShaderUtils.h" GrVkPipelineState* GrVkPipelineStateBuilder::CreatePipelineState( diff --git a/src/gpu/vk/GrVkPipelineStateBuilder.h b/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h similarity index 92% rename from src/gpu/vk/GrVkPipelineStateBuilder.h rename to src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h index cdcc1e5265..19aafaa0f1 100644 --- a/src/gpu/vk/GrVkPipelineStateBuilder.h +++ b/src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h @@ -9,11 +9,11 @@ #define GrVkPipelineStateBuilder_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/vk/GrVkPipelineState.h" -#include "src/gpu/vk/GrVkUniformHandler.h" -#include "src/gpu/vk/GrVkVaryingHandler.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkUniformHandler.h" +#include "src/gpu/ganesh/vk/GrVkVaryingHandler.h" #include "src/sksl/SkSLCompiler.h" class GrProgramDesc; diff --git a/src/gpu/vk/GrVkPipelineStateCache.cpp b/src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp similarity index 89% rename from src/gpu/vk/GrVkPipelineStateCache.cpp rename to src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp index 4c15bb3112..1205f7e7c0 100644 --- a/src/gpu/vk/GrVkPipelineStateCache.cpp +++ b/src/gpu/ganesh/vk/GrVkPipelineStateCache.cpp @@ -8,16 +8,16 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkPipelineState.h" -#include "src/gpu/vk/GrVkPipelineStateBuilder.h" -#include "src/gpu/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkPipelineState.h" +#include "src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" #ifdef SK_DEBUG // Display pipeline state cache usage diff --git a/src/gpu/vk/GrVkPipelineStateDataManager.cpp b/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp similarity index 95% rename from src/gpu/vk/GrVkPipelineStateDataManager.cpp rename to src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp index 96e86f5248..00fe45dea2 100644 --- a/src/gpu/vk/GrVkPipelineStateDataManager.cpp +++ b/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkPipelineStateDataManager.h" +#include "src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpuBuffer.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpuBuffer.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" GrVkPipelineStateDataManager::GrVkPipelineStateDataManager(const UniformInfoArray& uniforms, uint32_t uniformSize, diff --git a/src/gpu/vk/GrVkPipelineStateDataManager.h b/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h similarity index 94% rename from src/gpu/vk/GrVkPipelineStateDataManager.h rename to src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h index cf4451ef68..01170efc08 100644 --- a/src/gpu/vk/GrVkPipelineStateDataManager.h +++ b/src/gpu/ganesh/vk/GrVkPipelineStateDataManager.h @@ -8,10 +8,10 @@ #ifndef GrVkPipelineStateDataManager_DEFINED #define GrVkPipelineStateDataManager_DEFINED -#include "src/gpu/GrUniformDataManager.h" +#include "src/gpu/ganesh/GrUniformDataManager.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkUniformHandler.h" +#include "src/gpu/ganesh/vk/GrVkUniformHandler.h" class GrGpuBuffer; class GrVkCommandBuffer; diff --git a/src/gpu/vk/GrVkRenderPass.cpp b/src/gpu/ganesh/vk/GrVkRenderPass.cpp similarity index 98% rename from src/gpu/vk/GrVkRenderPass.cpp rename to src/gpu/ganesh/vk/GrVkRenderPass.cpp index 62e40d4ba0..0fcba14f80 100644 --- a/src/gpu/vk/GrVkRenderPass.cpp +++ b/src/gpu/ganesh/vk/GrVkRenderPass.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" -#include "src/gpu/GrProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/vk/GrVkFramebuffer.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/vk/GrVkFramebuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" typedef GrVkRenderPass::AttachmentsDescriptor::AttachmentDesc AttachmentDesc; diff --git a/src/gpu/vk/GrVkRenderPass.h b/src/gpu/ganesh/vk/GrVkRenderPass.h similarity index 99% rename from src/gpu/vk/GrVkRenderPass.h rename to src/gpu/ganesh/vk/GrVkRenderPass.h index 36cf01446d..3779cab39a 100644 --- a/src/gpu/vk/GrVkRenderPass.h +++ b/src/gpu/ganesh/vk/GrVkRenderPass.h @@ -11,7 +11,7 @@ #include "include/gpu/GrTypes.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/private/SkMacros.h" -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include diff --git a/src/gpu/vk/GrVkRenderTarget.cpp b/src/gpu/ganesh/vk/GrVkRenderTarget.cpp similarity index 97% rename from src/gpu/vk/GrVkRenderTarget.cpp rename to src/gpu/ganesh/vk/GrVkRenderTarget.cpp index 2deaa994c2..9a770c16bb 100644 --- a/src/gpu/vk/GrVkRenderTarget.cpp +++ b/src/gpu/ganesh/vk/GrVkRenderTarget.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrBackendSurfaceMutableStateImpl.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkFramebuffer.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkResourceProvider.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkFramebuffer.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "include/gpu/vk/GrVkTypes.h" diff --git a/src/gpu/vk/GrVkRenderTarget.h b/src/gpu/ganesh/vk/GrVkRenderTarget.h similarity index 97% rename from src/gpu/vk/GrVkRenderTarget.h rename to src/gpu/ganesh/vk/GrVkRenderTarget.h index 65c47fee3d..c5cdcda1c2 100644 --- a/src/gpu/vk/GrVkRenderTarget.h +++ b/src/gpu/ganesh/vk/GrVkRenderTarget.h @@ -9,12 +9,12 @@ #ifndef GrVkRenderTarget_DEFINED #define GrVkRenderTarget_DEFINED -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/vk/GrVkImage.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkRenderPass.h" -#include "src/gpu/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" class GrVkFramebuffer; class GrVkGpu; diff --git a/src/gpu/vk/GrVkResourceProvider.cpp b/src/gpu/ganesh/vk/GrVkResourceProvider.cpp similarity index 98% rename from src/gpu/vk/GrVkResourceProvider.cpp rename to src/gpu/ganesh/vk/GrVkResourceProvider.cpp index 78479e0f69..f6040121a2 100644 --- a/src/gpu/vk/GrVkResourceProvider.cpp +++ b/src/gpu/ganesh/vk/GrVkResourceProvider.cpp @@ -5,20 +5,20 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkResourceProvider.h" +#include "src/gpu/ganesh/vk/GrVkResourceProvider.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkTaskGroup.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrStencilSettings.h" -#include "src/gpu/vk/GrVkCommandBuffer.h" -#include "src/gpu/vk/GrVkCommandPool.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkPipeline.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrStencilSettings.h" +#include "src/gpu/ganesh/vk/GrVkCommandBuffer.h" +#include "src/gpu/ganesh/vk/GrVkCommandPool.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkPipeline.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" GrVkResourceProvider::GrVkResourceProvider(GrVkGpu* gpu) : fGpu(gpu) diff --git a/src/gpu/vk/GrVkResourceProvider.h b/src/gpu/ganesh/vk/GrVkResourceProvider.h similarity index 96% rename from src/gpu/vk/GrVkResourceProvider.h rename to src/gpu/ganesh/vk/GrVkResourceProvider.h index 2ebb81419f..58f5508860 100644 --- a/src/gpu/vk/GrVkResourceProvider.h +++ b/src/gpu/ganesh/vk/GrVkResourceProvider.h @@ -14,18 +14,18 @@ #include "src/core/SkLRUCache.h" #include "src/core/SkTDynamicHash.h" #include "src/core/SkTInternalLList.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrManagedResource.h" -#include "src/gpu/GrProgramDesc.h" -#include "src/gpu/GrResourceHandle.h" -#include "src/gpu/GrThreadSafePipelineBuilder.h" -#include "src/gpu/vk/GrVkDescriptorPool.h" -#include "src/gpu/vk/GrVkDescriptorSetManager.h" -#include "src/gpu/vk/GrVkPipelineStateBuilder.h" -#include "src/gpu/vk/GrVkRenderPass.h" -#include "src/gpu/vk/GrVkSampler.h" -#include "src/gpu/vk/GrVkSamplerYcbcrConversion.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrManagedResource.h" +#include "src/gpu/ganesh/GrProgramDesc.h" +#include "src/gpu/ganesh/GrResourceHandle.h" +#include "src/gpu/ganesh/GrThreadSafePipelineBuilder.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorPool.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSetManager.h" +#include "src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h" +#include "src/gpu/ganesh/vk/GrVkRenderPass.h" +#include "src/gpu/ganesh/vk/GrVkSampler.h" +#include "src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" class GrVkCommandPool; class GrVkGpu; diff --git a/src/gpu/vk/GrVkSampler.cpp b/src/gpu/ganesh/vk/GrVkSampler.cpp similarity index 97% rename from src/gpu/vk/GrVkSampler.cpp rename to src/gpu/ganesh/vk/GrVkSampler.cpp index 7082d195ab..b1b120bd31 100644 --- a/src/gpu/vk/GrVkSampler.cpp +++ b/src/gpu/ganesh/vk/GrVkSampler.cpp @@ -5,10 +5,10 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkSampler.h" +#include "src/gpu/ganesh/vk/GrVkSampler.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkSamplerYcbcrConversion.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h" static VkSamplerAddressMode wrap_mode_to_vk_sampler_address(GrSamplerState::WrapMode wrapMode) { switch (wrapMode) { diff --git a/src/gpu/vk/GrVkSampler.h b/src/gpu/ganesh/vk/GrVkSampler.h similarity index 96% rename from src/gpu/vk/GrVkSampler.h rename to src/gpu/ganesh/vk/GrVkSampler.h index 3bd19a50d1..87ccce0ed9 100644 --- a/src/gpu/vk/GrVkSampler.h +++ b/src/gpu/ganesh/vk/GrVkSampler.h @@ -10,8 +10,8 @@ #include "include/gpu/vk/GrVkTypes.h" #include "src/core/SkOpts.h" -#include "src/gpu/vk/GrVkManagedResource.h" -#include "src/gpu/vk/GrVkSamplerYcbcrConversion.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h" #include #include diff --git a/src/gpu/vk/GrVkSamplerYcbcrConversion.cpp b/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp similarity index 98% rename from src/gpu/vk/GrVkSamplerYcbcrConversion.cpp rename to src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp index d3659e407a..0a5586118c 100644 --- a/src/gpu/vk/GrVkSamplerYcbcrConversion.cpp +++ b/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkSamplerYcbcrConversion.h" +#include "src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" GrVkSamplerYcbcrConversion* GrVkSamplerYcbcrConversion::Create( GrVkGpu* gpu, const GrVkYcbcrConversionInfo& info) { diff --git a/src/gpu/vk/GrVkSamplerYcbcrConversion.h b/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h similarity index 97% rename from src/gpu/vk/GrVkSamplerYcbcrConversion.h rename to src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h index 4296b7e2cf..8b157c96c7 100644 --- a/src/gpu/vk/GrVkSamplerYcbcrConversion.h +++ b/src/gpu/ganesh/vk/GrVkSamplerYcbcrConversion.h @@ -8,7 +8,7 @@ #ifndef GrVkSamplerYcbcrConverison_DEFINED #define GrVkSamplerYcbcrConverison_DEFINED -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include "include/gpu/vk/GrVkTypes.h" #include "src/core/SkOpts.h" diff --git a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp b/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp similarity index 95% rename from src/gpu/vk/GrVkSecondaryCBDrawContext.cpp rename to src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp index 77499d26e1..949058cb84 100644 --- a/src/gpu/vk/GrVkSecondaryCBDrawContext.cpp +++ b/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkSecondaryCBDrawContext.h" +#include "src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h" #include "include/core/SkDeferredDisplayList.h" #include "include/core/SkImageInfo.h" @@ -14,12 +14,12 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/vk/GrVkTypes.h" #include "src/core/SkSurfacePriv.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" sk_sp GrVkSecondaryCBDrawContext::Make(GrRecordingContext* rContext, const SkImageInfo& imageInfo, diff --git a/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h b/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h new file mode 100644 index 0000000000..48b8b3810a --- /dev/null +++ b/src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h @@ -0,0 +1,126 @@ +/* + * Copyright 2019 Google Inc. + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#ifndef GrVkSecondaryCBDrawContext_DEFINED +#define GrVkSecondaryCBDrawContext_DEFINED + +#include "include/core/SkRefCnt.h" +#include "include/core/SkSurfaceProps.h" +#include "include/core/SkTypes.h" + +class GrBackendSemaphore; +class GrRecordingContext; +struct GrVkDrawableInfo; +namespace skgpu { class BaseDevice; } +class SkCanvas; +class SkDeferredDisplayList; +struct SkImageInfo; +class SkSurfaceCharacterization; +class SkSurfaceProps; + +/** + * This class is a private header that is intended to only be used inside of Chromium. This requires + * Chromium to burrow in and include this specifically since it is not part of skia's public include + * directory. + */ + +/** + * This class is used to draw into an external Vulkan secondary command buffer that is imported + * by the client. The secondary command buffer that gets imported must already have had begin called + * on it with VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT. Thus any draws to the imported + * command buffer cannot require changing the render pass. This requirement means that certain types + * of draws will not be supported when using a GrVkSecondaryCBDrawContext. This includes: + * Draws that require a dst copy for blending will be dropped + * Text draws will be dropped (these may require intermediate uploads of text data) + * Read and Write pixels will not work + * Any other draw that requires a copy will fail (this includes using backdrop filter with save + * layer). + * Stenciling is also disabled, but that should not restrict any actual draws from working. + * + * While using a GrVkSecondaryCBDrawContext, the client can also draw into normal SkSurfaces and + * then draw those SkSufaces (as SkImages) into the GrVkSecondaryCBDrawContext. If any of the + * previously mentioned unsupported draws are needed by the client, they can draw them into an + * offscreen surface, and then draw that into the GrVkSecondaryCBDrawContext. + * + * After all drawing to the GrVkSecondaryCBDrawContext has been done, the client must call flush() + * on the GrVkSecondaryCBDrawContext to actually fill in the secondary VkCommandBuffer with the + * draws. + * + * Additionally, the client must keep the GrVkSecondaryCBDrawContext alive until the secondary + * VkCommandBuffer has been submitted and all work finished on the GPU. Before deleting the + * GrVkSecondaryCBDrawContext, the client must call releaseResources() so that Skia can cleanup + * any internal objects that were created for the draws into the secondary command buffer. + */ +class SK_SPI GrVkSecondaryCBDrawContext : public SkRefCnt { +public: + static sk_sp Make(GrRecordingContext*, + const SkImageInfo&, + const GrVkDrawableInfo&, + const SkSurfaceProps* props); + + ~GrVkSecondaryCBDrawContext() override; + + SkCanvas* getCanvas(); + + // Records all the draws to the imported secondary command buffer and sets any dependent + // offscreen draws to the GPU. + void flush(); + + /** Inserts a list of GPU semaphores that Skia will have the driver wait on before executing + commands for this secondary CB. The wait semaphores will get added to the VkCommandBuffer + owned by this GrContext when flush() is called, and not the command buffer which the + Secondary CB is from. This will guarantee that the driver waits on the semaphores before + the secondary command buffer gets executed. If this call returns false, then the GPU + back end will not wait on any passed in semaphores, and the client will still own the + semaphores, regardless of the value of deleteSemaphoresAfterWait. + + If deleteSemaphoresAfterWait is false then Skia will not delete the semaphores. In this case + it is the client's responsibility to not destroy or attempt to reuse the semaphores until it + knows that Skia has finished waiting on them. This can be done by using finishedProcs + on flush calls. + + @param numSemaphores size of waitSemaphores array + @param waitSemaphores array of semaphore containers + @paramm deleteSemaphoresAfterWait who owns and should delete the semaphores + @return true if GPU is waiting on semaphores + */ + bool wait(int numSemaphores, + const GrBackendSemaphore waitSemaphores[], + bool deleteSemaphoresAfterWait = true); + + // This call will release all resources held by the draw context. The client must call + // releaseResources() before deleting the drawing context. However, the resources also include + // any Vulkan resources that were created and used for draws. Therefore the client must only + // call releaseResources() after submitting the secondary command buffer, and waiting for it to + // finish on the GPU. If it is called earlier then some vulkan objects may be deleted while they + // are still in use by the GPU. + void releaseResources(); + + const SkSurfaceProps& props() const { return fProps; } + + // TODO: Fill out these calls to support DDL + bool characterize(SkSurfaceCharacterization* characterization) const; + +#ifndef SK_DDL_IS_UNIQUE_POINTER + bool draw(sk_sp deferredDisplayList); +#else + bool draw(const SkDeferredDisplayList* deferredDisplayList); +#endif + + bool isCompatible(const SkSurfaceCharacterization& characterization) const; + +private: + explicit GrVkSecondaryCBDrawContext(sk_sp, const SkSurfaceProps*); + + sk_sp fDevice; + std::unique_ptr fCachedCanvas; + const SkSurfaceProps fProps; + + using INHERITED = SkRefCnt; +}; + +#endif diff --git a/src/gpu/vk/GrVkSemaphore.cpp b/src/gpu/ganesh/vk/GrVkSemaphore.cpp similarity index 95% rename from src/gpu/vk/GrVkSemaphore.cpp rename to src/gpu/ganesh/vk/GrVkSemaphore.cpp index 21e336e786..70c7f0ea80 100644 --- a/src/gpu/vk/GrVkSemaphore.cpp +++ b/src/gpu/ganesh/vk/GrVkSemaphore.cpp @@ -5,11 +5,11 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkSemaphore.h" +#include "src/gpu/ganesh/vk/GrVkSemaphore.h" #include "include/gpu/GrBackendSemaphore.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #ifdef VK_USE_PLATFORM_WIN32_KHR // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW diff --git a/src/gpu/vk/GrVkSemaphore.h b/src/gpu/ganesh/vk/GrVkSemaphore.h similarity index 96% rename from src/gpu/vk/GrVkSemaphore.h rename to src/gpu/ganesh/vk/GrVkSemaphore.h index 54e3e95ab6..7422001830 100644 --- a/src/gpu/vk/GrVkSemaphore.h +++ b/src/gpu/ganesh/vk/GrVkSemaphore.h @@ -8,11 +8,11 @@ #ifndef GrVkSemaphore_DEFINED #define GrVkSemaphore_DEFINED -#include "src/gpu/GrSemaphore.h" +#include "src/gpu/ganesh/GrSemaphore.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/private/GrTypesPriv.h" -#include "src/gpu/vk/GrVkManagedResource.h" +#include "src/gpu/ganesh/vk/GrVkManagedResource.h" #include diff --git a/src/gpu/vk/GrVkTexture.cpp b/src/gpu/ganesh/vk/GrVkTexture.cpp similarity index 96% rename from src/gpu/vk/GrVkTexture.cpp rename to src/gpu/ganesh/vk/GrVkTexture.cpp index bab8e490d6..326e2d4c83 100644 --- a/src/gpu/vk/GrVkTexture.cpp +++ b/src/gpu/ganesh/vk/GrVkTexture.cpp @@ -6,14 +6,14 @@ */ -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/vk/GrVkDescriptorSet.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkTextureRenderTarget.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/vk/GrVkDescriptorSet.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkTextureRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "include/gpu/vk/GrVkTypes.h" diff --git a/src/gpu/vk/GrVkTexture.h b/src/gpu/ganesh/vk/GrVkTexture.h similarity index 97% rename from src/gpu/vk/GrVkTexture.h rename to src/gpu/ganesh/vk/GrVkTexture.h index b0da848511..c57ee755bd 100644 --- a/src/gpu/vk/GrVkTexture.h +++ b/src/gpu/ganesh/vk/GrVkTexture.h @@ -10,9 +10,9 @@ #include "include/gpu/vk/GrVkTypes.h" #include "src/core/SkLRUCache.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/vk/GrVkImage.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" class GrVkDescriptorSet; class GrVkGpu; diff --git a/src/gpu/vk/GrVkTextureRenderTarget.cpp b/src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp similarity index 96% rename from src/gpu/vk/GrVkTextureRenderTarget.cpp rename to src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp index ee7a0ec196..f40363b3c4 100644 --- a/src/gpu/vk/GrVkTextureRenderTarget.cpp +++ b/src/gpu/ganesh/vk/GrVkTextureRenderTarget.cpp @@ -5,15 +5,15 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkTextureRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkTextureRenderTarget.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkImageView.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkImageView.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "src/core/SkMipmap.h" diff --git a/src/gpu/vk/GrVkTextureRenderTarget.h b/src/gpu/ganesh/vk/GrVkTextureRenderTarget.h similarity index 97% rename from src/gpu/vk/GrVkTextureRenderTarget.h rename to src/gpu/ganesh/vk/GrVkTextureRenderTarget.h index 07404ae50d..1e2ecd7b88 100644 --- a/src/gpu/vk/GrVkTextureRenderTarget.h +++ b/src/gpu/ganesh/vk/GrVkTextureRenderTarget.h @@ -10,8 +10,8 @@ #define GrVkTextureRenderTarget_DEFINED #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkRenderTarget.h" -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/vk/GrVkRenderTarget.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" class GrVkGpu; diff --git a/src/gpu/vk/GrVkTypesPriv.cpp b/src/gpu/ganesh/vk/GrVkTypesPriv.cpp similarity index 94% rename from src/gpu/vk/GrVkTypesPriv.cpp rename to src/gpu/ganesh/vk/GrVkTypesPriv.cpp index f1bfa30597..bbca8fa24e 100644 --- a/src/gpu/vk/GrVkTypesPriv.cpp +++ b/src/gpu/ganesh/vk/GrVkTypesPriv.cpp @@ -7,8 +7,8 @@ #include "include/private/GrVkTypesPriv.h" -#include "src/gpu/GrBackendSurfaceMutableStateImpl.h" -#include "src/gpu/vk/GrVkImageLayout.h" +#include "src/gpu/ganesh/GrBackendSurfaceMutableStateImpl.h" +#include "src/gpu/ganesh/vk/GrVkImageLayout.h" void GrVkBackendSurfaceInfo::cleanup() {}; diff --git a/src/gpu/vk/GrVkUniformHandler.cpp b/src/gpu/ganesh/vk/GrVkUniformHandler.cpp similarity index 98% rename from src/gpu/vk/GrVkUniformHandler.cpp rename to src/gpu/ganesh/vk/GrVkUniformHandler.cpp index 82c4f52db5..46a91ab94f 100644 --- a/src/gpu/vk/GrVkUniformHandler.cpp +++ b/src/gpu/ganesh/vk/GrVkUniformHandler.cpp @@ -5,14 +5,14 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkUniformHandler.h" +#include "src/gpu/ganesh/vk/GrVkUniformHandler.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrUtil.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkPipelineStateBuilder.h" -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrUtil.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkPipelineStateBuilder.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" // To determine whether a current offset is aligned, we can just 'and' the lowest bits with the // alignment mask. A value of 0 means aligned, any other value is how many bytes past alignment we diff --git a/src/gpu/vk/GrVkUniformHandler.h b/src/gpu/ganesh/vk/GrVkUniformHandler.h similarity index 96% rename from src/gpu/vk/GrVkUniformHandler.h rename to src/gpu/ganesh/vk/GrVkUniformHandler.h index 71a272c14c..a9802807c6 100644 --- a/src/gpu/vk/GrVkUniformHandler.h +++ b/src/gpu/ganesh/vk/GrVkUniformHandler.h @@ -10,11 +10,11 @@ #include "include/gpu/vk/GrVkTypes.h" #include "src/core/SkTBlockList.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrShaderVar.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/vk/GrVkSampler.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrShaderVar.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/vk/GrVkSampler.h" class GrVkUniformHandler : public GrGLSLUniformHandler { public: diff --git a/src/gpu/vk/GrVkUtil.cpp b/src/gpu/ganesh/vk/GrVkUtil.cpp similarity index 97% rename from src/gpu/vk/GrVkUtil.cpp rename to src/gpu/ganesh/vk/GrVkUtil.cpp index b49fe482b8..7c532a3b43 100644 --- a/src/gpu/vk/GrVkUtil.cpp +++ b/src/gpu/ganesh/vk/GrVkUtil.cpp @@ -5,13 +5,13 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" #include "src/sksl/SkSLCompiler.h" bool GrVkFormatIsSupported(VkFormat format) { diff --git a/src/gpu/vk/GrVkUtil.h b/src/gpu/ganesh/vk/GrVkUtil.h similarity index 98% rename from src/gpu/vk/GrVkUtil.h rename to src/gpu/ganesh/vk/GrVkUtil.h index a19ce3b6cf..f2646be716 100644 --- a/src/gpu/vk/GrVkUtil.h +++ b/src/gpu/ganesh/vk/GrVkUtil.h @@ -11,9 +11,9 @@ #include "include/gpu/GrTypes.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/private/SkMacros.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/vk/GrVkInterface.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" #include "src/sksl/ir/SkSLProgram.h" class GrVkGpu; diff --git a/src/gpu/vk/GrVkVaryingHandler.cpp b/src/gpu/ganesh/vk/GrVkVaryingHandler.cpp similarity index 98% rename from src/gpu/vk/GrVkVaryingHandler.cpp rename to src/gpu/ganesh/vk/GrVkVaryingHandler.cpp index e53949bd0f..86a09b8633 100644 --- a/src/gpu/vk/GrVkVaryingHandler.cpp +++ b/src/gpu/ganesh/vk/GrVkVaryingHandler.cpp @@ -5,7 +5,7 @@ * found in the LICENSE file. */ -#include "src/gpu/vk/GrVkVaryingHandler.h" +#include "src/gpu/ganesh/vk/GrVkVaryingHandler.h" /** Returns the number of locations take up by a given SkSLType. We assume that all scalar values are 32 bits. */ diff --git a/src/gpu/vk/GrVkVaryingHandler.h b/src/gpu/ganesh/vk/GrVkVaryingHandler.h similarity index 92% rename from src/gpu/vk/GrVkVaryingHandler.h rename to src/gpu/ganesh/vk/GrVkVaryingHandler.h index 3d79dba842..d873879793 100644 --- a/src/gpu/vk/GrVkVaryingHandler.h +++ b/src/gpu/ganesh/vk/GrVkVaryingHandler.h @@ -8,7 +8,7 @@ #ifndef GrVkVaryingHandler_DEFINED #define GrVkVaryingHandler_DEFINED -#include "src/gpu/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" class GrVkVaryingHandler : public GrGLSLVaryingHandler { public: diff --git a/src/gpu/gl/BUILD.bazel b/src/gpu/gl/BUILD.bazel index 2af21d470b..2f5ef06a9f 100644 --- a/src/gpu/gl/BUILD.bazel +++ b/src/gpu/gl/BUILD.bazel @@ -1,588 +1,7 @@ load("//bazel:macros.bzl", "generated_cc_atom") -generated_cc_atom( - name = "GrGLAssembleGLESInterfaceAutogen_src", - srcs = ["GrGLAssembleGLESInterfaceAutogen.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLAssembleHelpers_hdr", - "//include/gpu/gl:GrGLAssembleInterface_hdr", - ], -) - -generated_cc_atom( - name = "GrGLAssembleGLInterfaceAutogen_src", - srcs = ["GrGLAssembleGLInterfaceAutogen.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLAssembleHelpers_hdr", - "//include/gpu/gl:GrGLAssembleInterface_hdr", - ], -) - -generated_cc_atom( - name = "GrGLAssembleHelpers_src", - srcs = ["GrGLAssembleHelpers.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLAssembleHelpers_hdr", - ], -) - -generated_cc_atom( - name = "GrGLAssembleInterface_src", - srcs = ["GrGLAssembleInterface.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLAssembleHelpers_hdr", - "//include/gpu/gl:GrGLAssembleInterface_hdr", - ], -) - -generated_cc_atom( - name = "GrGLAssembleWebGLInterfaceAutogen_src", - srcs = ["GrGLAssembleWebGLInterfaceAutogen.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLAssembleHelpers_hdr", - "//include/gpu/gl:GrGLAssembleInterface_hdr", - ], -) - -generated_cc_atom( - name = "GrGLAttachment_hdr", - hdrs = ["GrGLAttachment.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/gl:GrGLInterface_hdr", - "//src/gpu:GrAttachment_hdr", - ], -) - -generated_cc_atom( - name = "GrGLAttachment_src", - srcs = ["GrGLAttachment.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLAttachment_hdr", - ":GrGLGpu_hdr", - "//include/core:SkTraceMemoryDump_hdr", - ], -) - -generated_cc_atom( - name = "GrGLBuffer_hdr", - hdrs = ["GrGLBuffer.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/gl:GrGLTypes_hdr", - "//src/gpu:GrGpuBuffer_hdr", - ], -) - -generated_cc_atom( - name = "GrGLBuffer_src", - srcs = ["GrGLBuffer.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLBuffer_hdr", - ":GrGLCaps_hdr", - ":GrGLGpu_hdr", - "//include/core:SkTraceMemoryDump_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - ], -) - -generated_cc_atom( - name = "GrGLCaps_hdr", - hdrs = ["GrGLCaps.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLAttachment_hdr", - ":GrGLUtil_hdr", - "//include/private:GrGLTypesPriv_hdr", - "//include/private:SkChecksum_hdr", - "//include/private:SkTArray_hdr", - "//include/private:SkTHash_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:Swizzle_hdr", - ], -) - -generated_cc_atom( - name = "GrGLCaps_src", - srcs = ["GrGLCaps.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLCaps_hdr", - ":GrGLContext_hdr", - ":GrGLRenderTarget_hdr", - ":GrGLTexture_hdr", - "//include/gpu:GrContextOptions_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkMathPriv_hdr", - "//src/core:SkTSearch_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrTextureProxyPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrGLContext_hdr", - hdrs = ["GrGLContext.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLCaps_hdr", - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLExtensions_hdr", - "//include/gpu/gl:GrGLInterface_hdr", - "//src/gpu/glsl:GrGLSL_hdr", - ], -) - -generated_cc_atom( - name = "GrGLContext_src", - srcs = ["GrGLContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLContext_hdr", - ":GrGLGLSL_hdr", - "//include/gpu:GrContextOptions_hdr", - ], -) - generated_cc_atom( name = "GrGLDefines_hdr", hdrs = ["GrGLDefines.h"], visibility = ["//:__subpackages__"], ) - -generated_cc_atom( - name = "GrGLExtensions_src", - srcs = ["GrGLExtensions.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLDefines_hdr", - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLExtensions_hdr", - "//src/core:SkTSearch_hdr", - "//src/core:SkTSort_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrGLGLSL_hdr", - hdrs = ["GrGLGLSL.h"], - visibility = ["//:__subpackages__"], - deps = ["//src/gpu/glsl:GrGLSL_hdr"], -) - -generated_cc_atom( - name = "GrGLGLSL_src", - srcs = ["GrGLGLSL.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGLSL_hdr", - ":GrGLUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrGLGpuProgramCache_src", - srcs = ["GrGLGpuProgramCache.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - "//include/gpu:GrContextOptions_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu/gl/builders:GrGLProgramBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrGLGpu_hdr", - hdrs = ["GrGLGpu.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLAttachment_hdr", - ":GrGLContext_hdr", - ":GrGLProgram_hdr", - ":GrGLRenderTarget_hdr", - ":GrGLTexture_hdr", - ":GrGLVertexArray_hdr", - "//include/core:SkTypes_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkLRUCache_hdr", - "//src/gpu:GrFinishCallbacks_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrNativeRect_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", - "//src/gpu:GrWindowRectsState_hdr", - "//src/gpu:GrXferProcessor_hdr", - ], -) - -generated_cc_atom( - name = "GrGLGpu_src", - srcs = ["GrGLGpu.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLAttachment_hdr", - ":GrGLBuffer_hdr", - ":GrGLGpu_hdr", - ":GrGLOpsRenderPass_hdr", - ":GrGLSemaphore_hdr", - ":GrGLTextureRenderTarget_hdr", - "//include/core:SkColorSpace_hdr", - "//include/core:SkPixmap_hdr", - "//include/core:SkTypes_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrTypes_hdr", - "//include/private:SkHalf_hdr", - "//include/private:SkTemplates_hdr", - "//include/private:SkTo_hdr", - "//src/core:SkAutoMalloc_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkLRUCache_hdr", - "//src/core:SkMipmap_hdr", - "//src/core:SkScopeExit_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrCpuBuffer_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu/gl/builders:GrGLShaderStringBuilder_hdr", - "//src/sksl:SkSLCompiler_hdr", - "//src/utils:SkJSONWriter_hdr", - ], -) - -generated_cc_atom( - name = "GrGLInterfaceAutogen_src", - srcs = ["GrGLInterfaceAutogen.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/gpu/gl:GrGLExtensions_hdr", - "//include/gpu/gl:GrGLInterface_hdr", - ], -) - -generated_cc_atom( - name = "GrGLMakeNativeInterface_none_src", - srcs = ["GrGLMakeNativeInterface_none.cpp"], - visibility = ["//:__subpackages__"], - deps = ["//include/gpu/gl:GrGLInterface_hdr"], -) - -generated_cc_atom( - name = "GrGLOpsRenderPass_hdr", - hdrs = ["GrGLOpsRenderPass.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - ":GrGLRenderTarget_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - ], -) - -generated_cc_atom( - name = "GrGLOpsRenderPass_src", - srcs = ["GrGLOpsRenderPass.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLOpsRenderPass_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRenderTarget_hdr", - ], -) - -generated_cc_atom( - name = "GrGLProgramDataManager_hdr", - hdrs = ["GrGLProgramDataManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/gl:GrGLTypes_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkTBlockList_hdr", - "//src/gpu:GrShaderVar_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrGLProgramDataManager_src", - srcs = ["GrGLProgramDataManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - ":GrGLProgramDataManager_hdr", - "//include/core:SkMatrix_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrGLProgram_hdr", - hdrs = ["GrGLProgram.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLProgramDataManager_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrGLProgram_src", - srcs = ["GrGLProgram.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLBuffer_hdr", - ":GrGLGpu_hdr", - ":GrGLProgram_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/sksl:SkSLCompiler_hdr", - ], -) - -generated_cc_atom( - name = "GrGLRenderTarget_hdr", - hdrs = ["GrGLRenderTarget.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLDefines_hdr", - "//include/core:SkScalar_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//src/gpu:GrRenderTarget_hdr", - ], -) - -generated_cc_atom( - name = "GrGLRenderTarget_src", - srcs = ["GrGLRenderTarget.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - ":GrGLRenderTarget_hdr", - ":GrGLUtil_hdr", - "//include/core:SkTraceMemoryDump_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrGLSemaphore_hdr", - hdrs = ["GrGLSemaphore.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu:GrBackendSemaphore_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrSemaphore_hdr", - ], -) - -generated_cc_atom( - name = "GrGLSemaphore_src", - srcs = ["GrGLSemaphore.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - ":GrGLSemaphore_hdr", - ], -) - -generated_cc_atom( - name = "GrGLTextureRenderTarget_hdr", - hdrs = ["GrGLTextureRenderTarget.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLRenderTarget_hdr", - ":GrGLTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrGLTextureRenderTarget_src", - srcs = ["GrGLTextureRenderTarget.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - ":GrGLTextureRenderTarget_hdr", - "//include/core:SkTraceMemoryDump_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrGLTexture_hdr", - hdrs = ["GrGLTexture.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/private:GrGLTypesPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrGLTexture_src", - srcs = ["GrGLTexture.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLGpu_hdr", - ":GrGLTexture_hdr", - "//include/core:SkTraceMemoryDump_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrGLTypesPriv_src", - srcs = ["GrGLTypesPriv.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLDefines_hdr", - "//include/core:SkScalar_hdr", - "//include/private:GrGLTypesPriv_hdr", - "//src/gpu:Swizzle_hdr", - ], -) - -generated_cc_atom( - name = "GrGLUniformHandler_hdr", - hdrs = ["GrGLUniformHandler.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrGLUniformHandler_src", - srcs = ["GrGLUniformHandler.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLCaps_hdr", - ":GrGLGpu_hdr", - ":GrGLUniformHandler_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu/gl/builders:GrGLProgramBuilder_hdr", - "//src/sksl:SkSLCompiler_hdr", - ], -) - -generated_cc_atom( - name = "GrGLUtil_hdr", - hdrs = ["GrGLUtil.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLDefines_hdr", - "//include/gpu/gl:GrGLInterface_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkImageInfoPriv_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrStencilSettings_hdr", - ], -) - -generated_cc_atom( - name = "GrGLUtil_src", - srcs = ["GrGLUtil.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLUtil_hdr", - "//include/core:SkMatrix_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrDataUtils_hdr", - ], -) - -generated_cc_atom( - name = "GrGLVaryingHandler_hdr", - hdrs = ["GrGLVaryingHandler.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLProgramDataManager_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - ], -) - -generated_cc_atom( - name = "GrGLVertexArray_hdr", - hdrs = ["GrGLVertexArray.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLDefines_hdr", - "//include/gpu/gl:GrGLTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkTArray_hdr", - "//src/gpu:GrGpuResource_hdr", - ], -) - -generated_cc_atom( - name = "GrGLVertexArray_src", - srcs = ["GrGLVertexArray.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrGLBuffer_hdr", - ":GrGLGpu_hdr", - ":GrGLVertexArray_hdr", - "//src/gpu:GrCpuBuffer_hdr", - ], -) diff --git a/src/gpu/vk/BUILD.bazel b/src/gpu/vk/BUILD.bazel index 8dd0faa6c3..bf94781a61 100644 --- a/src/gpu/vk/BUILD.bazel +++ b/src/gpu/vk/BUILD.bazel @@ -1,1037 +1,8 @@ load("//bazel:macros.bzl", "generated_cc_atom") -generated_cc_atom( - name = "GrVkAMDMemoryAllocator_hdr", - hdrs = ["GrVkAMDMemoryAllocator.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/vk:GrVkMemoryAllocator_hdr", - "//third_party:vulkanmemoryallocator", - ], -) - -generated_cc_atom( - name = "GrVkAMDMemoryAllocator_src", - srcs = ["GrVkAMDMemoryAllocator.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkAMDMemoryAllocator_hdr", - ":GrVkInterface_hdr", - ":GrVkMemory_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkExtensions_hdr", - "//src/core:SkTraceEvent_hdr", - ], -) - -generated_cc_atom( - name = "GrVkBuffer_hdr", - hdrs = ["GrVkBuffer.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrGpuBuffer_hdr", - ], -) - -generated_cc_atom( - name = "GrVkBuffer_src", - srcs = ["GrVkBuffer.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkBuffer_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkGpu_hdr", - ":GrVkMemory_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrVkCaps_hdr", - hdrs = ["GrVkCaps.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:SkTDArray_hdr", - "//src/gpu:GrCaps_hdr", - ], -) - -generated_cc_atom( - name = "GrVkCaps_src", - srcs = ["GrVkCaps.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCaps_hdr", - ":GrVkGpu_hdr", - ":GrVkImage_hdr", - ":GrVkInterface_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkTexture_hdr", - ":GrVkUniformHandler_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrContextOptions_hdr", - "//include/gpu/vk:GrVkBackendContext_hdr", - "//include/gpu/vk:GrVkExtensions_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - ], -) - -generated_cc_atom( - name = "GrVkCommandBuffer_hdr", - hdrs = ["GrVkCommandBuffer.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkSemaphore_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu:GrRefCnt_hdr", - ], -) - -generated_cc_atom( - name = "GrVkCommandBuffer_src", - srcs = ["GrVkCommandBuffer.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkBuffer_hdr", - ":GrVkCommandBuffer_hdr", - ":GrVkCommandPool_hdr", - ":GrVkFramebuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkImage_hdr", - ":GrVkPipelineState_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderPass_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkUtil_hdr", - "//include/core:SkRect_hdr", - "//src/core:SkTraceEvent_hdr", - ], -) - -generated_cc_atom( - name = "GrVkCommandPool_hdr", - hdrs = ["GrVkCommandPool.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkInterface_hdr", - ":GrVkManagedResource_hdr", - ":GrVkResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrVkCommandPool_src", - srcs = ["GrVkCommandPool.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCommandBuffer_hdr", - ":GrVkCommandPool_hdr", - ":GrVkGpu_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - ], -) - -generated_cc_atom( - name = "GrVkDescriptorPool_hdr", - hdrs = ["GrVkDescriptorPool.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkDescriptorPool_src", - srcs = ["GrVkDescriptorPool.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorPool_hdr", - ":GrVkGpu_hdr", - "//include/private:SkTemplates_hdr", - ], -) - -generated_cc_atom( - name = "GrVkDescriptorSetManager_hdr", - hdrs = ["GrVkDescriptorSetManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorPool_hdr", - ":GrVkSampler_hdr", - "//include/core:SkRefCnt_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:SkTArray_hdr", - "//src/gpu:GrResourceHandle_hdr", - ], -) - -generated_cc_atom( - name = "GrVkDescriptorSetManager_src", - srcs = ["GrVkDescriptorSetManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorPool_hdr", - ":GrVkDescriptorSetManager_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkGpu_hdr", - ":GrVkUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrVkDescriptorSet_hdr", - hdrs = ["GrVkDescriptorSet.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorSetManager_hdr", - ":GrVkManagedResource_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkDescriptorSet_src", - srcs = ["GrVkDescriptorSet.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorPool_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkGpu_hdr", - ":GrVkResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrVkExtensions_src", - srcs = ["GrVkExtensions.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/vk:GrVkBackendContext_hdr", - "//include/gpu/vk:GrVkExtensions_hdr", - "//src/core:SkTSearch_hdr", - "//src/core:SkTSort_hdr", - ], -) - -generated_cc_atom( - name = "GrVkFramebuffer_hdr", - hdrs = ["GrVkFramebuffer.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - ":GrVkResourceProvider_hdr", - "//include/gpu:GrTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkFramebuffer_src", - srcs = ["GrVkFramebuffer.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCommandBuffer_hdr", - ":GrVkFramebuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkImage_hdr", - ":GrVkRenderPass_hdr", - ], -) - -generated_cc_atom( - name = "GrVkGpu_hdr", - hdrs = ["GrVkGpu.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCaps_hdr", - ":GrVkMSAALoadManager_hdr", - ":GrVkMemory_hdr", - ":GrVkResourceProvider_hdr", - ":GrVkSemaphore_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkBackendContext_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrStagingBufferManager_hdr", - ], -) - -generated_cc_atom( - name = "GrVkGpu_src", - srcs = ["GrVkGpu.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkAMDMemoryAllocator_hdr", - ":GrVkBuffer_hdr", - ":GrVkCommandBuffer_hdr", - ":GrVkCommandPool_hdr", - ":GrVkFramebuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkImage_hdr", - ":GrVkInterface_hdr", - ":GrVkMemory_hdr", - ":GrVkOpsRenderPass_hdr", - ":GrVkPipelineState_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderPass_hdr", - ":GrVkResourceProvider_hdr", - ":GrVkSemaphore_hdr", - ":GrVkTextureRenderTarget_hdr", - ":GrVkTexture_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrContextOptions_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu/vk:GrVkExtensions_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:SkTo_hdr", - "//src/core:SkCompressedDataUtils_hdr", - "//src/core:SkConvertPixels_hdr", - "//src/core:SkMipmap_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpuResourceCacheAccess_hdr", - "//src/gpu:GrNativeRect_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/image:SkImage_Gpu_hdr", - "//src/image:SkSurface_Gpu_hdr", - ], -) - -generated_cc_atom( - name = "GrVkImageLayout_hdr", - hdrs = ["GrVkImageLayout.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkImageView_hdr", - hdrs = ["GrVkImageView.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - "//include/gpu:GrTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkImageView_src", - srcs = ["GrVkImageView.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkSamplerYcbcrConversion_hdr", - ":GrVkUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrVkImage_hdr", - hdrs = ["GrVkImage.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorSet_hdr", - "//include/core:SkTypes_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:GrVkTypesPriv_hdr", - "//src/gpu:GrAttachment_hdr", - "//src/gpu:GrBackendSurfaceMutableStateImpl_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu:GrRefCnt_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrVkImage_src", - srcs = ["GrVkImage.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkImage_hdr", - ":GrVkMemory_hdr", - ":GrVkTexture_hdr", - ":GrVkUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrVkInterface_hdr", - hdrs = ["GrVkInterface.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/gpu/vk:GrVkBackendContext_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkInterface_src", - srcs = ["GrVkInterface.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkInterface_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkBackendContext_hdr", - "//include/gpu/vk:GrVkExtensions_hdr", - ], -) - -generated_cc_atom( - name = "GrVkMSAALoadManager_hdr", - hdrs = ["GrVkMSAALoadManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorSetManager_hdr", - "//include/gpu:GrTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrNativeRect_hdr", - ], -) - -generated_cc_atom( - name = "GrVkMSAALoadManager_src", - srcs = ["GrVkMSAALoadManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkBuffer_hdr", - ":GrVkCommandBuffer_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkMSAALoadManager_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkResourceProvider_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrVkManagedResource_hdr", - hdrs = ["GrVkManagedResource.h"], - visibility = ["//:__subpackages__"], - deps = ["//src/gpu:GrManagedResource_hdr"], -) - -generated_cc_atom( - name = "GrVkMemory_hdr", - hdrs = ["GrVkMemory.h"], - visibility = ["//:__subpackages__"], - deps = [ - "//include/gpu/vk:GrVkMemoryAllocator_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//include/private:SkTArray_hdr", - ], -) - -generated_cc_atom( - name = "GrVkMemory_src", - srcs = ["GrVkMemory.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkMemory_hdr", - ":GrVkUtil_hdr", - ], -) - -generated_cc_atom( - name = "GrVkOpsRenderPass_hdr", - hdrs = ["GrVkOpsRenderPass.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkPipelineState_hdr", - ":GrVkRenderPass_hdr", - "//include/gpu:GrTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - ], -) - -generated_cc_atom( - name = "GrVkOpsRenderPass_src", - srcs = ["GrVkOpsRenderPass.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkBuffer_hdr", - ":GrVkCommandBuffer_hdr", - ":GrVkCommandPool_hdr", - ":GrVkFramebuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkImage_hdr", - ":GrVkOpsRenderPass_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderPass_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkResourceProvider_hdr", - ":GrVkSemaphore_hdr", - ":GrVkTexture_hdr", - "//include/core:SkDrawable_hdr", - "//include/core:SkRect_hdr", - "//include/gpu:GrBackendDrawableInfo_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineStateBuilder_hdr", - hdrs = ["GrVkPipelineStateBuilder.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkPipelineState_hdr", - ":GrVkUniformHandler_hdr", - ":GrVkVaryingHandler_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - "//src/sksl:SkSLCompiler_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineStateBuilder_src", - srcs = ["GrVkPipelineStateBuilder.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorSetManager_hdr", - ":GrVkGpu_hdr", - ":GrVkPipelineStateBuilder_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderPass_hdr", - ":GrVkRenderTarget_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkReadBuffer_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrAutoLocaleSetter_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPersistentCacheUtils_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/utils:SkShaderUtils_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineStateCache_src", - srcs = ["GrVkPipelineStateCache.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkPipelineStateBuilder_hdr", - ":GrVkPipelineState_hdr", - ":GrVkResourceProvider_hdr", - "//include/gpu:GrContextOptions_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkOpts_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrStencilSettings_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineStateDataManager_hdr", - hdrs = ["GrVkPipelineStateDataManager.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkUniformHandler_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrUniformDataManager_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineStateDataManager_src", - srcs = ["GrVkPipelineStateDataManager.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCommandBuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkPipelineStateDataManager_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpuBuffer_hdr", - "//src/gpu:GrResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineState_hdr", - hdrs = ["GrVkPipelineState.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorSetManager_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkPipelineStateDataManager_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrRefCnt_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipelineState_src", - srcs = ["GrVkPipelineState.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkBuffer_hdr", - ":GrVkCommandBuffer_hdr", - ":GrVkDescriptorPool_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkMemory_hdr", - ":GrVkPipelineState_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkSampler_hdr", - ":GrVkTexture_hdr", - "//src/core:SkMipmap_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipeline_hdr", - hdrs = ["GrVkPipeline.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrXferProcessor_hdr", - ], -) - -generated_cc_atom( - name = "GrVkPipeline_src", - srcs = ["GrVkPipeline.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCommandBuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkUtil_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrStencilSettings_hdr", - ], -) - -generated_cc_atom( - name = "GrVkRenderPass_hdr", - hdrs = ["GrVkRenderPass.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - "//include/gpu:GrTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:SkMacros_hdr", - ], -) - -generated_cc_atom( - name = "GrVkRenderPass_src", - srcs = ["GrVkRenderPass.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkFramebuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkRenderPass_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkUtil_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu:KeyBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrVkRenderTarget_hdr", - hdrs = ["GrVkRenderTarget.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkImage_hdr", - ":GrVkRenderPass_hdr", - ":GrVkResourceProvider_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrRenderTarget_hdr", - ], -) - -generated_cc_atom( - name = "GrVkRenderTarget_src", - srcs = ["GrVkRenderTarget.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCommandBuffer_hdr", - ":GrVkDescriptorSet_hdr", - ":GrVkFramebuffer_hdr", - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkResourceProvider_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrBackendSurface_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrBackendSurfaceMutableStateImpl_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - ], -) - -generated_cc_atom( - name = "GrVkResourceProvider_hdr", - hdrs = ["GrVkResourceProvider.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorPool_hdr", - ":GrVkDescriptorSetManager_hdr", - ":GrVkPipelineStateBuilder_hdr", - ":GrVkRenderPass_hdr", - ":GrVkSamplerYcbcrConversion_hdr", - ":GrVkSampler_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:SkMutex_hdr", - "//include/private:SkTArray_hdr", - "//src/core:SkLRUCache_hdr", - "//src/core:SkTDynamicHash_hdr", - "//src/core:SkTInternalLList_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrManagedResource_hdr", - "//src/gpu:GrProgramDesc_hdr", - "//src/gpu:GrResourceHandle_hdr", - "//src/gpu:GrThreadSafePipelineBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrVkResourceProvider_src", - srcs = ["GrVkResourceProvider.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkCommandBuffer_hdr", - ":GrVkCommandPool_hdr", - ":GrVkGpu_hdr", - ":GrVkPipeline_hdr", - ":GrVkRenderTarget_hdr", - ":GrVkResourceProvider_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkTaskGroup_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrStencilSettings_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSamplerYcbcrConversion_hdr", - hdrs = ["GrVkSamplerYcbcrConversion.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/core:SkOpts_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSamplerYcbcrConversion_src", - srcs = ["GrVkSamplerYcbcrConversion.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkSamplerYcbcrConversion_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSampler_hdr", - hdrs = ["GrVkSampler.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - ":GrVkSamplerYcbcrConversion_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/core:SkOpts_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSampler_src", - srcs = ["GrVkSampler.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkSamplerYcbcrConversion_hdr", - ":GrVkSampler_hdr", - ], -) - generated_cc_atom( name = "GrVkSecondaryCBDrawContext_hdr", hdrs = ["GrVkSecondaryCBDrawContext.h"], visibility = ["//:__subpackages__"], - deps = [ - "//include/core:SkRefCnt_hdr", - "//include/core:SkSurfaceProps_hdr", - "//include/core:SkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSecondaryCBDrawContext_src", - srcs = ["GrVkSecondaryCBDrawContext.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkSecondaryCBDrawContext_hdr", - "//include/core:SkDeferredDisplayList_hdr", - "//include/core:SkImageInfo_hdr", - "//include/core:SkSurfaceCharacterization_hdr", - "//include/gpu:GrDirectContext_hdr", - "//include/gpu:GrRecordingContext_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/core:SkSurfacePriv_hdr", - "//src/gpu:GrContextThreadSafeProxyPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSemaphore_hdr", - hdrs = ["GrVkSemaphore.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkManagedResource_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrSemaphore_hdr", - ], -) - -generated_cc_atom( - name = "GrVkSemaphore_src", - srcs = ["GrVkSemaphore.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkSemaphore_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrBackendSemaphore_hdr", - ], -) - -generated_cc_atom( - name = "GrVkTextureRenderTarget_hdr", - hdrs = ["GrVkTextureRenderTarget.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkRenderTarget_hdr", - ":GrVkTexture_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - ], -) - -generated_cc_atom( - name = "GrVkTextureRenderTarget_src", - srcs = ["GrVkTextureRenderTarget.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkImage_hdr", - ":GrVkTextureRenderTarget_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/core:SkMipmap_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrVkTexture_hdr", - hdrs = ["GrVkTexture.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkImage_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/core:SkLRUCache_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrVkTexture_src", - srcs = ["GrVkTexture.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkDescriptorSet_hdr", - ":GrVkGpu_hdr", - ":GrVkImageView_hdr", - ":GrVkTextureRenderTarget_hdr", - ":GrVkTexture_hdr", - ":GrVkUtil_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrTexture_hdr", - ], -) - -generated_cc_atom( - name = "GrVkTypesPriv_src", - srcs = ["GrVkTypesPriv.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkImageLayout_hdr", - "//include/private:GrVkTypesPriv_hdr", - "//src/gpu:GrBackendSurfaceMutableStateImpl_hdr", - ], -) - -generated_cc_atom( - name = "GrVkUniformHandler_hdr", - hdrs = ["GrVkUniformHandler.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkSampler_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//src/core:SkTBlockList_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrShaderVar_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - ], -) - -generated_cc_atom( - name = "GrVkUniformHandler_src", - srcs = ["GrVkUniformHandler.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkPipelineStateBuilder_hdr", - ":GrVkTexture_hdr", - ":GrVkUniformHandler_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrUtil_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - ], -) - -generated_cc_atom( - name = "GrVkUtil_hdr", - hdrs = ["GrVkUtil.h"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkInterface_hdr", - "//include/gpu:GrTypes_hdr", - "//include/gpu/vk:GrVkTypes_hdr", - "//include/private:SkMacros_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/sksl/ir:SkSLProgram_hdr", - ], -) - -generated_cc_atom( - name = "GrVkUtil_src", - srcs = ["GrVkUtil.cpp"], - visibility = ["//:__subpackages__"], - deps = [ - ":GrVkGpu_hdr", - ":GrVkUtil_hdr", - "//include/gpu:GrDirectContext_hdr", - "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/sksl:SkSLCompiler_hdr", - ], -) - -generated_cc_atom( - name = "GrVkVaryingHandler_hdr", - hdrs = ["GrVkVaryingHandler.h"], - visibility = ["//:__subpackages__"], - deps = ["//src/gpu/glsl:GrGLSLVarying_hdr"], -) - -generated_cc_atom( - name = "GrVkVaryingHandler_src", - srcs = ["GrVkVaryingHandler.cpp"], - visibility = ["//:__subpackages__"], - deps = [":GrVkVaryingHandler_hdr"], + deps = ["//src/gpu/ganesh/vk:GrVkSecondaryCBDrawContext_impl_hdr"], ) diff --git a/src/gpu/vk/GrVkSecondaryCBDrawContext.h b/src/gpu/vk/GrVkSecondaryCBDrawContext.h index 48b8b3810a..ede0e119e2 100644 --- a/src/gpu/vk/GrVkSecondaryCBDrawContext.h +++ b/src/gpu/vk/GrVkSecondaryCBDrawContext.h @@ -5,122 +5,7 @@ * found in the LICENSE file. */ -#ifndef GrVkSecondaryCBDrawContext_DEFINED -#define GrVkSecondaryCBDrawContext_DEFINED +// TODO: Once we can get Chrome to use the ganesh version of the file we can remove this one. At +// that time we should also rename the ganesh file to drop the _impl. +#include "src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h" -#include "include/core/SkRefCnt.h" -#include "include/core/SkSurfaceProps.h" -#include "include/core/SkTypes.h" - -class GrBackendSemaphore; -class GrRecordingContext; -struct GrVkDrawableInfo; -namespace skgpu { class BaseDevice; } -class SkCanvas; -class SkDeferredDisplayList; -struct SkImageInfo; -class SkSurfaceCharacterization; -class SkSurfaceProps; - -/** - * This class is a private header that is intended to only be used inside of Chromium. This requires - * Chromium to burrow in and include this specifically since it is not part of skia's public include - * directory. - */ - -/** - * This class is used to draw into an external Vulkan secondary command buffer that is imported - * by the client. The secondary command buffer that gets imported must already have had begin called - * on it with VK_COMMAND_BUFFER_USAGE_RENDER_PASS_CONTINUE_BIT. Thus any draws to the imported - * command buffer cannot require changing the render pass. This requirement means that certain types - * of draws will not be supported when using a GrVkSecondaryCBDrawContext. This includes: - * Draws that require a dst copy for blending will be dropped - * Text draws will be dropped (these may require intermediate uploads of text data) - * Read and Write pixels will not work - * Any other draw that requires a copy will fail (this includes using backdrop filter with save - * layer). - * Stenciling is also disabled, but that should not restrict any actual draws from working. - * - * While using a GrVkSecondaryCBDrawContext, the client can also draw into normal SkSurfaces and - * then draw those SkSufaces (as SkImages) into the GrVkSecondaryCBDrawContext. If any of the - * previously mentioned unsupported draws are needed by the client, they can draw them into an - * offscreen surface, and then draw that into the GrVkSecondaryCBDrawContext. - * - * After all drawing to the GrVkSecondaryCBDrawContext has been done, the client must call flush() - * on the GrVkSecondaryCBDrawContext to actually fill in the secondary VkCommandBuffer with the - * draws. - * - * Additionally, the client must keep the GrVkSecondaryCBDrawContext alive until the secondary - * VkCommandBuffer has been submitted and all work finished on the GPU. Before deleting the - * GrVkSecondaryCBDrawContext, the client must call releaseResources() so that Skia can cleanup - * any internal objects that were created for the draws into the secondary command buffer. - */ -class SK_SPI GrVkSecondaryCBDrawContext : public SkRefCnt { -public: - static sk_sp Make(GrRecordingContext*, - const SkImageInfo&, - const GrVkDrawableInfo&, - const SkSurfaceProps* props); - - ~GrVkSecondaryCBDrawContext() override; - - SkCanvas* getCanvas(); - - // Records all the draws to the imported secondary command buffer and sets any dependent - // offscreen draws to the GPU. - void flush(); - - /** Inserts a list of GPU semaphores that Skia will have the driver wait on before executing - commands for this secondary CB. The wait semaphores will get added to the VkCommandBuffer - owned by this GrContext when flush() is called, and not the command buffer which the - Secondary CB is from. This will guarantee that the driver waits on the semaphores before - the secondary command buffer gets executed. If this call returns false, then the GPU - back end will not wait on any passed in semaphores, and the client will still own the - semaphores, regardless of the value of deleteSemaphoresAfterWait. - - If deleteSemaphoresAfterWait is false then Skia will not delete the semaphores. In this case - it is the client's responsibility to not destroy or attempt to reuse the semaphores until it - knows that Skia has finished waiting on them. This can be done by using finishedProcs - on flush calls. - - @param numSemaphores size of waitSemaphores array - @param waitSemaphores array of semaphore containers - @paramm deleteSemaphoresAfterWait who owns and should delete the semaphores - @return true if GPU is waiting on semaphores - */ - bool wait(int numSemaphores, - const GrBackendSemaphore waitSemaphores[], - bool deleteSemaphoresAfterWait = true); - - // This call will release all resources held by the draw context. The client must call - // releaseResources() before deleting the drawing context. However, the resources also include - // any Vulkan resources that were created and used for draws. Therefore the client must only - // call releaseResources() after submitting the secondary command buffer, and waiting for it to - // finish on the GPU. If it is called earlier then some vulkan objects may be deleted while they - // are still in use by the GPU. - void releaseResources(); - - const SkSurfaceProps& props() const { return fProps; } - - // TODO: Fill out these calls to support DDL - bool characterize(SkSurfaceCharacterization* characterization) const; - -#ifndef SK_DDL_IS_UNIQUE_POINTER - bool draw(sk_sp deferredDisplayList); -#else - bool draw(const SkDeferredDisplayList* deferredDisplayList); -#endif - - bool isCompatible(const SkSurfaceCharacterization& characterization) const; - -private: - explicit GrVkSecondaryCBDrawContext(sk_sp, const SkSurfaceProps*); - - sk_sp fDevice; - std::unique_ptr fCachedCanvas; - const SkSurfaceProps fProps; - - using INHERITED = SkRefCnt; -}; - -#endif diff --git a/src/image/BUILD.bazel b/src/image/BUILD.bazel index 176f5248ce..c604f11087 100644 --- a/src/image/BUILD.bazel +++ b/src/image/BUILD.bazel @@ -44,9 +44,9 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/private:SkTDArray_hdr", "//src/core:SkMipmap_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -78,16 +78,16 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/gpu:GrYUVABackendTextures_hdr", "//src/core:SkBitmapCache_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrYUVATextureProxies_hdr", - "//src/gpu:SurfaceContext_hdr", - "//src/gpu/effects:GrYUVtoRGBEffect_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrYUVATextureProxies_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", + "//src/gpu/ganesh/effects:GrYUVtoRGBEffect_hdr", ], ) @@ -99,7 +99,7 @@ generated_cc_atom( ":SkImage_GpuBase_hdr", "//include/gpu:GrBackendSurface_hdr", "//src/core:SkCachedData_hdr", - "//src/gpu:GrYUVATextureProxies_hdr", + "//src/gpu/ganesh:GrYUVATextureProxies_hdr", ], ) @@ -118,16 +118,16 @@ generated_cc_atom( "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkMipmap_hdr", "//src/core:SkScopeExit_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrYUVtoRGBEffect_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrYUVtoRGBEffect_hdr", ], ) @@ -139,9 +139,9 @@ generated_cc_atom( ":SkImage_GpuBase_hdr", "//include/private:SkSpinlock_hdr", "//src/core:SkImagePriv_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrSurfaceProxyView_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrSurfaceProxyView_hdr", ], ) @@ -162,28 +162,28 @@ generated_cc_atom( "//src/core:SkMipmap_hdr", "//src/core:SkScopeExit_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu:GrAHardwareBufferImageGenerator_hdr", - "//src/gpu:GrAHardwareBufferUtils_hdr", - "//src/gpu:GrBackendTextureImageGenerator_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrContextThreadSafeProxyPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrTextureProxyPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:GrYUVATextureProxies_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/gl:GrGLTexture_hdr", + "//src/gpu/ganesh:GrAHardwareBufferImageGenerator_hdr", + "//src/gpu/ganesh:GrAHardwareBufferUtils_impl_hdr", + "//src/gpu/ganesh:GrBackendTextureImageGenerator_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrContextThreadSafeProxyPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrTextureProxyPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:GrYUVATextureProxies_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/gl:GrGLTexture_hdr", ], ) @@ -217,18 +217,18 @@ generated_cc_atom( "//src/core:SkNextID_hdr", "//src/core:SkResourceCache_hdr", "//src/core:SkYUVPlanesCache_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSamplerState_hdr", - "//src/gpu:GrYUVATextureProxies_hdr", "//src/gpu:ResourceKey_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrYUVtoRGBEffect_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSamplerState_hdr", + "//src/gpu/ganesh:GrYUVATextureProxies_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrYUVtoRGBEffect_hdr", ], ) @@ -258,10 +258,10 @@ generated_cc_atom( "//src/core:SkConvertPixels_hdr", "//src/core:SkImagePriv_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//src/shaders:SkBitmapProcShader_hdr", ], ) @@ -296,14 +296,14 @@ generated_cc_atom( "//src/core:SkNextID_hdr", "//src/core:SkSamplingPriv_hdr", "//src/core:SkSpecialImage_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrBicubicEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrBicubicEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//src/shaders:SkImageShader_hdr", ], ) @@ -384,15 +384,15 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//src/core:SkImagePriv_hdr", "//src/core:SkSurfacePriv_hdr", - "//src/gpu:BaseDevice_hdr", - "//src/gpu:GrAHardwareBufferUtils_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrContextThreadSafeProxyPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:BaseDevice_hdr", + "//src/gpu/ganesh:GrAHardwareBufferUtils_impl_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrContextThreadSafeProxyPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) diff --git a/src/image/SkImage.cpp b/src/image/SkImage.cpp index 6b564fbc87..a747357898 100644 --- a/src/image/SkImage.cpp +++ b/src/image/SkImage.cpp @@ -32,14 +32,14 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrContextThreadSafeProxy.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "src/image/SkImage_Gpu.h" #endif diff --git a/src/image/SkImage_Base.h b/src/image/SkImage_Base.h index ba19fa898a..44ae4841a8 100644 --- a/src/image/SkImage_Base.h +++ b/src/image/SkImage_Base.h @@ -16,9 +16,9 @@ #if SK_SUPPORT_GPU #include "include/private/SkTDArray.h" -#include "src/gpu/GrSurfaceProxyView.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" class GrTexture; #endif diff --git a/src/image/SkImage_Gpu.cpp b/src/image/SkImage_Gpu.cpp index 80b1392a7a..be21fdbf60 100644 --- a/src/image/SkImage_Gpu.cpp +++ b/src/image/SkImage_Gpu.cpp @@ -18,28 +18,28 @@ #include "src/core/SkMipmap.h" #include "src/core/SkScopeExit.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/GrAHardwareBufferImageGenerator.h" -#include "src/gpu/GrAHardwareBufferUtils.h" -#include "src/gpu/GrBackendTextureImageGenerator.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/GrYUVATextureProxies.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/gl/GrGLTexture.h" +#include "src/gpu/ganesh/GrAHardwareBufferImageGenerator.h" +#include "src/gpu/ganesh/GrAHardwareBufferUtils_impl.h" +#include "src/gpu/ganesh/GrBackendTextureImageGenerator.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" #include #include diff --git a/src/image/SkImage_Gpu.h b/src/image/SkImage_Gpu.h index b17ce4b03c..4e9bbe5895 100644 --- a/src/image/SkImage_Gpu.h +++ b/src/image/SkImage_Gpu.h @@ -10,9 +10,9 @@ #include "include/private/SkSpinlock.h" #include "src/core/SkImagePriv.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrSurfaceProxyView.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyView.h" #include "src/image/SkImage_GpuBase.h" class GrDirectContext; diff --git a/src/image/SkImage_GpuBase.cpp b/src/image/SkImage_GpuBase.cpp index ecaa1d4ea4..f5b0b407d2 100644 --- a/src/image/SkImage_GpuBase.cpp +++ b/src/image/SkImage_GpuBase.cpp @@ -14,16 +14,16 @@ #include "include/gpu/GrRecordingContext.h" #include "include/gpu/GrYUVABackendTextures.h" #include "src/core/SkBitmapCache.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrYUVATextureProxies.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/effects/GrYUVtoRGBEffect.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkReadPixelsRec.h" diff --git a/src/image/SkImage_GpuYUVA.cpp b/src/image/SkImage_GpuYUVA.cpp index 00d664e915..1389a9706d 100644 --- a/src/image/SkImage_GpuYUVA.cpp +++ b/src/image/SkImage_GpuYUVA.cpp @@ -17,16 +17,16 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkMipmap.h" #include "src/core/SkScopeExit.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrYUVtoRGBEffect.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkImage_GpuYUVA.h" diff --git a/src/image/SkImage_GpuYUVA.h b/src/image/SkImage_GpuYUVA.h index 375c28ff10..0db4f18a83 100644 --- a/src/image/SkImage_GpuYUVA.h +++ b/src/image/SkImage_GpuYUVA.h @@ -10,7 +10,7 @@ #include "include/gpu/GrBackendSurface.h" #include "src/core/SkCachedData.h" -#include "src/gpu/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" #include "src/image/SkImage_GpuBase.h" class GrDirectContext; diff --git a/src/image/SkImage_Lazy.cpp b/src/image/SkImage_Lazy.cpp index 0dc77b9496..fb394dc409 100644 --- a/src/image/SkImage_Lazy.cpp +++ b/src/image/SkImage_Lazy.cpp @@ -21,18 +21,18 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkResourceCache.h" #include "src/core/SkYUVPlanesCache.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSamplerState.h" -#include "src/gpu/GrYUVATextureProxies.h" #include "src/gpu/ResourceKey.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrYUVtoRGBEffect.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSamplerState.h" +#include "src/gpu/ganesh/GrYUVATextureProxies.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrYUVtoRGBEffect.h" #endif // Ref-counted tuple(SkImageGenerator, SkMutex) which allows sharing one generator among N images diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index f9ad66560b..77bddafc80 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -21,10 +21,10 @@ #include "src/shaders/SkBitmapProcShader.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrBicubicEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrBicubicEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #endif #ifdef SK_GRAPHITE_ENABLED diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp index f87df1ad7a..b0d2c09928 100644 --- a/src/image/SkSurface_Gpu.cpp +++ b/src/image/SkSurface_Gpu.cpp @@ -15,15 +15,15 @@ #include "include/gpu/GrRecordingContext.h" #include "src/core/SkImagePriv.h" #include "src/core/SkSurfacePriv.h" -#include "src/gpu/BaseDevice.h" -#include "src/gpu/GrAHardwareBufferUtils.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrContextThreadSafeProxyPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/GrAHardwareBufferUtils_impl.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrContextThreadSafeProxyPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTexture.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkSurface_Base.h" diff --git a/src/image/SkSurface_GpuMtl.mm b/src/image/SkSurface_GpuMtl.mm index 713644227c..e6ffd29e41 100644 --- a/src/image/SkSurface_GpuMtl.mm +++ b/src/image/SkSurface_GpuMtl.mm @@ -9,17 +9,17 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/mtl/GrMtlTypes.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrResourceProviderPriv.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/image/SkSurface_Gpu.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrSurface.h" -#include "src/gpu/mtl/GrMtlTextureRenderTarget.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h" #ifdef SK_METAL #import diff --git a/src/shaders/BUILD.bazel b/src/shaders/BUILD.bazel index 10c17f272c..84635e79d8 100644 --- a/src/shaders/BUILD.bazel +++ b/src/shaders/BUILD.bazel @@ -71,7 +71,7 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkVM_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) @@ -97,10 +97,10 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkUtils_hdr", "//src/core:SkVM_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -136,8 +136,8 @@ generated_cc_atom( "//src/core:SkRuntimeEffectPriv_hdr", "//src/core:SkVM_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", ], ) @@ -185,8 +185,8 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkVM_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", "//src/image:SkImage_Base_hdr", ], ) @@ -211,8 +211,8 @@ generated_cc_atom( "//src/core:SkMatrixProvider_hdr", "//src/core:SkTLazy_hdr", "//src/core:SkVM_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", ], ) @@ -234,15 +234,15 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkVM_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrMatrixEffect_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrMatrixEffect_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -279,13 +279,13 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkResourceCache_hdr", "//src/core:SkVM_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColorInfo_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//src/image:SkImage_Base_hdr", ], ) @@ -304,7 +304,7 @@ generated_cc_atom( "//src/core:SkMask_hdr", "//src/core:SkTLazy_hdr", "//src/core:SkVM_fwd_hdr", - "//src/gpu:GrFPArgs_hdr", + "//src/gpu/ganesh:GrFPArgs_hdr", ], ) @@ -334,7 +334,7 @@ generated_cc_atom( "//src/core:SkTLazy_hdr", "//src/core:SkVM_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", ], ) diff --git a/src/shaders/SkColorFilterShader.cpp b/src/shaders/SkColorFilterShader.cpp index 93e39c6751..90f5d05589 100644 --- a/src/shaders/SkColorFilterShader.cpp +++ b/src/shaders/SkColorFilterShader.cpp @@ -16,7 +16,7 @@ #include "src/shaders/SkColorFilterShader.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #endif SkColorFilterShader::SkColorFilterShader(sk_sp shader, diff --git a/src/shaders/SkColorShader.cpp b/src/shaders/SkColorShader.cpp index 019e8d98cf..566ba2c63f 100644 --- a/src/shaders/SkColorShader.cpp +++ b/src/shaders/SkColorShader.cpp @@ -119,10 +119,10 @@ skvm::Color SkColor4Shader::onProgram(skvm::Builder* p, #if SK_SUPPORT_GPU -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/SkGr.h" std::unique_ptr SkColorShader::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/shaders/SkComposeShader.cpp b/src/shaders/SkComposeShader.cpp index 144257eaa3..c2978936b2 100644 --- a/src/shaders/SkComposeShader.cpp +++ b/src/shaders/SkComposeShader.cpp @@ -172,8 +172,8 @@ skvm::Color SkShader_Blend::onProgram(skvm::Builder* p, #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" std::unique_ptr SkShader_Blend::asFragmentProcessor( const GrFPArgs& orig_args) const { diff --git a/src/shaders/SkImageShader.cpp b/src/shaders/SkImageShader.cpp index c66f9dc16a..24b6f02153 100755 --- a/src/shaders/SkImageShader.cpp +++ b/src/shaders/SkImageShader.cpp @@ -334,8 +334,8 @@ sk_sp SkImageShader::MakeSubset(sk_sp image, #if SK_SUPPORT_GPU -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" std::unique_ptr SkImageShader::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/shaders/SkLocalMatrixShader.cpp b/src/shaders/SkLocalMatrixShader.cpp index 3d564389cc..84fdb8c128 100644 --- a/src/shaders/SkLocalMatrixShader.cpp +++ b/src/shaders/SkLocalMatrixShader.cpp @@ -11,8 +11,8 @@ #include "src/shaders/SkLocalMatrixShader.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" #endif #if SK_SUPPORT_GPU diff --git a/src/shaders/SkPerlinNoiseShader.cpp b/src/shaders/SkPerlinNoiseShader.cpp index 9719aaf915..2a629fd04b 100644 --- a/src/shaders/SkPerlinNoiseShader.cpp +++ b/src/shaders/SkPerlinNoiseShader.cpp @@ -21,15 +21,15 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrMatrixEffect.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrMatrixEffect.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #endif static const int kBlockSize = 256; diff --git a/src/shaders/SkPictureShader.cpp b/src/shaders/SkPictureShader.cpp index 03fb3d7b8d..418d236188 100644 --- a/src/shaders/SkPictureShader.cpp +++ b/src/shaders/SkPictureShader.cpp @@ -27,12 +27,12 @@ #if SK_SUPPORT_GPU #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColorInfo.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColorInfo.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "src/image/SkImage_Base.h" #endif @@ -368,7 +368,7 @@ void SkPictureShader::PictureShaderContext::shadeSpan(int x, int y, SkPMColor ds #if SK_SUPPORT_GPU -#include "src/gpu/GrProxyProvider.h" +#include "src/gpu/ganesh/GrProxyProvider.h" std::unique_ptr SkPictureShader::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/shaders/SkShader.cpp b/src/shaders/SkShader.cpp index 0bbb18997e..8db896a653 100644 --- a/src/shaders/SkShader.cpp +++ b/src/shaders/SkShader.cpp @@ -27,7 +27,7 @@ #include "src/shaders/SkTransformShader.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #endif #ifdef SK_ENABLE_SKSL diff --git a/src/shaders/SkShaderBase.h b/src/shaders/SkShaderBase.h index ffb65b55c4..f35afd2ab5 100644 --- a/src/shaders/SkShaderBase.h +++ b/src/shaders/SkShaderBase.h @@ -19,7 +19,7 @@ #include "src/core/SkVM_fwd.h" #if SK_SUPPORT_GPU -#include "src/gpu/GrFPArgs.h" +#include "src/gpu/ganesh/GrFPArgs.h" #endif class GrFragmentProcessor; diff --git a/src/shaders/gradients/BUILD.bazel b/src/shaders/gradients/BUILD.bazel index 3c0ccaf0a8..aadb43a480 100644 --- a/src/shaders/gradients/BUILD.bazel +++ b/src/shaders/gradients/BUILD.bazel @@ -118,7 +118,7 @@ generated_cc_atom( "//src/core:SkKeyHelpers_hdr", "//src/core:SkReadBuffer_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu/gradients:GrGradientShader_hdr", + "//src/gpu/ganesh/gradients:GrGradientShader_hdr", ], ) @@ -139,7 +139,7 @@ generated_cc_atom( "//src/core:SkRasterPipeline_hdr", "//src/core:SkReadBuffer_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu/gradients:GrGradientShader_hdr", + "//src/gpu/ganesh/gradients:GrGradientShader_hdr", ], ) @@ -161,7 +161,7 @@ generated_cc_atom( "//src/core:SkRasterPipeline_hdr", "//src/core:SkReadBuffer_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu/gradients:GrGradientShader_hdr", + "//src/gpu/ganesh/gradients:GrGradientShader_hdr", ], ) @@ -183,6 +183,6 @@ generated_cc_atom( "//src/core:SkRasterPipeline_hdr", "//src/core:SkReadBuffer_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu/gradients:GrGradientShader_hdr", + "//src/gpu/ganesh/gradients:GrGradientShader_hdr", ], ) diff --git a/src/shaders/gradients/SkLinearGradient.cpp b/src/shaders/gradients/SkLinearGradient.cpp index b3e2baae7a..619c4261ee 100644 --- a/src/shaders/gradients/SkLinearGradient.cpp +++ b/src/shaders/gradients/SkLinearGradient.cpp @@ -99,7 +99,7 @@ SkShader::GradientType SkLinearGradient::asAGradient(GradientInfo* info) const { #if SK_SUPPORT_GPU -#include "src/gpu/gradients/GrGradientShader.h" +#include "src/gpu/ganesh/gradients/GrGradientShader.h" std::unique_ptr SkLinearGradient::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/shaders/gradients/SkRadialGradient.cpp b/src/shaders/gradients/SkRadialGradient.cpp index 2d0e24edf0..e487df9ed0 100644 --- a/src/shaders/gradients/SkRadialGradient.cpp +++ b/src/shaders/gradients/SkRadialGradient.cpp @@ -77,7 +77,7 @@ skvm::F32 SkRadialGradient::transformT(skvm::Builder* p, skvm::Uniforms*, #if SK_SUPPORT_GPU -#include "src/gpu/gradients/GrGradientShader.h" +#include "src/gpu/ganesh/gradients/GrGradientShader.h" std::unique_ptr SkRadialGradient::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/shaders/gradients/SkSweepGradient.cpp b/src/shaders/gradients/SkSweepGradient.cpp index 343c5a5777..5314e0e16d 100644 --- a/src/shaders/gradients/SkSweepGradient.cpp +++ b/src/shaders/gradients/SkSweepGradient.cpp @@ -101,7 +101,7 @@ skvm::F32 SkSweepGradient::transformT(skvm::Builder* p, skvm::Uniforms* uniforms #if SK_SUPPORT_GPU -#include "src/gpu/gradients/GrGradientShader.h" +#include "src/gpu/ganesh/gradients/GrGradientShader.h" std::unique_ptr SkSweepGradient::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/shaders/gradients/SkTwoPointConicalGradient.cpp b/src/shaders/gradients/SkTwoPointConicalGradient.cpp index c314c0e6fb..5dc4c80e5c 100644 --- a/src/shaders/gradients/SkTwoPointConicalGradient.cpp +++ b/src/shaders/gradients/SkTwoPointConicalGradient.cpp @@ -271,7 +271,7 @@ skvm::F32 SkTwoPointConicalGradient::transformT(skvm::Builder* p, skvm::Uniforms #if SK_SUPPORT_GPU -#include "src/gpu/gradients/GrGradientShader.h" +#include "src/gpu/ganesh/gradients/GrGradientShader.h" std::unique_ptr SkTwoPointConicalGradient::asFragmentProcessor( const GrFPArgs& args) const { diff --git a/src/sksl/BUILD.bazel b/src/sksl/BUILD.bazel index 33de3749c2..19de3c5201 100644 --- a/src/sksl/BUILD.bazel +++ b/src/sksl/BUILD.bazel @@ -607,7 +607,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/core:SkTypes_hdr", - "//src/gpu:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", ], ) @@ -652,7 +652,7 @@ generated_cc_atom( deps = [ ":SkSLPool_hdr", "//include/core:SkTypes_hdr", - "//src/gpu:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", ], ) @@ -789,7 +789,7 @@ generated_cc_atom( "//include/private:SkSLProgramKind_hdr", "//include/sksl:SkSLErrorReporter_hdr", "//include/sksl:SkSLPosition_hdr", - "//src/gpu:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", "//src/sksl/ir:SkSLProgram_hdr", ], ) @@ -808,7 +808,7 @@ generated_cc_atom( ":SkSLUtil_hdr", "//include/private:SkSLProgramElement_hdr", "//include/sksl:DSLSymbols_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", "//src/sksl/ir:SkSLExternalFunction_hdr", "//src/sksl/ir:SkSLSymbolTable_hdr", ], @@ -835,7 +835,7 @@ generated_cc_atom( ":SkSLOutputStream_hdr", ":SkSLStringStream_hdr", ":SkSLUtil_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", "//src/sksl/ir:SkSLType_hdr", ], ) diff --git a/src/sksl/SkSLMemoryPool.h b/src/sksl/SkSLMemoryPool.h index f616c3bdbc..dd9e5398d1 100644 --- a/src/sksl/SkSLMemoryPool.h +++ b/src/sksl/SkSLMemoryPool.h @@ -14,7 +14,7 @@ #if SK_SUPPORT_GPU -#include "src/gpu/GrMemoryPool.h" +#include "src/gpu/ganesh/GrMemoryPool.h" namespace SkSL { using MemoryPool = ::GrMemoryPool; diff --git a/src/sksl/SkSLPool.cpp b/src/sksl/SkSLPool.cpp index f5747ec2e9..be86794f07 100644 --- a/src/sksl/SkSLPool.cpp +++ b/src/sksl/SkSLPool.cpp @@ -8,7 +8,7 @@ #include "src/sksl/SkSLPool.h" #include "include/core/SkTypes.h" -#include "src/gpu/GrMemoryPool.h" +#include "src/gpu/ganesh/GrMemoryPool.h" #define VLOG(...) // printf(__VA_ARGS__) diff --git a/src/sksl/SkSLThreadContext.cpp b/src/sksl/SkSLThreadContext.cpp index 281a07ce72..c4b2d986a8 100644 --- a/src/sksl/SkSLThreadContext.cpp +++ b/src/sksl/SkSLThreadContext.cpp @@ -21,7 +21,7 @@ #include #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" #endif // !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU namespace SkSL { diff --git a/src/sksl/SkSLThreadContext.h b/src/sksl/SkSLThreadContext.h index f2542e6e2d..680fe3a730 100644 --- a/src/sksl/SkSLThreadContext.h +++ b/src/sksl/SkSLThreadContext.h @@ -25,7 +25,7 @@ #include #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" #endif namespace SkSL { diff --git a/src/sksl/SkSLUtil.cpp b/src/sksl/SkSLUtil.cpp index 5238ea872d..1dc38b32de 100644 --- a/src/sksl/SkSLUtil.cpp +++ b/src/sksl/SkSLUtil.cpp @@ -16,7 +16,7 @@ #include #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #endif namespace SkSL { diff --git a/src/sksl/dsl/BUILD.bazel b/src/sksl/dsl/BUILD.bazel index fb4608e6c1..01ea4ba3a1 100644 --- a/src/sksl/dsl/BUILD.bazel +++ b/src/sksl/dsl/BUILD.bazel @@ -85,8 +85,8 @@ generated_cc_atom( "//include/sksl:DSLVar_hdr", "//include/sksl:DSLWrapper_hdr", "//include/sksl:SkSLOperator_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", "//src/sksl:SkSLThreadContext_hdr", "//src/sksl/dsl/priv:DSLWriter_hdr", "//src/sksl/ir:SkSLBinaryExpression_hdr", @@ -164,8 +164,8 @@ generated_cc_atom( "//include/sksl:DSLBlock_hdr", "//include/sksl:DSLExpression_hdr", "//include/sksl:DSLStatement_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", "//src/sksl:SkSLThreadContext_hdr", "//src/sksl/ir:SkSLBlock_hdr", "//src/sksl/ir:SkSLExpressionStatement_hdr", @@ -234,8 +234,8 @@ generated_cc_atom( "//include/sksl:DSLVar_hdr", "//include/sksl:SkSLOperator_hdr", "//src/core:SkSLTypeShared_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", "//src/sksl:SkSLBuiltinTypes_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl:SkSLContext_hdr", diff --git a/src/sksl/dsl/DSLExpression.cpp b/src/sksl/dsl/DSLExpression.cpp index e3502176f3..42a5a4f554 100644 --- a/src/sksl/dsl/DSLExpression.cpp +++ b/src/sksl/dsl/DSLExpression.cpp @@ -32,8 +32,8 @@ #include #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" #endif namespace SkSL { diff --git a/src/sksl/dsl/DSLStatement.cpp b/src/sksl/dsl/DSLStatement.cpp index 756f1ce9da..29aadc9da4 100644 --- a/src/sksl/dsl/DSLStatement.cpp +++ b/src/sksl/dsl/DSLStatement.cpp @@ -17,8 +17,8 @@ #include "src/sksl/ir/SkSLNop.h" #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" #endif namespace SkSL { diff --git a/src/sksl/dsl/DSLVar.cpp b/src/sksl/dsl/DSLVar.cpp index ca643fb985..609fad38f7 100644 --- a/src/sksl/dsl/DSLVar.cpp +++ b/src/sksl/dsl/DSLVar.cpp @@ -38,8 +38,8 @@ #include #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #endif namespace SkSL { diff --git a/src/sksl/dsl/priv/BUILD.bazel b/src/sksl/dsl/priv/BUILD.bazel index 547521a3d7..7fdcd2eba7 100644 --- a/src/sksl/dsl/priv/BUILD.bazel +++ b/src/sksl/dsl/priv/BUILD.bazel @@ -10,8 +10,8 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/sksl:DSLExpression_hdr", "//include/sksl:DSLVar_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) @@ -39,7 +39,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/core:SkTypes_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", ], ) diff --git a/src/sksl/dsl/priv/DSLFPs.h b/src/sksl/dsl/priv/DSLFPs.h index ad50052796..e5d5257f57 100644 --- a/src/sksl/dsl/priv/DSLFPs.h +++ b/src/sksl/dsl/priv/DSLFPs.h @@ -14,8 +14,8 @@ #include "include/sksl/DSLExpression.h" #include "include/sksl/DSLVar.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" namespace SkSL { diff --git a/src/sksl/dsl/priv/DSLWriter.h b/src/sksl/dsl/priv/DSLWriter.h index 4b3893905e..306c3bc5ae 100644 --- a/src/sksl/dsl/priv/DSLWriter.h +++ b/src/sksl/dsl/priv/DSLWriter.h @@ -11,7 +11,7 @@ #include "include/core/SkTypes.h" // IWYU pragma: keep #if !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU -#include "src/gpu/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" #endif // !defined(SKSL_STANDALONE) && SK_SUPPORT_GPU #include diff --git a/src/sksl/ir/BUILD.bazel b/src/sksl/ir/BUILD.bazel index 93c1001c57..be9acef364 100644 --- a/src/sksl/ir/BUILD.bazel +++ b/src/sksl/ir/BUILD.bazel @@ -844,7 +844,7 @@ generated_cc_atom( "//include/private:SkSLModifiers_hdr", "//include/private:SkSLProgramElement_hdr", "//include/private:SkTHash_hdr", - "//src/gpu/vk:GrVkCaps_hdr", + "//src/gpu/ganesh/vk:GrVkCaps_hdr", "//src/sksl:SkSLAnalysis_hdr", "//src/sksl:SkSLProgramSettings_hdr", ], diff --git a/src/sksl/ir/SkSLProgram.h b/src/sksl/ir/SkSLProgram.h index 056a35331b..e69621fb2b 100644 --- a/src/sksl/ir/SkSLProgram.h +++ b/src/sksl/ir/SkSLProgram.h @@ -22,7 +22,7 @@ #include "src/sksl/ir/SkSLSymbolTable.h" #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" #endif // name of the uniform used to handle features that are sensitive to whether Y is flipped. diff --git a/src/utils/BUILD.bazel b/src/utils/BUILD.bazel index 225df96a93..be037b5619 100644 --- a/src/utils/BUILD.bazel +++ b/src/utils/BUILD.bazel @@ -513,7 +513,7 @@ generated_cc_atom( "//src/core:SkGeometry_hdr", "//src/core:SkPointPriv_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu/geometry:GrPathUtils_hdr", + "//src/gpu/ganesh/geometry:GrPathUtils_hdr", ], ) @@ -547,8 +547,8 @@ generated_cc_atom( "//src/core:SkTLazy_hdr", "//src/core:SkVM_hdr", "//src/core:SkVerticesPriv_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) diff --git a/src/utils/SkShadowTessellator.cpp b/src/utils/SkShadowTessellator.cpp index e0bbc02db9..82ad1d4705 100644 --- a/src/utils/SkShadowTessellator.cpp +++ b/src/utils/SkShadowTessellator.cpp @@ -18,7 +18,7 @@ #include "src/utils/SkShadowTessellator.h" #if SK_SUPPORT_GPU -#include "src/gpu/geometry/GrPathUtils.h" +#include "src/gpu/ganesh/geometry/GrPathUtils.h" #endif diff --git a/src/utils/SkShadowUtils.cpp b/src/utils/SkShadowUtils.cpp index 9113b30abe..f6003b3f18 100644 --- a/src/utils/SkShadowUtils.cpp +++ b/src/utils/SkShadowUtils.cpp @@ -33,8 +33,8 @@ #include "src/utils/SkShadowTessellator.h" #include #if SK_SUPPORT_GPU -#include "src/gpu/effects/GrSkSLFP.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #endif /** diff --git a/tests/AdvancedBlendTest.cpp b/tests/AdvancedBlendTest.cpp index 8d43207c87..6fed9a0858 100644 --- a/tests/AdvancedBlendTest.cpp +++ b/tests/AdvancedBlendTest.cpp @@ -10,14 +10,14 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" #include "src/gpu/Blend.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrProcessorAnalysis.h" -#include "src/gpu/GrProcessorSet.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrCustomXfermode.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrProcessorAnalysis.h" +#include "src/gpu/ganesh/GrProcessorSet.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrCustomXfermode.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/ApplyGammaTest.cpp b/tests/ApplyGammaTest.cpp index 4415190cc2..9ac7b7c320 100644 --- a/tests/ApplyGammaTest.cpp +++ b/tests/ApplyGammaTest.cpp @@ -21,9 +21,9 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkTemplates.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel index e5829d86bf..55b15e6389 100644 --- a/tests/BUILD.bazel +++ b/tests/BUILD.bazel @@ -496,14 +496,14 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//include/private:SkColorData_hdr", "//src/gpu:Blend_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrProcessorAnalysis_hdr", - "//src/gpu:GrProcessorSet_hdr", - "//src/gpu:GrUserStencilSettings_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/effects:GrCustomXfermode_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrProcessorAnalysis_hdr", + "//src/gpu/ganesh:GrProcessorSet_hdr", + "//src/gpu/ganesh:GrUserStencilSettings_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrCustomXfermode_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -605,9 +605,9 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//include/private:SkTemplates_hdr", "//src/core:SkOpts_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -666,17 +666,17 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu/mtl:GrMtlTypes_hdr", "//src/core:SkAutoPixmapStorage_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/gl:GrGLCaps_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLUtil_hdr", - "//src/gpu/mtl:GrMtlCppUtil_hdr", - "//src/gpu/vk:GrVkCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/gl:GrGLCaps_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/mtl:GrMtlCppUtil_hdr", + "//src/gpu/ganesh/vk:GrVkCaps_hdr", "//src/image:SkImage_Base_hdr", "//tools:ToolUtils_hdr", "//tools/gpu:ManagedBackendTexture_hdr", @@ -695,11 +695,11 @@ generated_cc_atom( "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu/vk:GrVkTypes_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/gpu/vk:GrVkTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/gpu/ganesh/vk:GrVkTexture_hdr", "//src/image:SkImage_Base_hdr", "//tools/gpu:ProxyUtils_hdr", ], @@ -877,13 +877,13 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", "//src/core:SkBlendModePriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrOpsTypes_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu/ops:FillRectOp_hdr", - "//src/gpu/ops:TextureOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrOpsTypes_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/ops:FillRectOp_hdr", + "//src/gpu/ganesh/ops:TextureOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1071,11 +1071,11 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//include/private:SkColorData_hdr", "//src/core:SkAutoPixmapStorage_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu/ops:ClearOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh/ops:ClearOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -1391,8 +1391,8 @@ generated_cc_atom( "//src/core:SkCompressedDataUtils_hdr", "//src/core:SkMipmap_hdr", "//src/core:SkPaintPriv_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//src/image:SkImage_Base_hdr", "//tools:ToolUtils_hdr", ], @@ -1414,13 +1414,13 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//include/private:SkTemplates_hdr", "//src/core:SkOpts_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", "//tools/gpu:GrContextFactory_hdr", "//tools/gpu:ProxyUtils_hdr", ], @@ -1476,8 +1476,8 @@ generated_cc_atom( "//src/core:SkBlendModePriv_hdr", "//src/core:SkMatrixProvider_hdr", "//src/core:SkSurfacePriv_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -1563,13 +1563,13 @@ generated_cc_atom( "//include/gpu:GrTypes_hdr", "//include/private:GrTypesPriv_hdr", "//include/private:SkColorData_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -1605,15 +1605,15 @@ generated_cc_atom( "//include/gpu/gl:GrGLTypes_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkDeferredDisplayListPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/vk:GrVkCaps_hdr", - "//src/gpu/vk:GrVkSecondaryCBDrawContext_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/vk:GrVkCaps_hdr", + "//src/gpu/ganesh/vk:GrVkSecondaryCBDrawContext_impl_hdr", "//src/image:SkImage_GpuBase_hdr", "//src/image:SkSurface_Gpu_hdr", "//tools/gpu:BackendSurfaceFactory_hdr", @@ -1646,7 +1646,7 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkScalerContext_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", ], ) @@ -1666,7 +1666,7 @@ generated_cc_atom( "//include/gpu:GrTypes_hdr", "//src/core:SkDevice_hdr", "//src/core:SkSpecialImage_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -1740,21 +1740,21 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/private:GrTypesPriv_hdr", "//src/core:SkIPoint16_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDeferredUpload_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawOpAtlas_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOnFlushResourceProvider_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/ops:AtlasTextOp_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/text:GrAtlasManager_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDeferredUpload_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOnFlushResourceProvider_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/ops:AtlasTextOp_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/text:GrAtlasManager_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -1819,14 +1819,14 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrShaderCaps_hdr", - "//src/gpu:GrTextureProxyPriv_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrTextureProxyPriv_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu:GrContextFactory_hdr", "//tools/gpu:ManagedBackendTexture_hdr", "//tools/gpu/gl:GLTestContext_hdr", @@ -1910,7 +1910,7 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", "//src/core:SkAutoPixmapStorage_hdr", - "//src/gpu:GrPixmap_hdr", + "//src/gpu/ganesh:GrPixmap_hdr", "//tools:ToolUtils_hdr", ], ) @@ -2037,11 +2037,11 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", "//include/private:SkHalf_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SurfaceContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -2201,11 +2201,11 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu/gl:GrGLTypes_hdr", "//include/private:GrGLTypesPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/gl:GrGLCaps_hdr", - "//src/gpu/gl:GrGLTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/gl:GrGLCaps_hdr", + "//src/gpu/ganesh/gl:GrGLTexture_hdr", "//src/image:SkImage_Base_hdr", "//tools/gpu:ProxyUtils_hdr", ], @@ -2269,7 +2269,7 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/effects:SkDashPathEffect_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) @@ -2282,8 +2282,8 @@ generated_cc_atom( "//include/core:SkSize_hdr", "//include/private:SkTDArray_hdr", "//include/utils:SkRandom_hdr", - "//src/gpu:GrRectanizerPow2_hdr", - "//src/gpu:GrRectanizerSkyline_hdr", + "//src/gpu/ganesh:GrRectanizerPow2_hdr", + "//src/gpu/ganesh:GrRectanizerSkyline_hdr", ], ) @@ -2298,9 +2298,9 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/core:SkTypes_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrAHardwareBufferImageGenerator_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrAHardwareBufferImageGenerator_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -2321,11 +2321,11 @@ generated_cc_atom( "//src/core:SkMatrixProvider_hdr", "//src/core:SkRRectPriv_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:ClipStack_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:ClipStack_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -2350,8 +2350,8 @@ generated_cc_atom( "//include/core:SkExecutor_hdr", "//include/core:SkTypes_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -2393,8 +2393,8 @@ generated_cc_atom( "//include/core:SkCanvas_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", ], ) @@ -2406,7 +2406,7 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkTypes_hdr", "//include/gpu/gl:GrGLExtensions_hdr", - "//src/gpu/gl:GrGLDefines_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", ], ) @@ -2420,7 +2420,7 @@ generated_cc_atom( "//include/private:SkTDArray_hdr", "//include/private:SkTemplates_hdr", "//include/utils:SkRandom_hdr", - "//src/gpu:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", ], ) @@ -2433,22 +2433,22 @@ generated_cc_atom( "//include/core:SkBitmap_hdr", "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", "//src/gpu:KeyBuilder_hdr", "//src/gpu:ResourceKey_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelper_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools:ToolUtils_hdr", ], ) @@ -2467,18 +2467,18 @@ generated_cc_atom( "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu/d3d:GrD3DTypes_hdr", - "//src/gpu:BaseDevice_hdr", - "//src/gpu:GrBackendTextureImageGenerator_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:BaseDevice_hdr", + "//src/gpu/ganesh:GrBackendTextureImageGenerator_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkSurface_Gpu_hdr", "//tools/gpu:BackendSurfaceFactory_hdr", @@ -2498,8 +2498,8 @@ generated_cc_atom( "//include/core:SkCanvas_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", ], ) @@ -2513,21 +2513,21 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrOpsRenderPass_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrOpsRenderPass_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -2540,11 +2540,11 @@ generated_cc_atom( "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrContextOptions_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrXferProcessor_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", "//tools/gpu:GrContextFactory_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], @@ -2556,7 +2556,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":Test_hdr", - "//src/gpu/geometry:GrQuadBuffer_hdr", + "//src/gpu/ganesh/geometry:GrQuadBuffer_hdr", ], ) @@ -2567,8 +2567,8 @@ generated_cc_atom( deps = [ ":Test_hdr", "//include/core:SkScalar_hdr", - "//src/gpu/geometry:GrQuadUtils_hdr", - "//src/gpu/geometry:GrQuad_hdr", + "//src/gpu/ganesh/geometry:GrQuadUtils_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", ], ) @@ -2578,9 +2578,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ ":Test_hdr", - "//src/gpu:GrRenderTaskCluster_hdr", - "//src/gpu/mock:GrMockRenderTask_hdr", - "//src/gpu/mock:GrMockSurfaceProxy_hdr", + "//src/gpu/ganesh:GrRenderTaskCluster_hdr", + "//src/gpu/ganesh/mock:GrMockRenderTask_hdr", + "//src/gpu/ganesh/mock:GrMockSurfaceProxy_hdr", ], ) @@ -2592,7 +2592,7 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkTextBlob_hdr", "//include/private/chromium:GrSlug_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools:ToolUtils_hdr", ], ) @@ -2610,7 +2610,7 @@ generated_cc_atom( "//include/pathops:SkPathOps_hdr", "//src/core:SkPathEffectBase_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", ], ) @@ -2637,9 +2637,9 @@ generated_cc_atom( "//include/core:SkCanvas_hdr", "//include/core:SkColorSpace_hdr", "//include/core:SkSurface_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrPixmap_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrPixmap_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], ) @@ -2657,18 +2657,18 @@ generated_cc_atom( "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkCompressedDataUtils_hdr", - "//src/gpu:GrBackendUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceContext_hdr", + "//src/gpu/ganesh:GrBackendUtils_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", "//tools/gpu:BackendTextureImageFactory_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], @@ -2685,7 +2685,7 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/core:SkTextBlob_hdr", "//src/core:SkSurfacePriv_hdr", - "//src/gpu/text:GrTextBlob_hdr", + "//src/gpu/ganesh/text:GrTextBlob_hdr", "//tools:ToolUtils_hdr", ], ) @@ -2699,8 +2699,8 @@ generated_cc_atom( "//include/core:SkCanvas_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrTexture_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuBase_hdr", "//tools/gpu:ProxyUtils_hdr", @@ -2721,18 +2721,18 @@ generated_cc_atom( "//include/utils:SkRandom_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkMessageBus_hdr", - "//src/gpu:GrDefaultGeoProcFactory_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrThreadSafeCache_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDefaultGeoProcFactory_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrThreadSafeCache_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -2745,7 +2745,7 @@ generated_cc_atom( ":Test_hdr", "//include/utils:SkRandom_hdr", "//src/core:SkGeometry_hdr", - "//src/gpu:GrVx_hdr", + "//src/gpu/ganesh:GrVx_hdr", ], ) @@ -2765,7 +2765,7 @@ generated_cc_atom( "//include/private:SkTemplates_hdr", "//src/core:SkMatrixProvider_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrColorInfo_hdr", + "//src/gpu/ganesh:GrColorInfo_hdr", "//src/shaders:SkColorShader_hdr", ], ) @@ -2859,13 +2859,13 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/core:SkImageFilterCache_hdr", "//src/core:SkSpecialImage_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -2894,8 +2894,8 @@ generated_cc_atom( "//src/core:SkReadBuffer_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkSpecialSurface_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", "//src/image:SkImage_Base_hdr", "//tools:Resources_hdr", "//tools:ToolUtils_hdr", @@ -2992,13 +2992,13 @@ generated_cc_atom( "//src/core:SkColorSpacePriv_hdr", "//src/core:SkImagePriv_hdr", "//src/core:SkOpts_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceCache_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuYUVA_hdr", "//src/shaders:SkImageShader_hdr", @@ -3121,22 +3121,22 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/gpu/mock:GrMockTypes_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOnFlushResourceProvider_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxyPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/mock:GrMockGpu_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOnFlushResourceProvider_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxyPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/mock:GrMockGpu_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -3350,9 +3350,9 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/core:SkTextBlob_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrAHardwareBufferUtils_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrAHardwareBufferUtils_impl_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//src/utils:SkMultiPictureDocument_hdr", "//tools:SkSharingProc_hdr", "//tools:ToolUtils_hdr", @@ -3440,13 +3440,13 @@ generated_cc_atom( deps = [ ":Test_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/ops:GrOp_hdr", - "//src/gpu/ops:OpsTask_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", + "//src/gpu/ganesh/ops:OpsTask_hdr", ], ) @@ -4483,16 +4483,16 @@ generated_cc_atom( "//include/core:SkPath_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceCache_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrUserStencilSettings_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/ops:SoftwarePathRenderer_hdr", - "//src/gpu/ops:TriangulatingPathRenderer_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrUserStencilSettings_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/ops:SoftwarePathRenderer_hdr", + "//src/gpu/ganesh/ops:TriangulatingPathRenderer_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -4672,8 +4672,8 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", "//src/core:SkConvertPixels_hdr", - "//src/gpu:GrDataUtils_hdr", - "//src/gpu:GrPixmap_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", + "//src/gpu/ganesh:GrPixmap_hdr", "//tools:ToolUtils_hdr", ], ) @@ -4689,18 +4689,18 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/gpu:GrDirectContext_hdr", "//src/core:SkPointPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/ops:GrMeshDrawOp_hdr", - "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/ops:GrMeshDrawOp_hdr", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelper_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -4714,20 +4714,20 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrGpuResource_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrResourceProvider_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/ops:GrMeshDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrGpuResource_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/ops:GrMeshDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/flags:CommandLineFlags_hdr", ], ) @@ -4743,22 +4743,22 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/private:SkChecksum_hdr", "//include/utils:SkRandom_hdr", - "//src/gpu:GrAutoLocaleSetter_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawOpTest_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrXferProcessor_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/effects:GrBlendFragmentProcessor_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramBuilder_hdr", - "//src/gpu/ops:GrDrawOp_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrAutoLocaleSetter_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawOpTest_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrXferProcessor_hdr", + "//src/gpu/ganesh/effects:GrBlendFragmentProcessor_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramBuilder_hdr", + "//src/gpu/ganesh/ops:GrDrawOp_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -4773,10 +4773,10 @@ generated_cc_atom( "//include/core:SkPromiseImageTexture_hdr", "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", "//src/image:SkImage_Gpu_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], @@ -4790,14 +4790,14 @@ generated_cc_atom( ":Test_hdr", "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -4809,14 +4809,14 @@ generated_cc_atom( ":TestUtils_hdr", ":Test_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", ], ) @@ -4829,19 +4829,19 @@ generated_cc_atom( ":Test_hdr", "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrSurface_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrSurface_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], ) @@ -4930,11 +4930,11 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkConvertPixels_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:SurfaceContext_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", "//tools:ToolUtils_hdr", "//tools/gpu:BackendSurfaceFactory_hdr", "//tools/gpu:BackendTextureImageFactory_hdr", @@ -5075,14 +5075,14 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrTextureEffect_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrTextureEffect_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu:ProxyUtils_hdr", ], ) @@ -5124,8 +5124,8 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/effects:SkImageFilters_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrResourceCache_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", ], ) @@ -5139,14 +5139,14 @@ generated_cc_atom( "//include/core:SkSpan_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrResourceAllocator_hdr", - "//src/gpu:GrResourceProviderPriv_hdr", - "//src/gpu:GrSurfaceProxyPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrResourceAllocator_hdr", + "//src/gpu/ganesh:GrResourceProviderPriv_hdr", + "//src/gpu/ganesh:GrSurfaceProxyPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], ) @@ -5163,17 +5163,17 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/core:SkMessageBus_hdr", "//src/core:SkMipmap_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpuResourceCacheAccess_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceCache_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpuResourceCacheAccess_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//tools/gpu:GrContextFactory_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], @@ -5207,8 +5207,8 @@ generated_cc_atom( "//include/core:SkSize_hdr", "//include/core:SkSurface_hdr", "//include/effects:SkRuntimeEffect_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools:Resources_hdr", "//tools:RuntimeBlendUtils_hdr", "//tools:ToolUtils_hdr", @@ -5226,11 +5226,11 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceContext_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", ], ) @@ -5551,7 +5551,7 @@ generated_cc_atom( "//include/sksl:SkSLPosition_hdr", "//src/core:SkRuntimeEffectPriv_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrColor_hdr", + "//src/gpu/ganesh:GrColor_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl:SkSLUtil_hdr", "//tools/gpu:GrContextFactory_hdr", @@ -5661,10 +5661,10 @@ generated_cc_atom( "//src/core:SkStrikeSpec_hdr", "//src/core:SkSurfacePriv_hdr", "//src/core:SkTypeface_remote_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/text:GrSDFTControl_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/text:GrSDFTControl_hdr", "//tools:Resources_hdr", "//tools:ToolUtils_hdr", "//tools/fonts:TestEmptyTypeface_hdr", @@ -5712,14 +5712,14 @@ generated_cc_atom( "//src/core:SkColorSpacePriv_hdr", "//src/core:SkRuntimeEffectPriv_hdr", "//src/core:SkTLazy_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrImageInfo_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu:SurfaceFillContext_hdr", - "//src/gpu/effects:GrSkSLFP_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", + "//src/gpu/ganesh/effects:GrSkSLFP_hdr", ], ) @@ -5744,16 +5744,16 @@ generated_cc_atom( "//include/private:GrTypesPriv_hdr", "//include/private:SkColorData_hdr", "//src/core:SkSLTypeShared_hdr", - "//src/gpu:GrColor_hdr", - "//src/gpu:GrFragmentProcessor_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrPaint_hdr", - "//src/gpu:GrPixmap_hdr", - "//src/gpu:GrProcessor_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLProgramDataManager_hdr", - "//src/gpu/glsl:GrGLSLUniformHandler_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrColor_hdr", + "//src/gpu/ganesh:GrFragmentProcessor_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrPaint_hdr", + "//src/gpu/ganesh:GrPixmap_hdr", + "//src/gpu/ganesh:GrProcessor_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLProgramDataManager_hdr", + "//src/gpu/ganesh/glsl:GrGLSLUniformHandler_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -5775,8 +5775,8 @@ generated_cc_atom( "//include/sksl:DSL_hdr", "//include/sksl:SkSLErrorReporter_hdr", "//include/sksl:SkSLPosition_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl:SkSLThreadContext_hdr", "//src/sksl/dsl/priv:DSLWriter_hdr", @@ -5825,8 +5825,8 @@ generated_cc_atom( "//include/sksl:DSL_hdr", "//include/sksl:SkSLErrorReporter_hdr", "//include/sksl:SkSLPosition_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl:SkSLProgramSettings_hdr", "//src/sksl:SkSLThreadContext_hdr", @@ -5991,9 +5991,9 @@ generated_cc_atom( "//include/private:SkSLProgramKind_hdr", "//include/sksl:DSLCore_hdr", "//src/core:SkRuntimeEffectPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl:SkSLDehydrator_hdr", "//src/sksl:SkSLRehydrator_hdr", @@ -6013,7 +6013,7 @@ generated_cc_atom( deps = [ ":Test_hdr", "//include/sksl:SkSLErrorReporter_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", "//src/sksl:SkSLBuiltinTypes_hdr", "//src/sksl:SkSLContext_hdr", "//src/sksl:SkSLMangler_hdr", @@ -6138,7 +6138,7 @@ generated_cc_atom( "//src/core:SkCpu_hdr", "//src/core:SkMSAN_hdr", "//src/core:SkVM_hdr", - "//src/gpu:GrShaderCaps_hdr", + "//src/gpu/ganesh:GrShaderCaps_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/sksl/codegen:SkSLVMCodeGenerator_hdr", "//src/sksl/tracing:SkVMDebugTrace_hdr", @@ -6206,7 +6206,7 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/core:SkTypes_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", ], ) @@ -6238,11 +6238,11 @@ generated_cc_atom( "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkSpecialSurface_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -6257,9 +6257,9 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/core:SkSpecialImage_hdr", "//src/core:SkSpecialSurface_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", ], ) @@ -6396,10 +6396,10 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkColorSpace_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", ], ) @@ -6418,13 +6418,13 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu/vk:GrVkTypes_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLUtil_hdr", - "//src/gpu/vk:GrVkCommandPool_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/gpu/vk:GrVkUtil_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/vk:GrVkCommandPool_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -6450,14 +6450,14 @@ generated_cc_atom( "//src/core:SkCanvasPriv_hdr", "//src/core:SkDevice_hdr", "//src/core:SkUtils_hdr", - "//src/gpu:BaseDevice_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpuResourcePriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:SurfaceFillContext_hdr", + "//src/gpu/ganesh:BaseDevice_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpuResourcePriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_Gpu_hdr", "//src/image:SkSurface_Gpu_hdr", @@ -6542,7 +6542,7 @@ generated_cc_atom( deps = [ ":Test_hdr", "//include/core:SkBitmap_hdr", - "//src/gpu:GrDataUtils_hdr", + "//src/gpu/ganesh:GrDataUtils_hdr", ], ) @@ -6558,15 +6558,15 @@ generated_cc_atom( "//include/utils:SkBase64_hdr", "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkUtils_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", "//src/utils:SkCharToGlyphCache_hdr", ], ) @@ -6614,9 +6614,9 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/ports:SkTypeface_win_hdr", "//src/core:SkGlyphRun_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu/text:GrAtlasManager_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh/text:GrAtlasManager_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", "//tools:ToolUtils_hdr", "//tools/fonts:RandomScalerContext_hdr", ], @@ -6650,10 +6650,10 @@ generated_cc_atom( "//include/core:SkColorSpace_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", ], ) @@ -6665,13 +6665,13 @@ generated_cc_atom( ":Test_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrColorSpaceXform_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/geometry:GrQuad_hdr", - "//src/gpu/ops:OpsTask_hdr", - "//src/gpu/ops:TextureOp_hdr", + "//src/gpu/ganesh:GrColorSpaceXform_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/geometry:GrQuad_hdr", + "//src/gpu/ganesh/ops:OpsTask_hdr", + "//src/gpu/ganesh/ops:TextureOp_hdr", ], ) @@ -6685,15 +6685,15 @@ generated_cc_atom( "//include/core:SkImage_hdr", "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrResourceCache_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/dawn:GrDawnGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/dawn:GrDawnGpu_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], ) @@ -6732,7 +6732,7 @@ generated_cc_atom( deps = [ ":Test_hdr", "//include/utils:SkRandom_hdr", - "//src/gpu:GrTTopoSort_hdr", + "//src/gpu/ganesh:GrTTopoSort_hdr", "//tools:ToolUtils_hdr", ], ) @@ -6745,13 +6745,13 @@ generated_cc_atom( ":Test_hdr", "//include/core:SkTraceMemoryDump_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/gl:GrGLBuffer_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLGpu_hdr", - "//src/gpu/gl:GrGLTextureRenderTarget_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/gl:GrGLBuffer_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLGpu_hdr", + "//src/gpu/ganesh/gl:GrGLTextureRenderTarget_hdr", ], ) @@ -6781,13 +6781,13 @@ generated_cc_atom( "//include/core:SkSurface_hdr", "//include/core:SkTypes_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -6803,16 +6803,16 @@ generated_cc_atom( "//include/core:SkRect_hdr", "//include/effects:SkGradientShader_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrEagerVertexAllocator_hdr", - "//src/gpu:GrStyle_hdr", - "//src/gpu:GrUserStencilSettings_hdr", - "//src/gpu/effects:GrPorterDuffXferProcessor_hdr", - "//src/gpu/geometry:GrAATriangulator_hdr", - "//src/gpu/geometry:GrInnerFanTriangulator_hdr", - "//src/gpu/geometry:GrStyledShape_hdr", - "//src/gpu/ops:TriangulatingPathRenderer_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrEagerVertexAllocator_hdr", + "//src/gpu/ganesh:GrStyle_hdr", + "//src/gpu/ganesh:GrUserStencilSettings_hdr", + "//src/gpu/ganesh/effects:GrPorterDuffXferProcessor_hdr", + "//src/gpu/ganesh/geometry:GrAATriangulator_hdr", + "//src/gpu/ganesh/geometry:GrInnerFanTriangulator_hdr", + "//src/gpu/ganesh/geometry:GrStyledShape_hdr", + "//src/gpu/ganesh/ops:TriangulatingPathRenderer_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//src/shaders:SkShaderBase_hdr", "//tools:ToolUtils_hdr", ], @@ -6917,12 +6917,12 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu/vk:GrVkTypes_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrTextureProxy_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/gpu/vk:GrVkImageLayout_hdr", - "//src/gpu/vk:GrVkTexture_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/gpu/ganesh/vk:GrVkImageLayout_hdr", + "//src/gpu/ganesh/vk:GrVkTexture_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuBase_hdr", "//src/image:SkImage_Gpu_hdr", @@ -6945,12 +6945,12 @@ generated_cc_atom( "//include/gpu:GrBackendDrawableInfo_hdr", "//include/gpu:GrDirectContext_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/gpu/vk:GrVkInterface_hdr", - "//src/gpu/vk:GrVkMemory_hdr", - "//src/gpu/vk:GrVkSecondaryCBDrawContext_hdr", - "//src/gpu/vk:GrVkUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/gpu/ganesh/vk:GrVkInterface_hdr", + "//src/gpu/ganesh/vk:GrVkMemory_hdr", + "//src/gpu/ganesh/vk:GrVkSecondaryCBDrawContext_impl_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", "//tools/gpu:GrContextFactory_hdr", ], ) @@ -6971,12 +6971,12 @@ generated_cc_atom( "//include/gpu/vk:GrVkBackendContext_hdr", "//include/gpu/vk:GrVkExtensions_hdr", "//src/core:SkAutoMalloc_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu:GrContextFactory_hdr", "//tools/gpu/vk:VkTestUtils_hdr", ], @@ -7026,12 +7026,12 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//include/gpu/vk:GrVkTypes_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu/vk:GrVkCaps_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/gpu/vk:GrVkMemory_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh/vk:GrVkCaps_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/gpu/ganesh/vk:GrVkMemory_hdr", "//tools/gpu:GrContextFactory_hdr", "//tools/gpu:ManagedBackendTexture_hdr", ], @@ -7088,7 +7088,7 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/utils:SkRandom_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu:GrWindowRectangles_hdr", + "//src/gpu/ganesh:GrWindowRectangles_hdr", ], ) @@ -7105,10 +7105,10 @@ generated_cc_atom( "//include/gpu:GrTypes_hdr", "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkCanvasPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:GrSurfaceProxy_hdr", - "//src/gpu:SurfaceFillContext_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:SurfaceFillContext_hdr", "//tools/gpu:BackendSurfaceFactory_hdr", "//tools/gpu:ProxyUtils_hdr", ], @@ -7129,9 +7129,9 @@ generated_cc_atom( "//include/private:SkColorData_hdr", "//include/private:SkImageInfoPriv_hdr", "//src/core:SkMathPriv_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrProxyProvider_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", "//tools/gpu:BackendSurfaceFactory_hdr", ], ) @@ -7212,9 +7212,9 @@ generated_cc_atom( "//src/core:SkStrikeCache_hdr", "//src/core:SkStrikeSpec_hdr", "//src/core:SkWriteBuffer_hdr", - "//src/gpu:GrResourceProvider_hdr", - "//src/gpu:GrSubRunAllocator_hdr", - "//src/gpu/text:GrGlyphVector_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrSubRunAllocator_hdr", + "//src/gpu/ganesh/text:GrGlyphVector_hdr", ], ) diff --git a/tests/BackendAllocationTest.cpp b/tests/BackendAllocationTest.cpp index 65cb201598..4e4b9773a9 100644 --- a/tests/BackendAllocationTest.cpp +++ b/tests/BackendAllocationTest.cpp @@ -10,11 +10,11 @@ #include "include/core/SkSurfaceCharacterization.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "src/image/SkImage_Base.h" #include "tests/Test.h" #include "tests/TestUtils.h" @@ -23,15 +23,15 @@ #include "tools/gpu/ProxyUtils.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLCaps.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #ifdef SK_METAL #include "include/gpu/mtl/GrMtlTypes.h" -#include "src/gpu/mtl/GrMtlCppUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlCppUtil.h" #endif using sk_gpu_test::ManagedBackendTexture; @@ -900,7 +900,7 @@ DEF_GPUTEST_FOR_ALL_GL_CONTEXTS(GLBackendAllocationTest, reporter, ctxInfo) { #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkBackendAllocationTest, reporter, ctxInfo) { auto context = ctxInfo.directContext(); diff --git a/tests/BackendSurfaceMutableStateTest.cpp b/tests/BackendSurfaceMutableStateTest.cpp index 7bd077d908..15c1e064c7 100644 --- a/tests/BackendSurfaceMutableStateTest.cpp +++ b/tests/BackendSurfaceMutableStateTest.cpp @@ -10,16 +10,16 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" #include "src/image/SkImage_Base.h" #include "tests/Test.h" #include "tools/gpu/ProxyUtils.h" #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" DEF_GPUTEST_FOR_VULKAN_CONTEXT(VkBackendSurfaceMutableStateTest, reporter, ctxInfo) { auto dContext = ctxInfo.directContext(); diff --git a/tests/BulkRectTest.cpp b/tests/BulkRectTest.cpp index 20b4b2e2b4..7f2a63296f 100644 --- a/tests/BulkRectTest.cpp +++ b/tests/BulkRectTest.cpp @@ -8,13 +8,13 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkBlendModePriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrOpsTypes.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/ops/FillRectOp.h" -#include "src/gpu/ops/TextureOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrOpsTypes.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/ops/FillRectOp.h" +#include "src/gpu/ganesh/ops/TextureOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" static std::unique_ptr new_SDC(GrRecordingContext* rContext) { diff --git a/tests/ClearTest.cpp b/tests/ClearTest.cpp index d4bb1e8203..4b736a95e0 100644 --- a/tests/ClearTest.cpp +++ b/tests/ClearTest.cpp @@ -20,11 +20,11 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/ops/ClearOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/ops/ClearOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/CompressedBackendAllocationTest.cpp b/tests/CompressedBackendAllocationTest.cpp index 00e23e7a0f..7b894f9090 100644 --- a/tests/CompressedBackendAllocationTest.cpp +++ b/tests/CompressedBackendAllocationTest.cpp @@ -13,8 +13,8 @@ #include "src/core/SkCompressedDataUtils.h" #include "src/core/SkMipmap.h" #include "src/core/SkPaintPriv.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "tests/Test.h" #include "tests/TestUtils.h" diff --git a/tests/CopySurfaceTest.cpp b/tests/CopySurfaceTest.cpp index 79a411ffd1..8b8a0523e1 100644 --- a/tests/CopySurfaceTest.cpp +++ b/tests/CopySurfaceTest.cpp @@ -15,13 +15,13 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkTemplates.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" #include "tools/gpu/ProxyUtils.h" diff --git a/tests/DMSAATest.cpp b/tests/DMSAATest.cpp index 34fa9a2201..2246fcb314 100644 --- a/tests/DMSAATest.cpp +++ b/tests/DMSAATest.cpp @@ -13,8 +13,8 @@ #include "src/core/SkBlendModePriv.h" #include "src/core/SkMatrixProvider.h" #include "src/core/SkSurfacePriv.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/tests/DefaultPathRendererTest.cpp b/tests/DefaultPathRendererTest.cpp index 1e9598ee2f..b61824b7db 100644 --- a/tests/DefaultPathRendererTest.cpp +++ b/tests/DefaultPathRendererTest.cpp @@ -22,13 +22,13 @@ #include "include/gpu/GrTypes.h" #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/DeferredDisplayListTest.cpp b/tests/DeferredDisplayListTest.cpp index b9eb38946f..d62b3e11e4 100644 --- a/tests/DeferredDisplayListTest.cpp +++ b/tests/DeferredDisplayListTest.cpp @@ -29,13 +29,13 @@ #include "include/gpu/gl/GrGLTypes.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkDeferredDisplayListPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include "src/image/SkImage_GpuBase.h" #include "src/image/SkSurface_Gpu.h" #include "tests/Test.h" @@ -50,8 +50,8 @@ #include #ifdef SK_VULKAN -#include "src/gpu/vk/GrVkCaps.h" -#include "src/gpu/vk/GrVkSecondaryCBDrawContext.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h" #endif class SurfaceParameters { diff --git a/tests/DescriptorTest.cpp b/tests/DescriptorTest.cpp index 3f234b7d4a..5a3800cd81 100644 --- a/tests/DescriptorTest.cpp +++ b/tests/DescriptorTest.cpp @@ -12,7 +12,7 @@ #include "src/core/SkReadBuffer.h" #include "src/core/SkScalerContext.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" #include "tests/Test.h" #include diff --git a/tests/DeviceTest.cpp b/tests/DeviceTest.cpp index 6eff3035da..4ebc20d438 100644 --- a/tests/DeviceTest.cpp +++ b/tests/DeviceTest.cpp @@ -15,7 +15,7 @@ #include "include/gpu/GrTypes.h" #include "src/core/SkDevice.h" #include "src/core/SkSpecialImage.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/DrawOpAtlasTest.cpp b/tests/DrawOpAtlasTest.cpp index 54bbbccbdd..bc3aebf507 100644 --- a/tests/DrawOpAtlasTest.cpp +++ b/tests/DrawOpAtlasTest.cpp @@ -20,20 +20,20 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/GrTypesPriv.h" #include "src/core/SkIPoint16.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDeferredUpload.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/ops/AtlasTextOp.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/text/GrAtlasManager.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDeferredUpload.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/ops/AtlasTextOp.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" @@ -187,7 +187,7 @@ DEF_GPUTEST_FOR_RENDERING_CONTEXTS(BasicDrawOpAtlas, reporter, ctxInfo) { } #if SK_GPU_V1 -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" // This test verifies that the AtlasTextOp::onPrepare method correctly handles a failure // when allocating an atlas page. diff --git a/tests/EGLImageTest.cpp b/tests/EGLImageTest.cpp index 895a0d77c1..aabcefa247 100644 --- a/tests/EGLImageTest.cpp +++ b/tests/EGLImageTest.cpp @@ -7,14 +7,14 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrShaderCaps.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrShaderCaps.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "tests/Test.h" #include "tests/TestUtils.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/ExtendedSkColorTypeTests.cpp b/tests/ExtendedSkColorTypeTests.cpp index aebc79254d..ddc2cdec12 100644 --- a/tests/ExtendedSkColorTypeTests.cpp +++ b/tests/ExtendedSkColorTypeTests.cpp @@ -11,7 +11,7 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkAutoPixmapStorage.h" -#include "src/gpu/GrPixmap.h" +#include "src/gpu/ganesh/GrPixmap.h" #include "tests/Test.h" #include "tests/TestUtils.h" diff --git a/tests/FloatingPointTextureTest.cpp b/tests/FloatingPointTextureTest.cpp index 631aa23798..05c0afca9c 100644 --- a/tests/FloatingPointTextureTest.cpp +++ b/tests/FloatingPointTextureTest.cpp @@ -17,11 +17,11 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" #include "include/private/SkHalf.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "tools/gpu/ProxyUtils.h" #include diff --git a/tests/GLBackendSurfaceTest.cpp b/tests/GLBackendSurfaceTest.cpp index 73ae95ee37..58ca83aec2 100644 --- a/tests/GLBackendSurfaceTest.cpp +++ b/tests/GLBackendSurfaceTest.cpp @@ -18,11 +18,11 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/gl/GrGLTypes.h" #include "include/private/GrGLTypesPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/gl/GrGLCaps.h" -#include "src/gpu/gl/GrGLTexture.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/gl/GrGLCaps.h" +#include "src/gpu/ganesh/gl/GrGLTexture.h" #include "src/image/SkImage_Base.h" #include "tools/gpu/ProxyUtils.h" diff --git a/tests/GpuDrawPathTest.cpp b/tests/GpuDrawPathTest.cpp index 6f4976a0d9..fba133e3d0 100644 --- a/tests/GpuDrawPathTest.cpp +++ b/tests/GpuDrawPathTest.cpp @@ -17,7 +17,7 @@ #include "include/core/SkSurface.h" #include "include/effects/SkDashPathEffect.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #include "tests/Test.h" #include diff --git a/tests/GpuRectanizerTest.cpp b/tests/GpuRectanizerTest.cpp index 67a4994baa..a7602a558f 100644 --- a/tests/GpuRectanizerTest.cpp +++ b/tests/GpuRectanizerTest.cpp @@ -8,8 +8,8 @@ #include "include/core/SkSize.h" #include "include/private/SkTDArray.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrRectanizerPow2.h" -#include "src/gpu/GrRectanizerSkyline.h" +#include "src/gpu/ganesh/GrRectanizerPow2.h" +#include "src/gpu/ganesh/GrRectanizerSkyline.h" #include "tests/Test.h" static const int kWidth = 1024; diff --git a/tests/GrAHardwareBufferTest.cpp b/tests/GrAHardwareBufferTest.cpp index e7daaf603f..509a342c6d 100644 --- a/tests/GrAHardwareBufferTest.cpp +++ b/tests/GrAHardwareBufferTest.cpp @@ -15,9 +15,9 @@ #include "include/core/SkImage.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrAHardwareBufferImageGenerator.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrAHardwareBufferImageGenerator.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/GrClipStackTest.cpp b/tests/GrClipStackTest.cpp index 14a01f4848..63d84d7b62 100644 --- a/tests/GrClipStackTest.cpp +++ b/tests/GrClipStackTest.cpp @@ -6,7 +6,7 @@ * found in the LICENSE file. */ -#include "src/gpu/v1/ClipStack.h" +#include "src/gpu/ganesh/v1/ClipStack.h" #include "tests/Test.h" #include "include/core/SkColorSpace.h" @@ -19,10 +19,10 @@ #include "src/core/SkMatrixProvider.h" #include "src/core/SkRRectPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" namespace { diff --git a/tests/GrContextFactoryTest.cpp b/tests/GrContextFactoryTest.cpp index 0ddb69a3b0..98e6903d76 100644 --- a/tests/GrContextFactoryTest.cpp +++ b/tests/GrContextFactoryTest.cpp @@ -9,8 +9,8 @@ #include "include/core/SkExecutor.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/GrFinishedFlushTest.cpp b/tests/GrFinishedFlushTest.cpp index 481c06d2bb..7f034a766b 100644 --- a/tests/GrFinishedFlushTest.cpp +++ b/tests/GrFinishedFlushTest.cpp @@ -11,8 +11,8 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" using namespace sk_gpu_test; diff --git a/tests/GrGLExtensionsTest.cpp b/tests/GrGLExtensionsTest.cpp index 4c95706202..386f92f61e 100644 --- a/tests/GrGLExtensionsTest.cpp +++ b/tests/GrGLExtensionsTest.cpp @@ -8,7 +8,7 @@ #include "include/core/SkTypes.h" #include "include/gpu/gl/GrGLExtensions.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include "tests/Test.h" #ifdef SK_GL diff --git a/tests/GrGlyphVectorTest.cpp b/tests/GrGlyphVectorTest.cpp index 64414a8038..5dbd11bf9c 100644 --- a/tests/GrGlyphVectorTest.cpp +++ b/tests/GrGlyphVectorTest.cpp @@ -6,15 +6,15 @@ */ #include "src/core/SkGlyph.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/text/GrGlyphVector.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/text/GrGlyphVector.h" #include "src/core/SkGlyphBuffer.h" #include "src/core/SkReadBuffer.h" #include "src/core/SkStrikeCache.h" #include "src/core/SkStrikeSpec.h" #include "src/core/SkWriteBuffer.h" -#include "src/gpu/GrSubRunAllocator.h" +#include "src/gpu/ganesh/GrSubRunAllocator.h" #include "tests/Test.h" class TestingPeer { diff --git a/tests/GrMemoryPoolTest.cpp b/tests/GrMemoryPoolTest.cpp index 64241617c6..23b9df3ea1 100644 --- a/tests/GrMemoryPoolTest.cpp +++ b/tests/GrMemoryPoolTest.cpp @@ -9,7 +9,7 @@ #include "include/private/SkTDArray.h" #include "include/private/SkTemplates.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrMemoryPool.h" +#include "src/gpu/ganesh/GrMemoryPool.h" #include "tests/Test.h" // A is the top of an inheritance tree of classes that overload op new and diff --git a/tests/GrMeshTest.cpp b/tests/GrMeshTest.cpp index 3a61f96651..f3faa4c5ff 100644 --- a/tests/GrMeshTest.cpp +++ b/tests/GrMeshTest.cpp @@ -11,22 +11,22 @@ #include "include/core/SkBitmap.h" #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrResourceProvider.h" #include "src/gpu/KeyBuilder.h" #include "src/gpu/ResourceKey.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include #include diff --git a/tests/GrMipMappedTest.cpp b/tests/GrMipMappedTest.cpp index ddf2485047..78c8b9d104 100644 --- a/tests/GrMipMappedTest.cpp +++ b/tests/GrMipMappedTest.cpp @@ -15,18 +15,18 @@ #ifdef SK_DIRECT3D #include "include/gpu/d3d/GrD3DTypes.h" #endif -#include "src/gpu/BaseDevice.h" -#include "src/gpu/GrBackendTextureImageGenerator.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/GrBackendTextureImageGenerator.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/image/SkImage_Base.h" #include "src/image/SkSurface_Gpu.h" #include "tests/Test.h" diff --git a/tests/GrOpListFlushTest.cpp b/tests/GrOpListFlushTest.cpp index 36228d447c..e6f9cd352c 100644 --- a/tests/GrOpListFlushTest.cpp +++ b/tests/GrOpListFlushTest.cpp @@ -9,8 +9,8 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "tests/Test.h" static bool check_read(skiatest::Reporter* reporter, const SkBitmap& bitmap) { diff --git a/tests/GrPipelineDynamicStateTest.cpp b/tests/GrPipelineDynamicStateTest.cpp index 1c8b7cc7b0..50c5d0b647 100644 --- a/tests/GrPipelineDynamicStateTest.cpp +++ b/tests/GrPipelineDynamicStateTest.cpp @@ -11,21 +11,21 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrOpsRenderPass.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrOpsRenderPass.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" /** * This is a GPU-backend specific test for dynamic pipeline state. It draws boxes using dynamic diff --git a/tests/GrPorterDuffTest.cpp b/tests/GrPorterDuffTest.cpp index 85dcb101fd..3fdfbb37a1 100644 --- a/tests/GrPorterDuffTest.cpp +++ b/tests/GrPorterDuffTest.cpp @@ -10,11 +10,11 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrXferProcessor.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" #include "tools/gpu/GrContextFactory.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/GrQuadBufferTest.cpp b/tests/GrQuadBufferTest.cpp index 5fce192904..f8f0a5bd99 100644 --- a/tests/GrQuadBufferTest.cpp +++ b/tests/GrQuadBufferTest.cpp @@ -7,7 +7,7 @@ #include "tests/Test.h" -#include "src/gpu/geometry/GrQuadBuffer.h" +#include "src/gpu/ganesh/geometry/GrQuadBuffer.h" #include diff --git a/tests/GrQuadCropTest.cpp b/tests/GrQuadCropTest.cpp index 2807632fb9..29ee73ecaa 100644 --- a/tests/GrQuadCropTest.cpp +++ b/tests/GrQuadCropTest.cpp @@ -6,8 +6,8 @@ */ #include "include/core/SkScalar.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/geometry/GrQuadUtils.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/geometry/GrQuadUtils.h" #include "tests/Test.h" #define ASSERT(cond) REPORTER_ASSERT(r, cond) diff --git a/tests/GrRenderTaskClusterTest.cpp b/tests/GrRenderTaskClusterTest.cpp index e92acc6d0f..cb398b25a4 100644 --- a/tests/GrRenderTaskClusterTest.cpp +++ b/tests/GrRenderTaskClusterTest.cpp @@ -5,9 +5,9 @@ * found in the LICENSE file. */ -#include "src/gpu/GrRenderTaskCluster.h" -#include "src/gpu/mock/GrMockRenderTask.h" -#include "src/gpu/mock/GrMockSurfaceProxy.h" +#include "src/gpu/ganesh/GrRenderTaskCluster.h" +#include "src/gpu/ganesh/mock/GrMockRenderTask.h" +#include "src/gpu/ganesh/mock/GrMockSurfaceProxy.h" #include "tests/Test.h" typedef void (*CreateGraphPF)(SkTArray>* graph, diff --git a/tests/GrSlugTest.cpp b/tests/GrSlugTest.cpp index 765976613d..a7a9eef6ca 100644 --- a/tests/GrSlugTest.cpp +++ b/tests/GrSlugTest.cpp @@ -7,7 +7,7 @@ #include "include/core/SkTextBlob.h" #include "include/private/chromium/GrSlug.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/ToolUtils.h" diff --git a/tests/GrStyledShapeTest.cpp b/tests/GrStyledShapeTest.cpp index 5b629047cc..ab1d1d9b73 100644 --- a/tests/GrStyledShapeTest.cpp +++ b/tests/GrStyledShapeTest.cpp @@ -12,7 +12,7 @@ #include "include/pathops/SkPathOps.h" #include "src/core/SkPathEffectBase.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #include "tests/Test.h" #include diff --git a/tests/GrSurfaceResolveTest.cpp b/tests/GrSurfaceResolveTest.cpp index 26268ba38f..3c04868391 100644 --- a/tests/GrSurfaceResolveTest.cpp +++ b/tests/GrSurfaceResolveTest.cpp @@ -11,9 +11,9 @@ #include "include/core/SkCanvas.h" #include "include/core/SkColorSpace.h" #include "include/core/SkSurface.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrPixmap.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrPixmap.h" #include "tests/TestUtils.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/GrSurfaceTest.cpp b/tests/GrSurfaceTest.cpp index 83a1cd0171..7d8ec5f84a 100644 --- a/tests/GrSurfaceTest.cpp +++ b/tests/GrSurfaceTest.cpp @@ -11,16 +11,16 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkCompressedDataUtils.h" -#include "src/gpu/GrBackendUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrBackendUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "tests/Test.h" #include "tests/TestUtils.h" #include "tools/gpu/BackendTextureImageFactory.h" @@ -178,8 +178,8 @@ DEF_GPUTEST_FOR_ALL_CONTEXTS(GrSurfaceRenderability, reporter, ctxInfo) { } } -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" // For each context, set it to always clear the textures and then run through all the // supported formats checking that the textures are actually cleared diff --git a/tests/GrTextBlobTest.cpp b/tests/GrTextBlobTest.cpp index eb20895537..11066e7723 100644 --- a/tests/GrTextBlobTest.cpp +++ b/tests/GrTextBlobTest.cpp @@ -10,7 +10,7 @@ #include "include/core/SkSurface.h" #include "include/core/SkTextBlob.h" #include "src/core/SkSurfacePriv.h" -#include "src/gpu/text/GrTextBlob.h" +#include "src/gpu/ganesh/text/GrTextBlob.h" #include "tests/Test.h" #include "tools/ToolUtils.h" diff --git a/tests/GrTextureMipMapInvalidationTest.cpp b/tests/GrTextureMipMapInvalidationTest.cpp index 2f7d1f393e..b2f7d701bc 100644 --- a/tests/GrTextureMipMapInvalidationTest.cpp +++ b/tests/GrTextureMipMapInvalidationTest.cpp @@ -8,8 +8,8 @@ #include "include/core/SkCanvas.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuBase.h" #include "tests/Test.h" diff --git a/tests/GrThreadSafeCacheTest.cpp b/tests/GrThreadSafeCacheTest.cpp index 2fc5825248..769daf23d8 100644 --- a/tests/GrThreadSafeCacheTest.cpp +++ b/tests/GrThreadSafeCacheTest.cpp @@ -12,18 +12,18 @@ #include "include/utils/SkRandom.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkMessageBus.h" -#include "src/gpu/GrDefaultGeoProcFactory.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrThreadSafeCache.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDefaultGeoProcFactory.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrThreadSafeCache.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" #include "tests/TestUtils.h" #include "tools/gpu/ProxyUtils.h" diff --git a/tests/GrVxTest.cpp b/tests/GrVxTest.cpp index 39803a9269..919893c769 100644 --- a/tests/GrVxTest.cpp +++ b/tests/GrVxTest.cpp @@ -7,7 +7,7 @@ #include "include/utils/SkRandom.h" #include "src/core/SkGeometry.h" -#include "src/gpu/GrVx.h" +#include "src/gpu/ganesh/GrVx.h" #include "tests/Test.h" #include #include diff --git a/tests/GradientTest.cpp b/tests/GradientTest.cpp index e594ac588d..53e9480ebf 100644 --- a/tests/GradientTest.cpp +++ b/tests/GradientTest.cpp @@ -15,7 +15,7 @@ #include "include/private/SkTemplates.h" #include "src/core/SkMatrixProvider.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrColorInfo.h" +#include "src/gpu/ganesh/GrColorInfo.h" #include "src/shaders/SkColorShader.h" #include "tests/Test.h" diff --git a/tests/ImageFilterCacheTest.cpp b/tests/ImageFilterCacheTest.cpp index e017a0f618..74e4f614e3 100644 --- a/tests/ImageFilterCacheTest.cpp +++ b/tests/ImageFilterCacheTest.cpp @@ -197,13 +197,13 @@ DEF_TEST(ImageFilterCache_ImageBackedRaster, reporter) { } #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" static GrSurfaceProxyView create_proxy_view(GrRecordingContext* rContext) { SkBitmap srcBM = create_bm(); diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 39a93e7710..41ea843dd7 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -24,8 +24,8 @@ #include "src/core/SkReadBuffer.h" #include "src/core/SkSpecialImage.h" #include "src/core/SkSpecialSurface.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "src/image/SkImage_Base.h" #include "tests/Test.h" #include "tools/Resources.h" diff --git a/tests/ImageTest.cpp b/tests/ImageTest.cpp index 10d3965085..44f7762a7d 100644 --- a/tests/ImageTest.cpp +++ b/tests/ImageTest.cpp @@ -26,13 +26,13 @@ #include "src/core/SkColorSpacePriv.h" #include "src/core/SkImagePriv.h" #include "src/core/SkOpts.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuYUVA.h" #include "tests/Test.h" diff --git a/tests/LazyProxyTest.cpp b/tests/LazyProxyTest.cpp index 49567b6601..abdd29d212 100644 --- a/tests/LazyProxyTest.cpp +++ b/tests/LazyProxyTest.cpp @@ -10,22 +10,22 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/mock/GrMockTypes.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOnFlushResourceProvider.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/GrTextureProxyPriv.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/mock/GrMockGpu.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOnFlushResourceProvider.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/GrTextureProxyPriv.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/mock/GrMockGpu.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" // This test verifies that lazy proxy callbacks get invoked during flush, after onFlush callbacks, // but before Ops are executed. It also ensures that lazy proxy callbacks are invoked both for diff --git a/tests/MtlBackendAllocationTest.mm b/tests/MtlBackendAllocationTest.mm index 904d44fca5..05c7c26fb0 100644 --- a/tests/MtlBackendAllocationTest.mm +++ b/tests/MtlBackendAllocationTest.mm @@ -6,8 +6,8 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/mtl/GrMtlCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/mtl/GrMtlCaps.h" #include "tests/Test.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/MtlCopySurfaceTest.mm b/tests/MtlCopySurfaceTest.mm index ca76669c99..fdf44d4ada 100644 --- a/tests/MtlCopySurfaceTest.mm +++ b/tests/MtlCopySurfaceTest.mm @@ -7,16 +7,16 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/mtl/GrMtlGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/mtl/GrMtlGpu.h" #include "tests/Test.h" #import #import -#include "src/gpu/mtl/GrMtlCaps.h" -#include "src/gpu/mtl/GrMtlTextureRenderTarget.h" +#include "src/gpu/ganesh/mtl/GrMtlCaps.h" +#include "src/gpu/ganesh/mtl/GrMtlTextureRenderTarget.h" DEF_GPUTEST_FOR_METAL_CONTEXT(MtlCopySurfaceTest, reporter, ctxInfo) { if (@available(macOS 11.0, iOS 9.0, *)) { diff --git a/tests/MultiPictureDocumentTest.cpp b/tests/MultiPictureDocumentTest.cpp index f8570dbeed..7892ff46e2 100644 --- a/tests/MultiPictureDocumentTest.cpp +++ b/tests/MultiPictureDocumentTest.cpp @@ -23,7 +23,7 @@ #include "include/core/SkString.h" #include "include/core/SkSurface.h" #include "include/core/SkTextBlob.h" -#include "src/gpu/GrCaps.h" +#include "src/gpu/ganesh/GrCaps.h" #include "src/utils/SkMultiPictureDocument.h" #include "tests/Test.h" #include "tools/SkSharingProc.h" @@ -178,8 +178,8 @@ DEF_TEST(SkMultiPictureDocument_Serialize_and_deserialize, reporter) { #include "include/core/SkColorSpace.h" #include "include/core/SkColorType.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrAHardwareBufferUtils.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrAHardwareBufferUtils_impl.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include diff --git a/tests/OpChainTest.cpp b/tests/OpChainTest.cpp index 521f13ff41..6e97be371e 100644 --- a/tests/OpChainTest.cpp +++ b/tests/OpChainTest.cpp @@ -6,13 +6,13 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/ops/GrOp.h" -#include "src/gpu/ops/OpsTask.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/ops/GrOp.h" +#include "src/gpu/ganesh/ops/OpsTask.h" #include "tests/Test.h" #include diff --git a/tests/PathRendererCacheTests.cpp b/tests/PathRendererCacheTests.cpp index a8555ca8d8..aafe3d97e4 100644 --- a/tests/PathRendererCacheTests.cpp +++ b/tests/PathRendererCacheTests.cpp @@ -11,16 +11,16 @@ #include "include/core/SkPath.h" #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/geometry/GrStyledShape.h" -#include "src/gpu/ops/SoftwarePathRenderer.h" -#include "src/gpu/ops/TriangulatingPathRenderer.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/ops/SoftwarePathRenderer.h" +#include "src/gpu/ganesh/ops/TriangulatingPathRenderer.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" static SkPath create_concave_path() { SkPath path; diff --git a/tests/PremulAlphaRoundTripTest.cpp b/tests/PremulAlphaRoundTripTest.cpp index 099b95d8ab..26df12c614 100644 --- a/tests/PremulAlphaRoundTripTest.cpp +++ b/tests/PremulAlphaRoundTripTest.cpp @@ -10,8 +10,8 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrDataUtils.h" -#include "src/gpu/GrPixmap.h" +#include "src/gpu/ganesh/GrDataUtils.h" +#include "src/gpu/ganesh/GrPixmap.h" #include "tests/Test.h" #include "tools/ToolUtils.h" diff --git a/tests/PrimitiveProcessorTest.cpp b/tests/PrimitiveProcessorTest.cpp index c1e63afb22..d8b1923624 100644 --- a/tests/PrimitiveProcessorTest.cpp +++ b/tests/PrimitiveProcessorTest.cpp @@ -13,18 +13,18 @@ #include "include/core/SkString.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkPointPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" #include diff --git a/tests/ProcessorTest.cpp b/tests/ProcessorTest.cpp index 608db4b34a..d0d3b8c658 100644 --- a/tests/ProcessorTest.cpp +++ b/tests/ProcessorTest.cpp @@ -9,20 +9,20 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrGpuResource.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceProvider.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/effects/GrTextureEffect.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/ops/GrMeshDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrGpuResource.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/ops/GrMeshDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/TestHarness.h" #include "tests/TestUtils.h" diff --git a/tests/ProgramsTest.cpp b/tests/ProgramsTest.cpp index ab978ee3ff..0d268e9443 100644 --- a/tests/ProgramsTest.cpp +++ b/tests/ProgramsTest.cpp @@ -13,26 +13,26 @@ #include "include/gpu/GrDirectContext.h" #include "include/private/SkChecksum.h" #include "include/utils/SkRandom.h" -#include "src/gpu/GrAutoLocaleSetter.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawOpTest.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrXferProcessor.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/effects/GrBlendFragmentProcessor.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramBuilder.h" -#include "src/gpu/ops/GrDrawOp.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrAutoLocaleSetter.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawOpTest.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrXferProcessor.h" +#include "src/gpu/ganesh/effects/GrBlendFragmentProcessor.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramBuilder.h" +#include "src/gpu/ganesh/ops/GrDrawOp.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" #endif /* diff --git a/tests/PromiseImageTest.cpp b/tests/PromiseImageTest.cpp index 3622b4be21..49223358a9 100644 --- a/tests/PromiseImageTest.cpp +++ b/tests/PromiseImageTest.cpp @@ -11,10 +11,10 @@ #include "include/core/SkPromiseImageTexture.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" #include "src/image/SkImage_Gpu.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/ProxyConversionTest.cpp b/tests/ProxyConversionTest.cpp index 8df901597b..5d7fd6bf43 100644 --- a/tests/ProxyConversionTest.cpp +++ b/tests/ProxyConversionTest.cpp @@ -11,14 +11,14 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" static sk_sp make_wrapped_rt(GrProxyProvider* provider, GrGpu* gpu, diff --git a/tests/ProxyRefTest.cpp b/tests/ProxyRefTest.cpp index 9ef2deb597..cbe10add4c 100644 --- a/tests/ProxyRefTest.cpp +++ b/tests/ProxyRefTest.cpp @@ -10,14 +10,14 @@ #include "tests/Test.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" #include "tests/TestUtils.h" static const int kWidthHeight = 128; diff --git a/tests/ProxyTest.cpp b/tests/ProxyTest.cpp index 9dec7a1b2b..2f3ca60c62 100644 --- a/tests/ProxyTest.cpp +++ b/tests/ProxyTest.cpp @@ -9,22 +9,22 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurface.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurface.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" #include "tests/Test.h" #include "tools/gpu/ManagedBackendTexture.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #include "tests/TestUtils.h" diff --git a/tests/ReadWritePixelsGpuTest.cpp b/tests/ReadWritePixelsGpuTest.cpp index 46c9bd44aa..81ad960496 100644 --- a/tests/ReadWritePixelsGpuTest.cpp +++ b/tests/ReadWritePixelsGpuTest.cpp @@ -12,11 +12,11 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkConvertPixels.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/SurfaceContext.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/SurfaceContext.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #include "tests/Test.h" #include "tests/TestUtils.h" #include "tools/ToolUtils.h" diff --git a/tests/RectangleTextureTest.cpp b/tests/RectangleTextureTest.cpp index ce2033c5db..87431cf91c 100644 --- a/tests/RectangleTextureTest.cpp +++ b/tests/RectangleTextureTest.cpp @@ -10,15 +10,15 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrTextureEffect.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrTextureEffect.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #include "tools/gpu/ProxyUtils.h" diff --git a/tests/RepeatedClippedBlurTest.cpp b/tests/RepeatedClippedBlurTest.cpp index 9d305c072e..8f781ae4e5 100644 --- a/tests/RepeatedClippedBlurTest.cpp +++ b/tests/RepeatedClippedBlurTest.cpp @@ -10,8 +10,8 @@ #include "include/core/SkSurface.h" #include "include/effects/SkImageFilters.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrResourceCache.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" #include "tests/Test.h" // This is the repro of a CastOS memory regression bug (b/138674523). diff --git a/tests/ResourceAllocatorTest.cpp b/tests/ResourceAllocatorTest.cpp index 2661aacb9c..f735025f89 100644 --- a/tests/ResourceAllocatorTest.cpp +++ b/tests/ResourceAllocatorTest.cpp @@ -9,14 +9,14 @@ #include "include/core/SkSpan.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrResourceAllocator.h" -#include "src/gpu/GrResourceProviderPriv.h" -#include "src/gpu/GrSurfaceProxyPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrResourceAllocator.h" +#include "src/gpu/ganesh/GrResourceProviderPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxyPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" #include "tests/Test.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/ResourceCacheTest.cpp b/tests/ResourceCacheTest.cpp index 888e2713ea..03dcf352a0 100644 --- a/tests/ResourceCacheTest.cpp +++ b/tests/ResourceCacheTest.cpp @@ -11,17 +11,17 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkMessageBus.h" #include "src/core/SkMipmap.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuResourceCacheAccess.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuResourceCacheAccess.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/RuntimeBlendTest.cpp b/tests/RuntimeBlendTest.cpp index 39669bfbfd..12d921d7fd 100644 --- a/tests/RuntimeBlendTest.cpp +++ b/tests/RuntimeBlendTest.cpp @@ -12,8 +12,8 @@ #include "include/core/SkSize.h" #include "include/core/SkSurface.h" #include "include/effects/SkRuntimeEffect.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/Resources.h" #include "tools/RuntimeBlendUtils.h" diff --git a/tests/SRGBReadWritePixelsTest.cpp b/tests/SRGBReadWritePixelsTest.cpp index 1a478f4423..5299dc2d76 100644 --- a/tests/SRGBReadWritePixelsTest.cpp +++ b/tests/SRGBReadWritePixelsTest.cpp @@ -9,11 +9,11 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "tests/Test.h" #include "tests/TestUtils.h" diff --git a/tests/SkDSLRuntimeEffectTest.cpp b/tests/SkDSLRuntimeEffectTest.cpp index 7a71260fd1..80f6efe6c4 100644 --- a/tests/SkDSLRuntimeEffectTest.cpp +++ b/tests/SkDSLRuntimeEffectTest.cpp @@ -30,7 +30,7 @@ #include "include/sksl/SkSLPosition.h" #include "src/core/SkRuntimeEffectPriv.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrColor.h" +#include "src/gpu/ganesh/GrColor.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/SkSLUtil.h" #include "tests/Test.h" diff --git a/tests/SkRemoteGlyphCacheTest.cpp b/tests/SkRemoteGlyphCacheTest.cpp index 88f2d99154..71f03f4e2c 100644 --- a/tests/SkRemoteGlyphCacheTest.cpp +++ b/tests/SkRemoteGlyphCacheTest.cpp @@ -21,10 +21,10 @@ #include "src/core/SkStrikeSpec.h" #include "src/core/SkSurfacePriv.h" #include "src/core/SkTypeface_remote.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/text/GrSDFTControl.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/text/GrSDFTControl.h" #include "tests/Test.h" #include "tools/Resources.h" #include "tools/ToolUtils.h" diff --git a/tests/SkRuntimeEffectTest.cpp b/tests/SkRuntimeEffectTest.cpp index 3f58ec7e48..93a9afc798 100644 --- a/tests/SkRuntimeEffectTest.cpp +++ b/tests/SkRuntimeEffectTest.cpp @@ -20,14 +20,14 @@ #include "src/core/SkColorSpacePriv.h" #include "src/core/SkRuntimeEffectPriv.h" #include "src/core/SkTLazy.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrImageInfo.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/SurfaceFillContext.h" -#include "src/gpu/effects/GrSkSLFP.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" +#include "src/gpu/ganesh/effects/GrSkSLFP.h" #include "tests/Test.h" #include diff --git a/tests/SkSLCross.cpp b/tests/SkSLCross.cpp index 64e96354de..86602303d4 100644 --- a/tests/SkSLCross.cpp +++ b/tests/SkSLCross.cpp @@ -19,16 +19,16 @@ #include "include/private/GrTypesPriv.h" #include "include/private/SkColorData.h" #include "src/core/SkSLTypeShared.h" -#include "src/gpu/GrColor.h" -#include "src/gpu/GrFragmentProcessor.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrPaint.h" -#include "src/gpu/GrPixmap.h" -#include "src/gpu/GrProcessor.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLProgramDataManager.h" -#include "src/gpu/glsl/GrGLSLUniformHandler.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrColor.h" +#include "src/gpu/ganesh/GrFragmentProcessor.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrPaint.h" +#include "src/gpu/ganesh/GrPixmap.h" +#include "src/gpu/ganesh/GrProcessor.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLProgramDataManager.h" +#include "src/gpu/ganesh/glsl/GrGLSLUniformHandler.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/SkSLDSLErrorLineNumbers.cpp b/tests/SkSLDSLErrorLineNumbers.cpp index dfdcdec733..92e99922e3 100644 --- a/tests/SkSLDSLErrorLineNumbers.cpp +++ b/tests/SkSLDSLErrorLineNumbers.cpp @@ -15,8 +15,8 @@ #include "include/sksl/DSLWrapper.h" #include "include/sksl/SkSLErrorReporter.h" #include "include/sksl/SkSLPosition.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/SkSLThreadContext.h" #include "src/sksl/dsl/priv/DSLWriter.h" diff --git a/tests/SkSLDSLTest.cpp b/tests/SkSLDSLTest.cpp index 078e2a1564..59c9a4190e 100644 --- a/tests/SkSLDSLTest.cpp +++ b/tests/SkSLDSLTest.cpp @@ -27,8 +27,8 @@ #include "include/sksl/DSLWrapper.h" #include "include/sksl/SkSLErrorReporter.h" #include "include/sksl/SkSLPosition.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/SkSLProgramSettings.h" #include "src/sksl/SkSLThreadContext.h" diff --git a/tests/SkSLTest.cpp b/tests/SkSLTest.cpp index 826cd8942b..7091bab441 100644 --- a/tests/SkSLTest.cpp +++ b/tests/SkSLTest.cpp @@ -25,9 +25,9 @@ #include "include/private/SkSLProgramKind.h" #include "include/sksl/DSLCore.h" #include "src/core/SkRuntimeEffectPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/SkSLDehydrator.h" #include "src/sksl/SkSLRehydrator.h" diff --git a/tests/SkSLTypeTest.cpp b/tests/SkSLTypeTest.cpp index 8e630f69cd..e64f8621ac 100644 --- a/tests/SkSLTypeTest.cpp +++ b/tests/SkSLTypeTest.cpp @@ -6,7 +6,7 @@ */ #include "include/sksl/SkSLErrorReporter.h" -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLBuiltinTypes.h" #include "src/sksl/SkSLContext.h" #include "src/sksl/SkSLMangler.h" diff --git a/tests/SkVMTest.cpp b/tests/SkVMTest.cpp index f3b52751f3..b2aeae28f3 100644 --- a/tests/SkVMTest.cpp +++ b/tests/SkVMTest.cpp @@ -10,7 +10,7 @@ #include "src/core/SkCpu.h" #include "src/core/SkMSAN.h" #include "src/core/SkVM.h" -#include "src/gpu/GrShaderCaps.h" +#include "src/gpu/ganesh/GrShaderCaps.h" #include "src/sksl/SkSLCompiler.h" #include "src/sksl/codegen/SkSLVMCodeGenerator.h" #include "src/sksl/tracing/SkVMDebugTrace.h" diff --git a/tests/Skbug6653.cpp b/tests/Skbug6653.cpp index 388463481c..bedb1851b2 100644 --- a/tests/Skbug6653.cpp +++ b/tests/Skbug6653.cpp @@ -10,7 +10,7 @@ #include "include/core/SkSurface.h" #include "include/core/SkTypes.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tests/Test.h" static SkBitmap read_pixels(sk_sp surface, SkColor initColor) { diff --git a/tests/SpecialImageTest.cpp b/tests/SpecialImageTest.cpp index 898c50836b..4145c85c45 100644 --- a/tests/SpecialImageTest.cpp +++ b/tests/SpecialImageTest.cpp @@ -16,11 +16,11 @@ #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkSpecialImage.h" #include "src/core/SkSpecialSurface.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" #include "tests/Test.h" // This test creates backing resources exactly sized to [kFullSize x kFullSize]. diff --git a/tests/SpecialSurfaceTest.cpp b/tests/SpecialSurfaceTest.cpp index 35a1a0aea5..6c87107bc8 100644 --- a/tests/SpecialSurfaceTest.cpp +++ b/tests/SpecialSurfaceTest.cpp @@ -10,9 +10,9 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkSpecialImage.h" #include "src/core/SkSpecialSurface.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" #include "tests/Test.h" class TestingSpecialSurfaceAccess { diff --git a/tests/SurfaceDrawContextTest.cpp b/tests/SurfaceDrawContextTest.cpp index 6851113ea5..49286dcd2c 100644 --- a/tests/SurfaceDrawContextTest.cpp +++ b/tests/SurfaceDrawContextTest.cpp @@ -11,10 +11,10 @@ #include "include/core/SkColorSpace.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" static const int kSize = 64; diff --git a/tests/SurfaceSemaphoreTest.cpp b/tests/SurfaceSemaphoreTest.cpp index dbaf5cb18d..34eeeb5cc9 100644 --- a/tests/SurfaceSemaphoreTest.cpp +++ b/tests/SurfaceSemaphoreTest.cpp @@ -12,22 +12,22 @@ #include "include/gpu/GrBackendSemaphore.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #endif #ifdef SK_VULKAN #include "include/gpu/vk/GrVkTypes.h" #include "include/gpu/vk/GrVkVulkan.h" -#include "src/gpu/vk/GrVkCommandPool.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkCommandPool.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #ifdef VK_USE_PLATFORM_WIN32_KHR // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW diff --git a/tests/SurfaceTest.cpp b/tests/SurfaceTest.cpp index 7335827311..caf3166030 100644 --- a/tests/SurfaceTest.cpp +++ b/tests/SurfaceTest.cpp @@ -19,14 +19,14 @@ #include "src/core/SkCanvasPriv.h" #include "src/core/SkDevice.h" #include "src/core/SkUtils.h" -#include "src/gpu/BaseDevice.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuResourcePriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/BaseDevice.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuResourcePriv.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkSurface_Gpu.h" diff --git a/tests/TestUtils.cpp b/tests/TestUtils.cpp index dc5dcb9ea2..88fb2509ec 100644 --- a/tests/TestUtils.cpp +++ b/tests/TestUtils.cpp @@ -13,15 +13,15 @@ #include "include/utils/SkBase64.h" #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkUtils.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" void TestReadPixels(skiatest::Reporter* reporter, GrDirectContext* dContext, diff --git a/tests/TestUtils.h b/tests/TestUtils.h index f36f74caef..882ef4576f 100644 --- a/tests/TestUtils.h +++ b/tests/TestUtils.h @@ -9,7 +9,7 @@ #define TestUtils_DEFINED #include "include/core/SkBitmap.h" -#include "src/gpu/GrDataUtils.h" +#include "src/gpu/ganesh/GrDataUtils.h" #include "tests/Test.h" namespace skgpu { class SurfaceContext; } diff --git a/tests/TextBlobCacheTest.cpp b/tests/TextBlobCacheTest.cpp index 24e502a142..d0a2c74974 100644 --- a/tests/TextBlobCacheTest.cpp +++ b/tests/TextBlobCacheTest.cpp @@ -20,7 +20,7 @@ #include "include/core/SkTypeface.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkGlyphRun.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tools/fonts/RandomScalerContext.h" #ifdef SK_BUILD_FOR_WIN @@ -29,9 +29,9 @@ #include "tests/Test.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/text/GrAtlasManager.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/text/GrAtlasManager.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" static void draw(SkCanvas* canvas, int redraw, const SkTArray>& blobs) { int yOffset = 0; diff --git a/tests/TextureBindingsResetTest.cpp b/tests/TextureBindingsResetTest.cpp index 669169f67e..8f6c7532d6 100644 --- a/tests/TextureBindingsResetTest.cpp +++ b/tests/TextureBindingsResetTest.cpp @@ -8,10 +8,10 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "tests/Test.h" #ifdef SK_GL diff --git a/tests/TextureOpTest.cpp b/tests/TextureOpTest.cpp index 5ce9fa341f..fdde6989f6 100644 --- a/tests/TextureOpTest.cpp +++ b/tests/TextureOpTest.cpp @@ -7,13 +7,13 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrColorSpaceXform.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/geometry/GrQuad.h" -#include "src/gpu/ops/OpsTask.h" -#include "src/gpu/ops/TextureOp.h" +#include "src/gpu/ganesh/GrColorSpaceXform.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/geometry/GrQuad.h" +#include "src/gpu/ganesh/ops/OpsTask.h" +#include "src/gpu/ganesh/ops/TextureOp.h" #include "tests/Test.h" class OpsTaskTestingAccess { diff --git a/tests/TextureProxyTest.cpp b/tests/TextureProxyTest.cpp index dfb4d91e54..54e5e349b6 100644 --- a/tests/TextureProxyTest.cpp +++ b/tests/TextureProxyTest.cpp @@ -13,18 +13,18 @@ #include "include/core/SkImage.h" #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/SkGr.h" #include "tools/gpu/ManagedBackendTexture.h" #ifdef SK_DAWN -#include "src/gpu/dawn/GrDawnGpu.h" +#include "src/gpu/ganesh/dawn/GrDawnGpu.h" #endif int GrProxyProvider::numUniqueKeyProxies_TestOnly() const { diff --git a/tests/TopoSortTest.cpp b/tests/TopoSortTest.cpp index b3ab4bdfca..3403d72fcb 100644 --- a/tests/TopoSortTest.cpp +++ b/tests/TopoSortTest.cpp @@ -6,7 +6,7 @@ */ #include "include/utils/SkRandom.h" -#include "src/gpu/GrTTopoSort.h" +#include "src/gpu/ganesh/GrTTopoSort.h" #include "tests/Test.h" #include "tools/ToolUtils.h" diff --git a/tests/TraceMemoryDumpTest.cpp b/tests/TraceMemoryDumpTest.cpp index 08b745e042..a229c84537 100644 --- a/tests/TraceMemoryDumpTest.cpp +++ b/tests/TraceMemoryDumpTest.cpp @@ -10,14 +10,14 @@ #include "tests/Test.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTexture.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTexture.h" #ifdef SK_GL -#include "src/gpu/gl/GrGLBuffer.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLGpu.h" -#include "src/gpu/gl/GrGLTextureRenderTarget.h" +#include "src/gpu/ganesh/gl/GrGLBuffer.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLGpu.h" +#include "src/gpu/ganesh/gl/GrGLTextureRenderTarget.h" #endif /* diff --git a/tests/TransferPixelsTest.cpp b/tests/TransferPixelsTest.cpp index 151f5954c8..ada7ede266 100644 --- a/tests/TransferPixelsTest.cpp +++ b/tests/TransferPixelsTest.cpp @@ -12,13 +12,13 @@ #include "include/core/SkColorSpace.h" #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrResourceProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrResourceProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" #include "tests/Test.h" #include "tests/TestUtils.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/TriangulatingPathRendererTests.cpp b/tests/TriangulatingPathRendererTests.cpp index f164724555..b4b54738fb 100644 --- a/tests/TriangulatingPathRendererTests.cpp +++ b/tests/TriangulatingPathRendererTests.cpp @@ -12,14 +12,14 @@ #include "include/core/SkRect.h" #include "include/effects/SkGradientShader.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrEagerVertexAllocator.h" -#include "src/gpu/GrStyle.h" -#include "src/gpu/GrUserStencilSettings.h" -#include "src/gpu/effects/GrPorterDuffXferProcessor.h" -#include "src/gpu/geometry/GrAATriangulator.h" -#include "src/gpu/geometry/GrInnerFanTriangulator.h" -#include "src/gpu/geometry/GrStyledShape.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrEagerVertexAllocator.h" +#include "src/gpu/ganesh/GrStyle.h" +#include "src/gpu/ganesh/GrUserStencilSettings.h" +#include "src/gpu/ganesh/effects/GrPorterDuffXferProcessor.h" +#include "src/gpu/ganesh/geometry/GrAATriangulator.h" +#include "src/gpu/ganesh/geometry/GrInnerFanTriangulator.h" +#include "src/gpu/ganesh/geometry/GrStyledShape.h" #include "src/shaders/SkShaderBase.h" #include "tools/ToolUtils.h" #include @@ -488,8 +488,8 @@ CreatePathFn kNonEdgeAAPaths[] = { }; #if SK_GPU_V1 -#include "src/gpu/ops/TriangulatingPathRenderer.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/ops/TriangulatingPathRenderer.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" // A simple concave path. Test this with a non-invertible matrix. static SkPath create_path_17() { diff --git a/tests/VkBackendSurfaceTest.cpp b/tests/VkBackendSurfaceTest.cpp index 8f6b83573e..d9ba1ca298 100644 --- a/tests/VkBackendSurfaceTest.cpp +++ b/tests/VkBackendSurfaceTest.cpp @@ -16,12 +16,12 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/gpu/vk/GrVkVulkan.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/GrTextureProxy.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkImageLayout.h" -#include "src/gpu/vk/GrVkTexture.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/GrTextureProxy.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkImageLayout.h" +#include "src/gpu/ganesh/vk/GrVkTexture.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_Gpu.h" #include "src/image/SkImage_GpuBase.h" diff --git a/tests/VkDrawableTest.cpp b/tests/VkDrawableTest.cpp index 1a9165a603..b2c01e534a 100644 --- a/tests/VkDrawableTest.cpp +++ b/tests/VkDrawableTest.cpp @@ -18,12 +18,12 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrBackendDrawableInfo.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkMemory.h" -#include "src/gpu/vk/GrVkSecondaryCBDrawContext.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" +#include "src/gpu/ganesh/vk/GrVkSecondaryCBDrawContext_impl.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" diff --git a/tests/VkHardwareBufferTest.cpp b/tests/VkHardwareBufferTest.cpp index 9372c2cb1e..e448df3693 100644 --- a/tests/VkHardwareBufferTest.cpp +++ b/tests/VkHardwareBufferTest.cpp @@ -20,12 +20,12 @@ #include "include/gpu/vk/GrVkBackendContext.h" #include "include/gpu/vk/GrVkExtensions.h" #include "src/core/SkAutoMalloc.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" #include "tools/gpu/vk/VkTestUtils.h" diff --git a/tests/VkWrapTests.cpp b/tests/VkWrapTests.cpp index 0ac75e3857..1ab2321808 100644 --- a/tests/VkWrapTests.cpp +++ b/tests/VkWrapTests.cpp @@ -15,12 +15,12 @@ #include "include/gpu/GrDirectContext.h" #include "include/gpu/vk/GrVkTypes.h" #include "include/gpu/vk/GrVkVulkan.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/vk/GrVkCaps.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkMemory.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/vk/GrVkCaps.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkMemory.h" #include "tests/Test.h" #include "tools/gpu/GrContextFactory.h" #include "tools/gpu/ManagedBackendTexture.h" diff --git a/tests/WindowRectanglesTest.cpp b/tests/WindowRectanglesTest.cpp index 0d78b4431d..148677a0f6 100644 --- a/tests/WindowRectanglesTest.cpp +++ b/tests/WindowRectanglesTest.cpp @@ -10,7 +10,7 @@ #include "include/utils/SkRandom.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrWindowRectangles.h" +#include "src/gpu/ganesh/GrWindowRectangles.h" static SkIRect next_irect(SkRandom& r) { return {r.nextS(), r.nextS(), r.nextS(), r.nextS()}; diff --git a/tests/WrappedSurfaceCopyOnWriteTest.cpp b/tests/WrappedSurfaceCopyOnWriteTest.cpp index 9db0e93258..9486ee5df1 100644 --- a/tests/WrappedSurfaceCopyOnWriteTest.cpp +++ b/tests/WrappedSurfaceCopyOnWriteTest.cpp @@ -11,10 +11,10 @@ #include "include/gpu/GrTypes.h" #include "src/core/SkAutoPixmapStorage.h" #include "src/core/SkCanvasPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/GrSurfaceProxy.h" -#include "src/gpu/SurfaceFillContext.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" +#include "src/gpu/ganesh/SurfaceFillContext.h" #include "tests/Test.h" #include "tests/TestUtils.h" #include "tools/gpu/BackendSurfaceFactory.h" diff --git a/tests/WritePixelsTest.cpp b/tests/WritePixelsTest.cpp index eedf7f42a9..207a3f14d7 100644 --- a/tests/WritePixelsTest.cpp +++ b/tests/WritePixelsTest.cpp @@ -13,9 +13,9 @@ #include "include/private/SkColorData.h" #include "include/private/SkImageInfoPriv.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrProxyProvider.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrProxyProvider.h" #include "tests/Test.h" #include "tools/gpu/BackendSurfaceFactory.h" diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index d9dfad458a..13dceb173e 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -96,7 +96,7 @@ generated_cc_atom( "//src/core:SkCachedData_hdr", "//src/core:SkMipmap_hdr", "//src/core:SkTaskGroup_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//src/image:SkImage_Base_hdr", "//src/image:SkImage_GpuYUVA_hdr", ], @@ -130,7 +130,7 @@ generated_cc_atom( "//include/gpu:GrDirectContext_hdr", "//src/core:SkDeferredDisplayListPriv_hdr", "//src/core:SkTaskGroup_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//src/image:SkImage_Gpu_hdr", ], ) diff --git a/tools/DDLPromiseImageHelper.cpp b/tools/DDLPromiseImageHelper.cpp index 565beb79b4..e370aa7d74 100644 --- a/tools/DDLPromiseImageHelper.cpp +++ b/tools/DDLPromiseImageHelper.cpp @@ -16,7 +16,7 @@ #include "src/core/SkCachedData.h" #include "src/core/SkMipmap.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "src/image/SkImage_GpuYUVA.h" diff --git a/tools/DDLTileHelper.cpp b/tools/DDLTileHelper.cpp index c825194a2f..e04de66ad7 100644 --- a/tools/DDLTileHelper.cpp +++ b/tools/DDLTileHelper.cpp @@ -15,7 +15,7 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkDeferredDisplayListPriv.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "src/image/SkImage_Gpu.h" #include "tools/DDLPromiseImageHelper.h" diff --git a/tools/debugger/BUILD.bazel b/tools/debugger/BUILD.bazel index 2f05e87007..80cce06e5d 100644 --- a/tools/debugger/BUILD.bazel +++ b/tools/debugger/BUILD.bazel @@ -60,10 +60,10 @@ generated_cc_atom( "//include/utils:SkPaintFilterCanvas_hdr", "//src/core:SkCanvasPriv_hdr", "//src/core:SkRectPriv_hdr", - "//src/gpu:GrAuditTrail_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrSurfaceProxy_hdr", + "//src/gpu/ganesh:GrAuditTrail_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrSurfaceProxy_hdr", "//src/utils:SkJSONWriter_hdr", ], ) diff --git a/tools/debugger/DebugCanvas.cpp b/tools/debugger/DebugCanvas.cpp index 0d7463d821..fc666bfa0a 100644 --- a/tools/debugger/DebugCanvas.cpp +++ b/tools/debugger/DebugCanvas.cpp @@ -24,9 +24,9 @@ #include "include/utils/SkPaintFilterCanvas.h" #include "src/core/SkCanvasPriv.h" #include "src/core/SkRectPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrSurfaceProxy.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrSurfaceProxy.h" #include "src/utils/SkJSONWriter.h" #include "tools/debugger/DebugLayerManager.h" #include "tools/debugger/DrawCommand.h" @@ -42,7 +42,7 @@ class UrlDataManager; struct SkDrawShadowRec; #if SK_GPU_V1 -#include "src/gpu/GrAuditTrail.h" +#include "src/gpu/ganesh/GrAuditTrail.h" #endif #define SKDEBUGCANVAS_VERSION 1 diff --git a/tools/fiddle/BUILD.bazel b/tools/fiddle/BUILD.bazel index 7e0381e60c..0237380603 100644 --- a/tools/fiddle/BUILD.bazel +++ b/tools/fiddle/BUILD.bazel @@ -1273,10 +1273,10 @@ generated_cc_atom( "//src/core:SkAutoPixmapStorage_hdr", "//src/core:SkMipmap_hdr", "//src/core:SkOpts_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrRenderTarget_hdr", - "//src/gpu:GrResourceProvider_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrRenderTarget_hdr", + "//src/gpu/ganesh:GrResourceProvider_hdr", "//tools/flags:CommandLineFlags_hdr", "//tools/gpu:ManagedBackendTexture_hdr", "//tools/gpu/gl:GLTestContext_hdr", diff --git a/tools/fiddle/fiddle_main.cpp b/tools/fiddle/fiddle_main.cpp index 5870be2ef6..997c466c35 100644 --- a/tools/fiddle/fiddle_main.cpp +++ b/tools/fiddle/fiddle_main.cpp @@ -23,10 +23,10 @@ static DEFINE_double(frame, 1.0, "A double value in [0, 1] that specifies the point in animation to draw."); #include "include/gpu/GrBackendSurface.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrRenderTarget.h" -#include "src/gpu/GrResourceProvider.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrRenderTarget.h" +#include "src/gpu/ganesh/GrResourceProvider.h" #include "tools/gpu/ManagedBackendTexture.h" #include "tools/gpu/gl/GLTestContext.h" diff --git a/tools/fm/BUILD.bazel b/tools/fm/BUILD.bazel index d2b1172bf4..4fa3b8a0cf 100644 --- a/tools/fm/BUILD.bazel +++ b/tools/fm/BUILD.bazel @@ -24,8 +24,8 @@ generated_cc_atom( "//src/core:SkMD5_hdr", "//src/core:SkOSFile_hdr", "//src/core:SkTaskGroup_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", "//src/utils:SkOSPath_hdr", "//tests:TestHarness_hdr", "//tests:Test_hdr", diff --git a/tools/fm/fm.cpp b/tools/fm/fm.cpp index 58bcba94e3..ea5934f22c 100644 --- a/tools/fm/fm.cpp +++ b/tools/fm/fm.cpp @@ -16,8 +16,8 @@ #include "src/core/SkMD5.h" #include "src/core/SkOSFile.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "src/utils/SkOSPath.h" #include "tests/Test.h" #include "tests/TestHarness.h" diff --git a/tools/gpu/BUILD.bazel b/tools/gpu/BUILD.bazel index 517f00ec4c..b44db60536 100644 --- a/tools/gpu/BUILD.bazel +++ b/tools/gpu/BUILD.bazel @@ -56,8 +56,8 @@ generated_cc_atom( ":ManagedBackendTexture_hdr", "//include/core:SkSurface_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", ], ) @@ -145,8 +145,8 @@ generated_cc_atom( deps = [ ":GrContextFactory_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", "//tools/gpu/d3d:D3DTestContext_hdr", "//tools/gpu/dawn:DawnTestContext_hdr", "//tools/gpu/gl:GLTestContext_hdr", @@ -169,22 +169,22 @@ generated_cc_atom( "//include/gpu:GrRecordingContext_hdr", "//include/private:SkTo_hdr", "//src/core:SkMathPriv_hdr", - "//src/gpu:GrClip_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawOpAtlas_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpuResourceCacheAccess_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu:GrRenderTargetProxy_hdr", - "//src/gpu:GrResourceCache_hdr", - "//src/gpu:GrSemaphore_hdr", - "//src/gpu:GrTexture_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu/text:GrStrikeCache_hdr", - "//src/gpu/text:GrTextBlobRedrawCoordinator_hdr", - "//src/gpu/v1:SurfaceDrawContext_v1_hdr", + "//src/gpu/ganesh:GrClip_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawOpAtlas_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpuResourceCacheAccess_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrRenderTargetProxy_hdr", + "//src/gpu/ganesh:GrResourceCache_hdr", + "//src/gpu/ganesh:GrSemaphore_hdr", + "//src/gpu/ganesh:GrTexture_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh/text:GrStrikeCache_hdr", + "//src/gpu/ganesh/text:GrTextBlobRedrawCoordinator_hdr", + "//src/gpu/ganesh/v1:SurfaceDrawContext_v1_hdr", "//src/image:SkImage_Gpu_hdr", ], ) @@ -234,8 +234,8 @@ generated_cc_atom( "//include/utils:SkBase64_hdr", "//src/core:SkMD5_hdr", "//src/core:SkReadBuffer_hdr", - "//src/gpu:GrPersistentCacheUtils_hdr", - "//src/gpu/vk:GrVkGpu_hdr", + "//src/gpu/ganesh:GrPersistentCacheUtils_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", ], ) @@ -245,9 +245,9 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/private:GrTypesPriv_hdr", - "//src/gpu:GrImageInfo_hdr", - "//src/gpu:GrPipeline_hdr", - "//src/gpu:GrTextureProxy_hdr", + "//src/gpu/ganesh:GrImageInfo_hdr", + "//src/gpu/ganesh:GrPipeline_hdr", + "//src/gpu/ganesh:GrTextureProxy_hdr", ], ) @@ -261,16 +261,16 @@ generated_cc_atom( "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", "//include/private:GrImageContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrDrawingManager_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrImageContextPriv_hdr", - "//src/gpu:GrPixmap_hdr", - "//src/gpu:GrProgramInfo_hdr", - "//src/gpu:GrProxyProvider_hdr", - "//src/gpu:SkGr_hdr", - "//src/gpu:SurfaceContext_hdr", - "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrDrawingManager_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrImageContextPriv_hdr", + "//src/gpu/ganesh:GrPixmap_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh:GrProxyProvider_hdr", + "//src/gpu/ganesh:SkGr_hdr", + "//src/gpu/ganesh:SurfaceContext_hdr", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelper_hdr", "//src/image:SkImage_Base_hdr", ], ) @@ -309,8 +309,8 @@ generated_cc_atom( deps = [ "//include/core:SkRefCnt_hdr", "//include/gpu:GrRecordingContext_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", - "//src/gpu/ops:GrOp_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh/ops:GrOp_hdr", ], ) @@ -322,16 +322,16 @@ generated_cc_atom( ":TestOps_hdr", "//src/core:SkPointPriv_hdr", "//src/gpu:BufferWriter_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrGeometryProcessor_hdr", - "//src/gpu:GrMemoryPool_hdr", - "//src/gpu:GrOpFlushState_hdr", - "//src/gpu:GrProgramInfo_hdr", "//src/gpu:KeyBuilder_hdr", - "//src/gpu/glsl:GrGLSLFragmentShaderBuilder_hdr", - "//src/gpu/glsl:GrGLSLVarying_hdr", - "//src/gpu/glsl:GrGLSLVertexGeoBuilder_hdr", - "//src/gpu/ops:GrSimpleMeshDrawOpHelper_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrGeometryProcessor_hdr", + "//src/gpu/ganesh:GrMemoryPool_hdr", + "//src/gpu/ganesh:GrOpFlushState_hdr", + "//src/gpu/ganesh:GrProgramInfo_hdr", + "//src/gpu/ganesh/glsl:GrGLSLFragmentShaderBuilder_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVarying_hdr", + "//src/gpu/ganesh/glsl:GrGLSLVertexGeoBuilder_hdr", + "//src/gpu/ganesh/ops:GrSimpleMeshDrawOpHelper_hdr", ], ) @@ -365,7 +365,7 @@ generated_cc_atom( "//src/codec:SkCodecImageGenerator_hdr", "//src/core:SkYUVAInfoLocation_hdr", "//src/core:SkYUVMath_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrRecordingContextPriv_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrRecordingContextPriv_hdr", ], ) diff --git a/tools/gpu/BackendSurfaceFactory.cpp b/tools/gpu/BackendSurfaceFactory.cpp index 6616be1378..59fcfdf704 100644 --- a/tools/gpu/BackendSurfaceFactory.cpp +++ b/tools/gpu/BackendSurfaceFactory.cpp @@ -9,8 +9,8 @@ #include "include/core/SkSurface.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" #include "tools/gpu/ManagedBackendTexture.h" namespace sk_gpu_test { diff --git a/tools/gpu/GrContextFactory.cpp b/tools/gpu/GrContextFactory.cpp index 8702496e17..c301800f9a 100644 --- a/tools/gpu/GrContextFactory.cpp +++ b/tools/gpu/GrContextFactory.cpp @@ -7,7 +7,7 @@ */ #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "tools/gpu/GrContextFactory.h" #ifdef SK_GL #include "tools/gpu/gl/GLTestContext.h" @@ -29,7 +29,7 @@ #ifdef SK_DAWN #include "tools/gpu/dawn/DawnTestContext.h" #endif -#include "src/gpu/GrCaps.h" +#include "src/gpu/ganesh/GrCaps.h" #include "tools/gpu/mock/MockTestContext.h" #if defined(SK_BUILD_FOR_WIN) && defined(SK_ENABLE_DISCRETE_GPU) diff --git a/tools/gpu/GrTest.cpp b/tools/gpu/GrTest.cpp index dfc8f83abb..ea8aeac958 100644 --- a/tools/gpu/GrTest.cpp +++ b/tools/gpu/GrTest.cpp @@ -11,22 +11,22 @@ #include "include/gpu/GrRecordingContext.h" #include "include/private/SkTo.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrClip.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawOpAtlas.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrGpuResourceCacheAccess.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/GrRenderTargetProxy.h" -#include "src/gpu/GrResourceCache.h" -#include "src/gpu/GrSemaphore.h" -#include "src/gpu/GrTexture.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/text/GrStrikeCache.h" -#include "src/gpu/text/GrTextBlobRedrawCoordinator.h" -#include "src/gpu/v1/SurfaceDrawContext_v1.h" +#include "src/gpu/ganesh/GrClip.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawOpAtlas.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrGpuResourceCacheAccess.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrRenderTargetProxy.h" +#include "src/gpu/ganesh/GrResourceCache.h" +#include "src/gpu/ganesh/GrSemaphore.h" +#include "src/gpu/ganesh/GrTexture.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/text/GrStrikeCache.h" +#include "src/gpu/ganesh/text/GrTextBlobRedrawCoordinator.h" +#include "src/gpu/ganesh/v1/SurfaceDrawContext_v1.h" #include "src/image/SkImage_Gpu.h" #include diff --git a/tools/gpu/MemoryCache.cpp b/tools/gpu/MemoryCache.cpp index e5f83216e3..5285b5f507 100644 --- a/tools/gpu/MemoryCache.cpp +++ b/tools/gpu/MemoryCache.cpp @@ -8,11 +8,11 @@ #include "include/utils/SkBase64.h" #include "src/core/SkMD5.h" #include "src/core/SkReadBuffer.h" -#include "src/gpu/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" #include "tools/gpu/MemoryCache.h" #if defined(SK_VULKAN) -#include "src/gpu/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" #endif // Change this to 1 to log cache hits/misses/stores using SkDebugf. diff --git a/tools/gpu/ProxyUtils.cpp b/tools/gpu/ProxyUtils.cpp index 10f387a14a..bd20aee435 100644 --- a/tools/gpu/ProxyUtils.cpp +++ b/tools/gpu/ProxyUtils.cpp @@ -11,19 +11,19 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "include/private/GrImageContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrDrawingManager.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrImageContextPriv.h" -#include "src/gpu/GrPixmap.h" -#include "src/gpu/GrProgramInfo.h" -#include "src/gpu/GrProxyProvider.h" -#include "src/gpu/SkGr.h" -#include "src/gpu/SurfaceContext.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrDrawingManager.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrImageContextPriv.h" +#include "src/gpu/ganesh/GrPixmap.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/GrProxyProvider.h" +#include "src/gpu/ganesh/SkGr.h" +#include "src/gpu/ganesh/SurfaceContext.h" #include "src/image/SkImage_Base.h" #if SK_GPU_V1 -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" #endif namespace sk_gpu_test { diff --git a/tools/gpu/ProxyUtils.h b/tools/gpu/ProxyUtils.h index 41cdaec840..c215f36ce6 100644 --- a/tools/gpu/ProxyUtils.h +++ b/tools/gpu/ProxyUtils.h @@ -9,9 +9,9 @@ #define ProxyUtils_DEFINED #include "include/private/GrTypesPriv.h" -#include "src/gpu/GrImageInfo.h" -#include "src/gpu/GrPipeline.h" -#include "src/gpu/GrTextureProxy.h" +#include "src/gpu/ganesh/GrImageInfo.h" +#include "src/gpu/ganesh/GrPipeline.h" +#include "src/gpu/ganesh/GrTextureProxy.h" class GrDirectContext; class GrProgramInfo; diff --git a/tools/gpu/TestOps.cpp b/tools/gpu/TestOps.cpp index 398b3a735b..6c2183e84a 100644 --- a/tools/gpu/TestOps.cpp +++ b/tools/gpu/TestOps.cpp @@ -9,16 +9,16 @@ #include "src/core/SkPointPriv.h" #include "src/gpu/BufferWriter.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrGeometryProcessor.h" -#include "src/gpu/GrMemoryPool.h" -#include "src/gpu/GrOpFlushState.h" -#include "src/gpu/GrProgramInfo.h" #include "src/gpu/KeyBuilder.h" -#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h" -#include "src/gpu/glsl/GrGLSLVarying.h" -#include "src/gpu/glsl/GrGLSLVertexGeoBuilder.h" -#include "src/gpu/ops/GrSimpleMeshDrawOpHelper.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrGeometryProcessor.h" +#include "src/gpu/ganesh/GrMemoryPool.h" +#include "src/gpu/ganesh/GrOpFlushState.h" +#include "src/gpu/ganesh/GrProgramInfo.h" +#include "src/gpu/ganesh/glsl/GrGLSLFragmentShaderBuilder.h" +#include "src/gpu/ganesh/glsl/GrGLSLVarying.h" +#include "src/gpu/ganesh/glsl/GrGLSLVertexGeoBuilder.h" +#include "src/gpu/ganesh/ops/GrSimpleMeshDrawOpHelper.h" namespace { diff --git a/tools/gpu/TestOps.h b/tools/gpu/TestOps.h index 0f8376189d..5b7b52089a 100644 --- a/tools/gpu/TestOps.h +++ b/tools/gpu/TestOps.h @@ -10,8 +10,8 @@ #include "include/core/SkRefCnt.h" #include "include/gpu/GrRecordingContext.h" -#include "src/gpu/GrRecordingContextPriv.h" -#include "src/gpu/ops/GrOp.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/ops/GrOp.h" class GrPaint; diff --git a/tools/gpu/YUVUtils.cpp b/tools/gpu/YUVUtils.cpp index b74a9b00b3..d049575a3d 100644 --- a/tools/gpu/YUVUtils.cpp +++ b/tools/gpu/YUVUtils.cpp @@ -17,8 +17,8 @@ #include "src/codec/SkCodecImageGenerator.h" #include "src/core/SkYUVAInfoLocation.h" #include "src/core/SkYUVMath.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrRecordingContextPriv.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrRecordingContextPriv.h" #include "tools/gpu/ManagedBackendTexture.h" namespace { diff --git a/tools/gpu/gl/BUILD.bazel b/tools/gpu/gl/BUILD.bazel index 4a85813352..fbe4187bef 100644 --- a/tools/gpu/gl/BUILD.bazel +++ b/tools/gpu/gl/BUILD.bazel @@ -6,7 +6,7 @@ generated_cc_atom( visibility = ["//:__subpackages__"], deps = [ "//include/gpu/gl:GrGLInterface_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu:TestContext_hdr", ], ) @@ -18,7 +18,7 @@ generated_cc_atom( deps = [ ":GLTestContext_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu:GpuTimer_hdr", ], ) diff --git a/tools/gpu/gl/GLTestContext.cpp b/tools/gpu/gl/GLTestContext.cpp index ffada97b26..c9844f9d01 100644 --- a/tools/gpu/gl/GLTestContext.cpp +++ b/tools/gpu/gl/GLTestContext.cpp @@ -8,7 +8,7 @@ #include "tools/gpu/gl/GLTestContext.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "tools/gpu/GpuTimer.h" namespace { diff --git a/tools/gpu/gl/GLTestContext.h b/tools/gpu/gl/GLTestContext.h index 1fef420967..32344bb4ef 100644 --- a/tools/gpu/gl/GLTestContext.h +++ b/tools/gpu/gl/GLTestContext.h @@ -9,7 +9,7 @@ #define GLTestContext_DEFINED #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "tools/gpu/TestContext.h" namespace sk_gpu_test { diff --git a/tools/gpu/gl/angle/BUILD.bazel b/tools/gpu/gl/angle/BUILD.bazel index 4af49151f2..0894bd1f6f 100644 --- a/tools/gpu/gl/angle/BUILD.bazel +++ b/tools/gpu/gl/angle/BUILD.bazel @@ -17,8 +17,8 @@ generated_cc_atom( "//include/gpu/gl:GrGLAssembleInterface_hdr", "//include/gpu/gl:GrGLInterface_hdr", "//src/core:SkTraceEvent_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//src/ports:SkOSLibrary_hdr", "//third_party/externals/angle2/include/platform:Platform_hdr", ], diff --git a/tools/gpu/gl/angle/GLTestContext_angle.cpp b/tools/gpu/gl/angle/GLTestContext_angle.cpp index bbc97f2bdc..27c6acf80f 100644 --- a/tools/gpu/gl/angle/GLTestContext_angle.cpp +++ b/tools/gpu/gl/angle/GLTestContext_angle.cpp @@ -11,8 +11,8 @@ #include "include/gpu/gl/GrGLAssembleInterface.h" #include "include/gpu/gl/GrGLInterface.h" #include "src/core/SkTraceEvent.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "src/ports/SkOSLibrary.h" #include "third_party/externals/angle2/include/platform/Platform.h" diff --git a/tools/gpu/gl/egl/BUILD.bazel b/tools/gpu/gl/egl/BUILD.bazel index 68d4c3205c..864d6ce1d7 100644 --- a/tools/gpu/gl/egl/BUILD.bazel +++ b/tools/gpu/gl/egl/BUILD.bazel @@ -5,8 +5,8 @@ generated_cc_atom( srcs = ["CreatePlatformGLTestContext_egl.cpp"], visibility = ["//:__subpackages__"], deps = [ - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//tools/gpu/gl:GLTestContext_hdr", ], ) diff --git a/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp b/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp index c7ca11be11..8cd7c39deb 100644 --- a/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp +++ b/tools/gpu/gl/egl/CreatePlatformGLTestContext_egl.cpp @@ -5,8 +5,8 @@ * found in the LICENSE file. */ -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "tools/gpu/gl/GLTestContext.h" #define GL_GLEXT_PROTOTYPES diff --git a/tools/gpu/gl/interface/Makefile b/tools/gpu/gl/interface/Makefile index b7f5ced9ba..d504dfdff9 100644 --- a/tools/gpu/gl/interface/Makefile +++ b/tools/gpu/gl/interface/Makefile @@ -1,5 +1,5 @@ generate: - go run *.go --in_table "./interface.json5" --out_dir "../../../../src/gpu/gl" + go run *.go --in_table "./interface.json5" --out_dir "../../../../src/gpu/ganesh/gl" dryrun: - go run *.go --in_table "./interface.json5" --out_dir "../../../../src/gpu/gl" --dryrun \ No newline at end of file + go run *.go --in_table "./interface.json5" --out_dir "../../../../src/gpu/ganesh/gl" --dryrun diff --git a/tools/gpu/gl/interface/gen_interface.go b/tools/gpu/gl/interface/gen_interface.go index 6eb94a5605..0a4dc57f3a 100644 --- a/tools/gpu/gl/interface/gen_interface.go +++ b/tools/gpu/gl/interface/gen_interface.go @@ -21,7 +21,7 @@ import ( ) var ( - outDir = flag.String("out_dir", "../../src/gpu/gl", "Where to output the GrGlAssembleInterface_* and GrGlInterface.cpp files") + outDir = flag.String("out_dir", "../../src/gpu/ganesh/gl", "Where to output the GrGlAssembleInterface_* and GrGlInterface.cpp files") inTable = flag.String("in_table", "./interface.json5", "The JSON5 table to read in") dryRun = flag.Bool("dryrun", false, "Print the outputs, don't write to file") ) diff --git a/tools/gpu/gl/interface/templates.go b/tools/gpu/gl/interface/templates.go index a88b9a4e6a..f2d674e50b 100644 --- a/tools/gpu/gl/interface/templates.go +++ b/tools/gpu/gl/interface/templates.go @@ -17,7 +17,7 @@ const ASSEMBLE_INTERFACE_GL_ES = `/* #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #define GET_PROC(F) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F) #define GET_PROC_SUFFIX(F, S) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F #S) @@ -94,7 +94,7 @@ const ASSEMBLE_INTERFACE_GL = `/* #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #define GET_PROC(F) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F) #define GET_PROC_SUFFIX(F, S) functions->f##F = (GrGL##F##Fn*)get(ctx, "gl" #F #S) @@ -161,7 +161,7 @@ const ASSEMBLE_INTERFACE_WEBGL = `/* #include "include/gpu/gl/GrGLAssembleHelpers.h" #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #if SK_DISABLE_WEBGL_INTERFACE || !defined(SK_USE_WEBGL) sk_sp GrGLMakeAssembledWebGLInterface(void *ctx, GrGLGetProc get) { @@ -233,7 +233,7 @@ const VALIDATE_INTERFACE = `/* #include "include/gpu/gl/GrGLExtensions.h" #include "include/gpu/gl/GrGLInterface.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include diff --git a/tools/gpu/mtl/MtlTestContext.mm b/tools/gpu/mtl/MtlTestContext.mm index 4e4b12c2f5..1b4388fa83 100644 --- a/tools/gpu/mtl/MtlTestContext.mm +++ b/tools/gpu/mtl/MtlTestContext.mm @@ -10,7 +10,7 @@ #include "include/gpu/GrContextOptions.h" #include "include/gpu/GrDirectContext.h" -#include "src/gpu/mtl/GrMtlUtil.h" +#include "src/gpu/ganesh/mtl/GrMtlUtil.h" #ifdef SK_METAL diff --git a/tools/gpu/vk/BUILD.bazel b/tools/gpu/vk/BUILD.bazel index 399eda815d..c197a38360 100644 --- a/tools/gpu/vk/BUILD.bazel +++ b/tools/gpu/vk/BUILD.bazel @@ -99,8 +99,8 @@ generated_cc_atom( deps = [ ":VkYcbcrSamplerHelper_hdr", "//include/gpu:GrDirectContext_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu/vk:GrVkGpu_hdr", - "//src/gpu/vk:GrVkUtil_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh/vk:GrVkGpu_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", ], ) diff --git a/tools/gpu/vk/VkYcbcrSamplerHelper.cpp b/tools/gpu/vk/VkYcbcrSamplerHelper.cpp index 82e688c5c1..73b4bde32e 100644 --- a/tools/gpu/vk/VkYcbcrSamplerHelper.cpp +++ b/tools/gpu/vk/VkYcbcrSamplerHelper.cpp @@ -10,9 +10,9 @@ #ifdef SK_VULKAN #include "include/gpu/GrDirectContext.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/vk/GrVkGpu.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/vk/GrVkGpu.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" int VkYcbcrSamplerHelper::GetExpectedY(int x, int y, int width, int height) { return 16 + (x + y) * 219 / (width + height - 2); diff --git a/tools/sk_app/BUILD.bazel b/tools/sk_app/BUILD.bazel index 6a7c696198..b5987549d5 100644 --- a/tools/sk_app/BUILD.bazel +++ b/tools/sk_app/BUILD.bazel @@ -173,10 +173,10 @@ generated_cc_atom( "//include/gpu:GrBackendSurface_hdr", "//include/gpu:GrDirectContext_hdr", "//src/core:SkMathPriv_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu/gl:GrGLDefines_hdr", - "//src/gpu/gl:GrGLUtil_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", + "//src/gpu/ganesh/gl:GrGLUtil_hdr", "//src/image:SkImage_Base_hdr", ], ) @@ -221,7 +221,7 @@ generated_cc_atom( "//include/core:SkTypes_hdr", "//include/gpu/vk:GrVkBackendContext_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu/vk:GrVkInterface_hdr", + "//src/gpu/ganesh/vk:GrVkInterface_hdr", "//tools/gpu/vk:VkTestUtils_hdr", ], ) @@ -239,8 +239,8 @@ generated_cc_atom( "//include/gpu/vk:GrVkExtensions_hdr", "//include/gpu/vk:GrVkTypes_hdr", "//src/core:SkAutoMalloc_hdr", - "//src/gpu/vk:GrVkImage_hdr", - "//src/gpu/vk:GrVkUtil_hdr", + "//src/gpu/ganesh/vk:GrVkImage_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", ], ) diff --git a/tools/sk_app/GLWindowContext.cpp b/tools/sk_app/GLWindowContext.cpp index ba658af3cd..6540090a55 100644 --- a/tools/sk_app/GLWindowContext.cpp +++ b/tools/sk_app/GLWindowContext.cpp @@ -11,10 +11,10 @@ #include "include/gpu/GrBackendSurface.h" #include "include/gpu/GrDirectContext.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/gl/GrGLDefines.h" -#include "src/gpu/gl/GrGLUtil.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" +#include "src/gpu/ganesh/gl/GrGLUtil.h" #include "src/image/SkImage_Base.h" #include "tools/sk_app/GLWindowContext.h" diff --git a/tools/sk_app/MetalWindowContext.mm b/tools/sk_app/MetalWindowContext.mm index c464c3904a..d972e321a6 100644 --- a/tools/sk_app/MetalWindowContext.mm +++ b/tools/sk_app/MetalWindowContext.mm @@ -12,8 +12,8 @@ #include "include/gpu/mtl/GrMtlBackendContext.h" #include "include/gpu/mtl/GrMtlTypes.h" #include "src/core/SkMathPriv.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" #include "src/image/SkImage_Base.h" #include "tools/sk_app/MetalWindowContext.h" diff --git a/tools/sk_app/VulkanWindowContext.cpp b/tools/sk_app/VulkanWindowContext.cpp index 0ba31b5376..c9db528ca4 100644 --- a/tools/sk_app/VulkanWindowContext.cpp +++ b/tools/sk_app/VulkanWindowContext.cpp @@ -16,8 +16,8 @@ #include "include/gpu/vk/GrVkExtensions.h" #include "include/gpu/vk/GrVkTypes.h" -#include "src/gpu/vk/GrVkImage.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkImage.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #ifdef VK_USE_PLATFORM_WIN32_KHR // windows wants to define this as CreateSemaphoreA or CreateSemaphoreW diff --git a/tools/sk_app/VulkanWindowContext.h b/tools/sk_app/VulkanWindowContext.h index 1ba293a5dd..7e1fdd9af5 100644 --- a/tools/sk_app/VulkanWindowContext.h +++ b/tools/sk_app/VulkanWindowContext.h @@ -15,7 +15,7 @@ #include "include/gpu/vk/GrVkVulkan.h" #include "include/gpu/vk/GrVkBackendContext.h" -#include "src/gpu/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" #include "tools/gpu/vk/VkTestUtils.h" #include "tools/sk_app/WindowContext.h" diff --git a/tools/sk_app/unix/BUILD.bazel b/tools/sk_app/unix/BUILD.bazel index 7a1318d71a..a771093275 100644 --- a/tools/sk_app/unix/BUILD.bazel +++ b/tools/sk_app/unix/BUILD.bazel @@ -43,8 +43,8 @@ generated_cc_atom( deps = [ ":WindowContextFactory_unix_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu/vk:GrVkInterface_hdr", - "//src/gpu/vk:GrVkUtil_hdr", + "//src/gpu/ganesh/vk:GrVkInterface_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", "//tools/gpu/vk:VkTestUtils_hdr", "//tools/sk_app:VulkanWindowContext_hdr", ], diff --git a/tools/sk_app/unix/VulkanWindowContext_unix.cpp b/tools/sk_app/unix/VulkanWindowContext_unix.cpp index 2e328e1f24..2b31fedc19 100644 --- a/tools/sk_app/unix/VulkanWindowContext_unix.cpp +++ b/tools/sk_app/unix/VulkanWindowContext_unix.cpp @@ -8,8 +8,8 @@ #include "include/gpu/vk/GrVkVulkan.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "tools/gpu/vk/VkTestUtils.h" diff --git a/tools/sk_app/win/ANGLEWindowContext_win.cpp b/tools/sk_app/win/ANGLEWindowContext_win.cpp index 048269a057..ff9c137b5a 100644 --- a/tools/sk_app/win/ANGLEWindowContext_win.cpp +++ b/tools/sk_app/win/ANGLEWindowContext_win.cpp @@ -11,7 +11,7 @@ #include #include #include "include/gpu/gl/GrGLAssembleInterface.h" -#include "src/gpu/gl/GrGLDefines.h" +#include "src/gpu/ganesh/gl/GrGLDefines_impl.h" #include "tools/sk_app/GLWindowContext.h" #include "tools/sk_app/win/WindowContextFactory_win.h" diff --git a/tools/sk_app/win/BUILD.bazel b/tools/sk_app/win/BUILD.bazel index 473366f802..c30d196f5f 100644 --- a/tools/sk_app/win/BUILD.bazel +++ b/tools/sk_app/win/BUILD.bazel @@ -7,7 +7,7 @@ generated_cc_atom( deps = [ ":WindowContextFactory_win_hdr", "//include/gpu/gl:GrGLAssembleInterface_hdr", - "//src/gpu/gl:GrGLDefines_hdr", + "//src/gpu/ganesh/gl:GrGLDefines_impl_hdr", "//tools/sk_app:GLWindowContext_hdr", ], ) @@ -69,8 +69,8 @@ generated_cc_atom( ":WindowContextFactory_win_hdr", ":Window_win_hdr", "//include/gpu/vk:GrVkVulkan_hdr", - "//src/gpu/vk:GrVkInterface_hdr", - "//src/gpu/vk:GrVkUtil_hdr", + "//src/gpu/ganesh/vk:GrVkInterface_hdr", + "//src/gpu/ganesh/vk:GrVkUtil_hdr", "//tools/gpu/vk:VkTestUtils_hdr", "//tools/sk_app:VulkanWindowContext_hdr", ], diff --git a/tools/sk_app/win/VulkanWindowContext_win.cpp b/tools/sk_app/win/VulkanWindowContext_win.cpp index 8875888ebd..976c42556e 100644 --- a/tools/sk_app/win/VulkanWindowContext_win.cpp +++ b/tools/sk_app/win/VulkanWindowContext_win.cpp @@ -13,8 +13,8 @@ #include "tools/sk_app/VulkanWindowContext.h" #include "tools/sk_app/win/Window_win.h" -#include "src/gpu/vk/GrVkInterface.h" -#include "src/gpu/vk/GrVkUtil.h" +#include "src/gpu/ganesh/vk/GrVkInterface.h" +#include "src/gpu/ganesh/vk/GrVkUtil.h" #include "tools/gpu/vk/VkTestUtils.h" diff --git a/tools/skpbench/BUILD.bazel b/tools/skpbench/BUILD.bazel index 87ad965de1..d146f9aa0a 100644 --- a/tools/skpbench/BUILD.bazel +++ b/tools/skpbench/BUILD.bazel @@ -19,9 +19,9 @@ generated_cc_atom( "//modules/svg/include:SkSVGDOM_hdr", "//src/core:SkOSFile_hdr", "//src/core:SkTaskGroup_hdr", - "//src/gpu:GrCaps_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:SkGr_hdr", + "//src/gpu/ganesh:GrCaps_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:SkGr_hdr", "//src/utils:SkMultiPictureDocument_hdr", "//src/utils:SkOSPath_hdr", "//src/xml:SkDOM_hdr", diff --git a/tools/skpbench/skpbench.cpp b/tools/skpbench/skpbench.cpp index 27d1a8595e..8020aa4e1b 100644 --- a/tools/skpbench/skpbench.cpp +++ b/tools/skpbench/skpbench.cpp @@ -18,9 +18,9 @@ #include "include/gpu/GrDirectContext.h" #include "src/core/SkOSFile.h" #include "src/core/SkTaskGroup.h" -#include "src/gpu/GrCaps.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/SkGr.h" +#include "src/gpu/ganesh/GrCaps.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/SkGr.h" #include "src/utils/SkMultiPictureDocument.h" #include "src/utils/SkOSPath.h" #include "tools/DDLPromiseImageHelper.h" diff --git a/tools/viewer/BUILD.bazel b/tools/viewer/BUILD.bazel index 354b9f7cea..b9afaf3c22 100644 --- a/tools/viewer/BUILD.bazel +++ b/tools/viewer/BUILD.bazel @@ -446,11 +446,11 @@ generated_cc_atom( "//src/core:SkTaskGroup_hdr", "//src/core:SkTextBlobPriv_hdr", "//src/core:SkVMBlitter_hdr", - "//src/gpu:GrDirectContextPriv_hdr", - "//src/gpu:GrGpu_hdr", - "//src/gpu:GrPersistentCacheUtils_hdr", - "//src/gpu/ops:AtlasPathRenderer_hdr", - "//src/gpu/ops:TessellationPathRenderer_hdr", + "//src/gpu/ganesh:GrDirectContextPriv_hdr", + "//src/gpu/ganesh:GrGpu_hdr", + "//src/gpu/ganesh:GrPersistentCacheUtils_hdr", + "//src/gpu/ganesh/ops:AtlasPathRenderer_hdr", + "//src/gpu/ganesh/ops:TessellationPathRenderer_hdr", "//src/image:SkImage_Base_hdr", "//src/sksl:SkSLCompiler_hdr", "//src/utils:SkJSONWriter_hdr", diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index fc129e9734..e03420f10f 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -31,9 +31,9 @@ #include "src/core/SkTaskGroup.h" #include "src/core/SkTextBlobPriv.h" #include "src/core/SkVMBlitter.h" -#include "src/gpu/GrDirectContextPriv.h" -#include "src/gpu/GrGpu.h" -#include "src/gpu/GrPersistentCacheUtils.h" +#include "src/gpu/ganesh/GrDirectContextPriv.h" +#include "src/gpu/ganesh/GrGpu.h" +#include "src/gpu/ganesh/GrPersistentCacheUtils.h" #include "src/image/SkImage_Base.h" #include "src/sksl/SkSLCompiler.h" #include "src/utils/SkJSONWriter.h" @@ -58,8 +58,8 @@ #include "tools/viewer/SvgSlide.h" #if SK_GPU_V1 -#include "src/gpu/ops/AtlasPathRenderer.h" -#include "src/gpu/ops/TessellationPathRenderer.h" +#include "src/gpu/ganesh/ops/AtlasPathRenderer.h" +#include "src/gpu/ganesh/ops/TessellationPathRenderer.h" #endif #include