AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3f5184cfa6
skia2/include/private/BUILD.bazel
Kevin Lubick 08ece0c9a0 [includes] Enforce IWYU on sksl code 
PS1 regenerates the Bazel files. Use it as the base change when
    comparing patchsets.

IWYU seems to do a good job of working with MyFile.cpp and
MyFile.h, but if there is just a MyHeader.h, it doesn't always
seem to throw errors if the includes aren't correct. This was
observed with include/sksl/DSL.h This might be due to the fact
that headers are not compiled on their own, so they are never
sent directly to the IWYU binary.

This change sets enforce_iwyu_on_package() on the all sksl
packages and then fixes the includes until all those checks
are happy. There were a few files that needed fixes outside
of the sksl folder. Examples include:
 - src/gpu/effects/GrConvexPolyEffect.cpp
 - tests/SkSLDSLTest.cpp

To really enforce this, we need to add a CI/CQ job that runs
bazel build //example:hello_world_gl --config=clang \
  --sandbox_base=/dev/shm --features skia_enforce_iwyu

If that failed, a dev could make the changes described in
the logs and/or run the command locally to see those
prescribed fixes.

I had to add several entries to toolchain/IWYU_mapping.imp
in order to fix some private includes and other atypical
choices. I tried adding a rule there to allow inclusion of
SkTypes.h to make sure defines like SK_SUPPORT_GPU, but
could not get it to work for all cases, so I deferred to
using the IWYU pragma: keep (e.g. SkSLPipelineStageCodeGenerator.h)

Change-Id: I4c3e536d8e69ff7ff2d26fe61a525a6c2e80db06
Bug: skia:13052
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/522256
Reviewed-by: John Stiles <johnstiles@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
2022-03-21 12:43:02 +00:00

555 lines
12 KiB
Python
Raw Blame History

