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>
71 lines
2.4 KiB
C++
71 lines
2.4 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.
|
|
*/
|
|
|
|
#include "gm/gm.h"
|
|
#include "include/effects/SkRuntimeEffect.h"
|
|
#include "include/sksl/DSL.h"
|
|
#include "src/core/SkCanvasPriv.h"
|
|
#include "src/gpu/SurfaceFillContext.h"
|
|
#include "src/gpu/glsl/GrGLSLFragmentShaderBuilder.h"
|
|
#include "src/sksl/dsl/priv/DSLFPs.h"
|
|
#include "src/sksl/dsl/priv/DSLWriter.h"
|
|
#include "src/sksl/ir/SkSLVariable.h"
|
|
|
|
class SimpleDSLEffect : public GrFragmentProcessor {
|
|
public:
|
|
static constexpr GrProcessor::ClassID CLASS_ID = (GrProcessor::ClassID) 100;
|
|
|
|
SimpleDSLEffect() : GrFragmentProcessor(CLASS_ID, kNone_OptimizationFlags) {
|
|
}
|
|
|
|
const char* name() const override { return "DSLEffect"; }
|
|
void onAddToKey(const GrShaderCaps&, skgpu::KeyBuilder*) const override {}
|
|
bool onIsEqual(const GrFragmentProcessor& that) const override { return this == &that; }
|
|
std::unique_ptr<GrFragmentProcessor> clone() const override { return nullptr; }
|
|
|
|
std::unique_ptr<ProgramImpl> onMakeProgramImpl() const override {
|
|
class Impl : public ProgramImpl {
|
|
public:
|
|
void emitCode(EmitArgs& args) override {
|
|
using namespace SkSL::dsl;
|
|
StartFragmentProcessor(this, &args);
|
|
|
|
// Test for skbug.com/11384
|
|
Var x(kInt_Type, 1);
|
|
Declare(x);
|
|
SkASSERT(DSLWriter::Var(x)->initialValue()->description() == "1");
|
|
|
|
GlobalVar blueAlpha(kUniform_Modifier, kHalf2_Type, "blueAlpha");
|
|
Declare(blueAlpha);
|
|
fBlueAlphaUniform = VarUniformHandle(blueAlpha);
|
|
Var coords(kFloat4_Type, sk_FragCoord());
|
|
Declare(coords);
|
|
Return(Half4(Swizzle(coords, X, Y) / 100, blueAlpha));
|
|
EndFragmentProcessor();
|
|
}
|
|
|
|
private:
|
|
void onSetData(const GrGLSLProgramDataManager& pdman,
|
|
const GrFragmentProcessor& effect) override {
|
|
pdman.set2f(fBlueAlphaUniform, 0.0, 1.0);
|
|
}
|
|
|
|
GrGLSLProgramDataManager::UniformHandle fBlueAlphaUniform;
|
|
};
|
|
return std::make_unique<Impl>();
|
|
}
|
|
};
|
|
|
|
DEF_SIMPLE_GPU_GM(simple_dsl_test, rContext, canvas, 100, 100) {
|
|
auto sfc = SkCanvasPriv::TopDeviceSurfaceFillContext(canvas);
|
|
if (!sfc) {
|
|
return;
|
|
}
|
|
|
|
sfc->fillWithFP(std::make_unique<SimpleDSLEffect>());
|
|
}
|