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>
69 lines
1.5 KiB
C++
69 lines
1.5 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_BLOCK
|
|
#define SKSL_DSL_BLOCK
|
|
|
|
#include "include/private/SkSLDefines.h"
|
|
#include "include/private/SkTArray.h"
|
|
#include "include/sksl/DSLStatement.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
namespace SkSL {
|
|
|
|
class Block;
|
|
class SymbolTable;
|
|
|
|
namespace dsl {
|
|
|
|
class DSLBlock {
|
|
public:
|
|
template<class... Statements>
|
|
DSLBlock(Statements... statements) {
|
|
fStatements.reserve_back(sizeof...(statements));
|
|
// in C++17, we could just do:
|
|
// (fStatements.push_back(DSLStatement(statements.release()).release()), ...);
|
|
int unused[] =
|
|
{0,
|
|
(static_cast<void>(fStatements.push_back(DSLStatement(statements.release()).release())),
|
|
0)...};
|
|
static_cast<void>(unused);
|
|
}
|
|
|
|
DSLBlock(DSLBlock&& other) = default;
|
|
|
|
DSLBlock(SkSL::StatementArray statements, std::shared_ptr<SymbolTable> symbols = nullptr);
|
|
|
|
DSLBlock(SkTArray<DSLStatement> statements, std::shared_ptr<SymbolTable> symbols = nullptr);
|
|
|
|
~DSLBlock();
|
|
|
|
DSLBlock& operator=(DSLBlock&& other) {
|
|
fStatements = std::move(other.fStatements);
|
|
return *this;
|
|
}
|
|
|
|
void append(DSLStatement stmt);
|
|
|
|
std::unique_ptr<SkSL::Block> release();
|
|
|
|
private:
|
|
SkSL::StatementArray fStatements;
|
|
std::shared_ptr<SkSL::SymbolTable> fSymbols;
|
|
|
|
friend class DSLStatement;
|
|
friend class DSLFunction;
|
|
};
|
|
|
|
} // namespace dsl
|
|
|
|
} // namespace SkSL
|
|
|
|
#endif
|