08ece0c9a0
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>
35 lines
888 B
C++
35 lines
888 B
C++
/*
|
|
* Copyright 2021 Google LLC.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "include/sksl/DSL.h"
|
|
#include "include/sksl/DSLBlock.h"
|
|
|
|
#include "tests/Test.h"
|
|
|
|
#include <utility>
|
|
|
|
namespace sk_gpu_test { class ContextInfo; }
|
|
|
|
// This file verifies that DSL code compiles with only a DSL.h import. We don't bother with any
|
|
// 'real' tests here, as those are all in SkSLDSLTest.cpp.
|
|
|
|
using namespace SkSL::dsl;
|
|
|
|
// Defined in SkSLDSLTest.cpp (so that we don't have to put the required extra includes here)
|
|
void StartDSL(const sk_gpu_test::ContextInfo ctxInfo);
|
|
|
|
DEF_GPUTEST_FOR_MOCK_CONTEXT(DSLImportOnly, r, ctxInfo) {
|
|
StartDSL(ctxInfo);
|
|
Parameter x(kInt_Type);
|
|
Function(kInt_Type, "test", x).define(
|
|
If(x >= 0,
|
|
Block(Return(x)),
|
|
Block(Return(-x)))
|
|
);
|
|
End();
|
|
}
|