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

[bazel] Update files and fix circular dependency

Browse Source 
//:skia_core
    //src/effects:srcs
    //src/effects/imagefilters:SkBlurImageFilter_src
    //src/gpu/v1:SurfaceDrawContext_v1_hdr
    //src/core:SkGlyphRunPainter_hdr
    //src/core:SkGlyphBuffer_hdr
.-> //src/core:SkGlyph_hdr
|   //src/core:SkStrikeForGPU_hdr
`-- //src/core:SkGlyph_hdr

This was found by running the following commands:
  cd bazel
  make generate
  make known_good_builds

Change-Id: I24e33124c4bb5217ac87a0ad2ab3dd8a590c53c3
Bug: skia:12541
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/493376
Reviewed-by: Herb Derby <herb@google.com>
This commit is contained in:
Kevin Lubick 2022-01-11 08:20:36 -05:00
parent 7a14f783bd
commit e3b935b0bf
5 changed files with 3 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/BUILD.bazel
View File

@ -2196,6 +2196,7 @@ generated_cc_atom(
deps = [
":SkMask_hdr",
":SkMathPriv_hdr",
":SkStrikeForGPU_hdr",
"//include/core:SkPath_hdr",
"//include/core:SkTypes_hdr",
"//include/private:SkChecksum_hdr",
@ -4657,7 +4658,6 @@ generated_cc_atom(
hdrs = ["SkStrikeForGPU.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkGlyph_hdr",
"//include/core:SkPaint_hdr",
"//include/core:SkPoint_hdr",
"//include/core:SkSpan_hdr",

1
src/core/SkStrikeForGPU.h
View File

@ -12,7 +12,6 @@
#include "include/core/SkPoint.h"
#include "include/core/SkSpan.h"
#include "include/core/SkTypes.h"
#include "src/core/SkGlyph.h"
#include <memory>

1
src/gpu/BUILD.bazel
View File

@ -151,7 +151,6 @@ cc_library(
"//src/gpu/ops:DrawAtlasOp_src",
"//src/gpu/ops:DrawAtlasPathOp_src",
"//src/gpu/ops:DrawCustomMeshOp_src",
"//src/gpu/ops:DrawVerticesOp_src",
"//src/gpu/ops:DrawableOp_src",
"//src/gpu/ops:FillRRectOp_src",
"//src/gpu/ops:FillRectOp_src",

40
src/gpu/ops/BUILD.bazel
View File

@ -442,43 +442,6 @@ generated_cc_atom(
],
)
generated_cc_atom(
name = "DrawVerticesOp_hdr",
hdrs = ["DrawVerticesOp.h"],
visibility = ["//:__subpackages__"],
deps = [
":GrOp_hdr",
"//include/core:SkRefCnt_hdr",
"//include/private:GrTypesPriv_hdr",
],
)
generated_cc_atom(
name = "DrawVerticesOp_src",
srcs = ["DrawVerticesOp.cpp"],
visibility = ["//:__subpackages__"],
deps = [
":DrawVerticesOp_hdr",
":GrSimpleMeshDrawOpHelper_hdr",
"//include/core:SkM44_hdr",
"//src/core:SkArenaAlloc_hdr",
"//src/core:SkDevice_hdr",
"//src/core:SkMatrixPriv_hdr",
"//src/core:SkVerticesPriv_hdr",
"//src/gpu:BufferWriter_hdr",
"//src/gpu:GrDrawOpTest_hdr",
"//src/gpu:GrGeometryProcessor_hdr",
"//src/gpu:GrOpFlushState_hdr",
"//src/gpu:GrProgramInfo_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/glsl:GrGLSLVertexGeoBuilder_hdr",
],
)
generated_cc_atom(
name = "DrawableOp_hdr",
hdrs = ["DrawableOp.h"],
@ -1354,11 +1317,12 @@ generated_cc_atom(
srcs = ["DrawCustomMeshOp.cpp"],
visibility = ["//:__subpackages__"],
deps = [
":DrawVerticesOp_hdr",
":DrawCustomMeshOp_hdr",
":GrSimpleMeshDrawOpHelper_hdr",
"//include/core:SkCustomMesh_hdr",
"//src/core:SkArenaAlloc_hdr",
"//src/core:SkCustomMeshPriv_hdr",
"//src/core:SkVerticesPriv_hdr",
"//src/gpu:BufferWriter_hdr",
"//src/gpu:GrGeometryProcessor_hdr",
"//src/gpu:GrOpFlushState_hdr",

1
src/gpu/v1/BUILD.bazel
View File

@ -304,7 +304,6 @@ generated_cc_atom(
"//src/gpu/ops:ClearOp_hdr",
"//src/gpu/ops:DrawAtlasOp_hdr",
"//src/gpu/ops:DrawCustomMeshOp_hdr",
"//src/gpu/ops:DrawVerticesOp_hdr",
"//src/gpu/ops:DrawableOp_hdr",
"//src/gpu/ops:FillRRectOp_hdr",
"//src/gpu/ops:FillRectOp_hdr",