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>
93 lines
3.0 KiB
C++
93 lines
3.0 KiB
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.
|
|
*/
|
|
|
|
#ifndef SKSL_DSL_LAYOUT
|
|
#define SKSL_DSL_LAYOUT
|
|
|
|
#include "include/private/SkSLLayout.h"
|
|
#include "include/sksl/SkSLPosition.h"
|
|
|
|
namespace SkSL {
|
|
|
|
namespace dsl {
|
|
|
|
class DSLLayout {
|
|
public:
|
|
DSLLayout() {}
|
|
|
|
DSLLayout& originUpperLeft(Position pos = Position::Capture()) {
|
|
return this->flag(SkSL::Layout::kOriginUpperLeft_Flag, "origin_upper_left", pos);
|
|
}
|
|
|
|
DSLLayout& pushConstant(Position pos = Position::Capture()) {
|
|
return this->flag(SkSL::Layout::kPushConstant_Flag, "push_constant", pos);
|
|
}
|
|
|
|
DSLLayout& blendSupportAllEquations(Position pos = Position::Capture()) {
|
|
return this->flag(SkSL::Layout::kBlendSupportAllEquations_Flag,
|
|
"blend_support_all_equations", pos);
|
|
}
|
|
|
|
DSLLayout& color(Position pos = Position::Capture()) {
|
|
return this->flag(SkSL::Layout::kColor_Flag, "color", pos);
|
|
}
|
|
|
|
DSLLayout& location(int location, Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fLocation, location, SkSL::Layout::kLocation_Flag,
|
|
"location", pos);
|
|
}
|
|
|
|
DSLLayout& offset(int offset, Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fOffset, offset, SkSL::Layout::kOffset_Flag, "offset",
|
|
pos);
|
|
}
|
|
|
|
DSLLayout& binding(int binding, Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fBinding, binding, SkSL::Layout::kBinding_Flag,
|
|
"binding", pos);
|
|
}
|
|
|
|
DSLLayout& index(int index, Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fIndex, index, SkSL::Layout::kIndex_Flag, "index", pos);
|
|
}
|
|
|
|
DSLLayout& set(int set, Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fSet, set, SkSL::Layout::kSet_Flag, "set", pos);
|
|
}
|
|
|
|
DSLLayout& builtin(int builtin, Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fBuiltin, builtin, SkSL::Layout::kBuiltin_Flag,
|
|
"builtin", pos);
|
|
}
|
|
|
|
DSLLayout& inputAttachmentIndex(int inputAttachmentIndex,
|
|
Position pos = Position::Capture()) {
|
|
return this->intValue(&fSkSLLayout.fInputAttachmentIndex, inputAttachmentIndex,
|
|
SkSL::Layout::kInputAttachmentIndex_Flag, "input_attachment_index",
|
|
pos);
|
|
}
|
|
|
|
private:
|
|
explicit DSLLayout(SkSL::Layout skslLayout)
|
|
: fSkSLLayout(skslLayout) {}
|
|
|
|
DSLLayout& flag(SkSL::Layout::Flag mask, const char* name, Position pos);
|
|
|
|
DSLLayout& intValue(int* target, int value, SkSL::Layout::Flag flag, const char* name,
|
|
Position pos);
|
|
|
|
SkSL::Layout fSkSLLayout;
|
|
|
|
friend class DSLModifiers;
|
|
};
|
|
|
|
} // namespace dsl
|
|
|
|
} // namespace SkSL
|
|
|
|
#endif
|