load("//bazel:macros.bzl", "generated_cc_atom")
generated_cc_atom(
name = "GrContext_Base_hdr",
hdrs = ["GrContext_Base.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrBackendSurface_hdr",
"//include/gpu:GrContextOptions_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrD3DTypesMinimal_hdr",
hdrs = ["GrD3DTypesMinimal.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrDawnTypesPriv_hdr",
hdrs = ["GrDawnTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/gpu/dawn:GrDawnTypes_hdr"],
)
generated_cc_atom(
name = "GrGLTypesPriv_hdr",
hdrs = ["GrGLTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu/gl:GrGLTypes_hdr",
],
)
generated_cc_atom(
name = "GrImageContext_hdr",
hdrs = ["GrImageContext.h"],
visibility = ["//:__subpackages__"],
deps = [
":GrContext_Base_hdr",
":SingleOwner_hdr",
],
)
generated_cc_atom(
name = "GrMockTypesPriv_hdr",
hdrs = ["GrMockTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/gpu/mock:GrMockTypes_hdr"],
)
generated_cc_atom(
name = "GrMtlTypesPriv_hdr",
hdrs = ["GrMtlTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/gpu:GrTypes_hdr",
"//include/gpu/mtl:GrMtlTypes_hdr",
],
)
generated_cc_atom(
name = "GrTypesPriv_hdr",
hdrs = ["GrTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkImageInfoPriv_hdr",
":SkMacros_hdr",
"//include/core:SkImageInfo_hdr",
"//include/core:SkImage_hdr",
"//include/core:SkPath_hdr",
"//include/core:SkRefCnt_hdr",
"//include/gpu:GrTypes_hdr",
],
)
generated_cc_atom(
name = "GrVkTypesPriv_hdr",
hdrs = ["GrVkTypesPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkRefCnt_hdr",
"//include/gpu/vk:GrVkTypes_hdr",
],
)
generated_cc_atom(
name = "SkBitmaskEnum_hdr",
hdrs = ["SkBitmaskEnum.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkChecksum_hdr",
hdrs = ["SkChecksum.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkNoncopyable_hdr",
":SkOpts_spi_hdr",
":SkTLogic_hdr",
"//include/core:SkString_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkColorData_hdr",
hdrs = ["SkColorData.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkNx_hdr",
":SkTo_hdr",
"//include/core:SkColorPriv_hdr",
"//include/core:SkColor_hdr",
],
)
generated_cc_atom(
name = "SkDeque_hdr",
hdrs = ["SkDeque.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkEncodedInfo_hdr",
hdrs = ["SkEncodedInfo.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkData_hdr",
"//include/core:SkImageInfo_hdr",
"//include/third_party/skcms:skcms_hdr",
],
)
generated_cc_atom(
name = "SkFixed_hdr",
hdrs = ["SkFixed.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSafe_math_hdr",
":SkTPin_hdr",
":SkTo_hdr",
"//include/core:SkScalar_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkFloatBits_hdr",
hdrs = ["SkFloatBits.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSafe_math_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkFloatingPoint_hdr",
hdrs = ["SkFloatingPoint.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkFloatBits_hdr",
":SkSafe_math_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkHalf_hdr",
hdrs = ["SkHalf.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkNx_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkIDChangeListener_hdr",
hdrs = ["SkIDChangeListener.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkMutex_hdr",
":SkTDArray_hdr",
"//include/core:SkRefCnt_hdr",
],
)
generated_cc_atom(
name = "SkImageInfoPriv_hdr",
hdrs = ["SkImageInfoPriv.h"],
visibility = ["//:__subpackages__"],
deps = [
"//include/core:SkColor_hdr",
"//include/core:SkImageInfo_hdr",
],
)
generated_cc_atom(
name = "SkMacros_hdr",
hdrs = ["SkMacros.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkMalloc_hdr",
hdrs = ["SkMalloc.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkMutex_hdr",
hdrs = ["SkMutex.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkMacros_hdr",
":SkSemaphore_hdr",
":SkThreadAnnotations_hdr",
":SkThreadID_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkNoncopyable_hdr",
hdrs = ["SkNoncopyable.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkNx_hdr",
hdrs = ["SkNx.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkNx_neon_hdr",
":SkNx_sse_hdr",
":SkSafe_math_hdr",
"//include/core:SkScalar_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkNx_neon_hdr",
hdrs = ["SkNx_neon.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkNx_sse_hdr",
hdrs = ["SkNx_sse.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkOnce_hdr",
hdrs = ["SkOnce.h"],
visibility = ["//:__subpackages__"],
deps = [":SkThreadAnnotations_hdr"],
)
generated_cc_atom(
name = "SkOpts_spi_hdr",
hdrs = ["SkOpts_spi.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkPathRef_hdr",
hdrs = ["SkPathRef.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkIDChangeListener_hdr",
":SkMutex_hdr",
":SkTDArray_hdr",
":SkTemplates_hdr",
":SkTo_hdr",
"//include/core:SkMatrix_hdr",
"//include/core:SkPoint_hdr",
"//include/core:SkRect_hdr",
"//include/core:SkRefCnt_hdr",
],
)
generated_cc_atom(
name = "SkSLDefines_hdr",
hdrs = ["SkSLDefines.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkTArray_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkSLIRNode_hdr",
hdrs = ["SkSLIRNode.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSLString_hdr",
":SkTArray_hdr",
"//include/sksl:SkSLPosition_hdr",
"//src/sksl:SkSLLexer_hdr",
"//src/sksl:SkSLModifiersPool_hdr",
"//src/sksl:SkSLPool_hdr",
],
)
generated_cc_atom(
name = "SkSLLayout_hdr",
hdrs = ["SkSLLayout.h"],
visibility = ["//:__subpackages__"],
deps = [":SkSLString_hdr"],
)
generated_cc_atom(
name = "SkSLModifiers_hdr",
hdrs = ["SkSLModifiers.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSLLayout_hdr",
"//include/sksl:SkSLPosition_hdr",
],
)
generated_cc_atom(
name = "SkSLProgramElement_hdr",
hdrs = ["SkSLProgramElement.h"],
visibility = ["//:__subpackages__"],
deps = [":SkSLIRNode_hdr"],
)
generated_cc_atom(
name = "SkSLProgramKind_hdr",
hdrs = ["SkSLProgramKind.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkSLSampleUsage_hdr",
hdrs = ["SkSLSampleUsage.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkSLStatement_hdr",
hdrs = ["SkSLStatement.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSLIRNode_hdr",
":SkSLSymbol_hdr",
],
)
generated_cc_atom(
name = "SkSLString_hdr",
hdrs = ["SkSLString.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSLDefines_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkSLSymbol_hdr",
hdrs = ["SkSLSymbol.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkSLIRNode_hdr",
":SkSLProgramElement_hdr",
],
)
generated_cc_atom(
name = "SkSafe32_hdr",
hdrs = ["SkSafe32.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkSafe_math_hdr",
hdrs = ["SkSafe_math.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkSemaphore_hdr",
hdrs = ["SkSemaphore.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkOnce_hdr",
":SkThreadAnnotations_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkShadowFlags_hdr",
hdrs = ["SkShadowFlags.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkSpinlock_hdr",
hdrs = ["SkSpinlock.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkThreadAnnotations_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkTArray_hdr",
hdrs = ["SkTArray.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkMalloc_hdr",
":SkSafe32_hdr",
":SkTLogic_hdr",
":SkTemplates_hdr",
":SkTo_hdr",
"//include/core:SkMath_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkTDArray_hdr",
hdrs = ["SkTDArray.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkMalloc_hdr",
":SkTo_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkTFitsIn_hdr",
hdrs = ["SkTFitsIn.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkTHash_hdr",
hdrs = ["SkTHash.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkChecksum_hdr",
":SkTemplates_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkTLogic_hdr",
hdrs = ["SkTLogic.h"],
visibility = ["//:__subpackages__"],
deps = [":SkTo_hdr"],
)
generated_cc_atom(
name = "SkTPin_hdr",
hdrs = ["SkTPin.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkTemplates_hdr",
hdrs = ["SkTemplates.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkMalloc_hdr",
":SkTLogic_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkThreadAnnotations_hdr",
hdrs = ["SkThreadAnnotations.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkThreadID_hdr",
hdrs = ["SkThreadID.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SkTo_hdr",
hdrs = ["SkTo.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkTFitsIn_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkVx_hdr",
hdrs = ["SkVx.h"],
visibility = ["//:__subpackages__"],
)
generated_cc_atom(
name = "SkWeakRefCnt_hdr",
hdrs = ["SkWeakRefCnt.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkRefCnt_hdr"],
)
generated_cc_atom(
name = "SkUniquePaintParamsID_hdr",
hdrs = ["SkUniquePaintParamsID.h"],
visibility = ["//:__subpackages__"],
deps = ["//include/core:SkTypes_hdr"],
)
generated_cc_atom(
name = "SingleOwner_hdr",
hdrs = ["SingleOwner.h"],
visibility = ["//:__subpackages__"],
deps = [
":SkMutex_hdr",
":SkThreadID_hdr",
"//include/core:SkTypes_hdr",
],
)
generated_cc_atom(
name = "SkStringView_hdr",
hdrs = ["SkStringView.h"],
visibility = ["//:__subpackages__"],
)
Reference in New Issue View Git Blame Copy Permalink