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>
108 lines
2.5 KiB
C++
108 lines
2.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_STATEMENT
|
|
#define SKSL_DSL_STATEMENT
|
|
|
|
#include "include/core/SkTypes.h"
|
|
#include "include/private/SkSLStatement.h"
|
|
#include "include/sksl/SkSLPosition.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
namespace SkSL {
|
|
|
|
class Expression;
|
|
|
|
namespace dsl {
|
|
|
|
class DSLBlock;
|
|
class DSLExpression;
|
|
class DSLPossibleExpression;
|
|
class DSLPossibleStatement;
|
|
|
|
class DSLStatement {
|
|
public:
|
|
DSLStatement();
|
|
|
|
DSLStatement(DSLExpression expr);
|
|
|
|
DSLStatement(DSLPossibleExpression expr, Position pos = Position::Capture());
|
|
|
|
DSLStatement(DSLPossibleStatement stmt, Position pos = Position::Capture());
|
|
|
|
DSLStatement(DSLBlock block);
|
|
|
|
DSLStatement(DSLStatement&&) = default;
|
|
|
|
DSLStatement(std::unique_ptr<SkSL::Statement> stmt);
|
|
|
|
DSLStatement(std::unique_ptr<SkSL::Expression> expr);
|
|
|
|
~DSLStatement();
|
|
|
|
DSLStatement& operator=(DSLStatement&& other) = default;
|
|
|
|
bool hasValue() { return fStatement != nullptr; }
|
|
|
|
std::unique_ptr<SkSL::Statement> release() {
|
|
SkASSERT(this->hasValue());
|
|
return std::move(fStatement);
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<SkSL::Statement> releaseIfPossible() {
|
|
return std::move(fStatement);
|
|
}
|
|
|
|
std::unique_ptr<SkSL::Statement> fStatement;
|
|
|
|
friend class DSLBlock;
|
|
friend class DSLCore;
|
|
friend class DSLExpression;
|
|
friend class DSLPossibleStatement;
|
|
friend class DSLWriter;
|
|
friend DSLStatement operator,(DSLStatement left, DSLStatement right);
|
|
};
|
|
|
|
/**
|
|
* Represents a Statement which may have failed and/or have pending errors to report. Converting a
|
|
* PossibleStatement into a Statement requires a Position so that any pending errors can be
|
|
* reported at the correct position.
|
|
*
|
|
* PossibleStatement is used instead of Statement in situations where it is not possible to capture
|
|
* the Position at the time of Statement construction.
|
|
*/
|
|
class DSLPossibleStatement {
|
|
public:
|
|
DSLPossibleStatement(std::unique_ptr<SkSL::Statement> stmt);
|
|
|
|
DSLPossibleStatement(DSLPossibleStatement&& other) = default;
|
|
|
|
~DSLPossibleStatement();
|
|
|
|
bool hasValue() { return fStatement != nullptr; }
|
|
|
|
std::unique_ptr<SkSL::Statement> release() {
|
|
return DSLStatement(std::move(*this)).release();
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<SkSL::Statement> fStatement;
|
|
|
|
friend class DSLStatement;
|
|
};
|
|
|
|
DSLStatement operator,(DSLStatement left, DSLStatement right);
|
|
|
|
} // namespace dsl
|
|
|
|
} // namespace SkSL
|
|
|
|
#endif
|