AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
e3ad527e3f
skia2/tools/viewer/SkSLSlide.h

41 lines
949 B
C
Raw Normal View History

Runtime SkSL: Reflect inputs in SkRuntimeEffect Adds a new structure to describe the inputs, including type, shape, name, etc. This removes any references to the type variables in the compiler's context, and centralizes the logic for parsing those type variables. Also normalizes the rules for what types are supported. (This was inconsistent among the various functions before). Now: - bool and int must be 'in' - float may be 'in' or 'uniform' - float[2-4] and matrices must be 'uniform' Includes a new Slide that allows for interactive editing of a runtime shader. Change-Id: Ic2af68a80c8bb645ba96417c430da24de0a9c2d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260497 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 16:23:12 +00:00
/*
* Copyright 2019 Google LLC
*
* Use of this source code is governed by a BSD-style license that can be
* found in the LICENSE file.
*/
#ifndef SkSLSlide_DEFINED
#define SkSLSlide_DEFINED
#include "tools/viewer/Slide.h"
Move SkRuntimeEffect.h to include/effects Change-Id: I0b11d4210c6e663cfb4854fc33e1396fd79fe9a4 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/261780 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-01-02 16:55:24 +00:00
#include "include/effects/SkRuntimeEffect.h"
Runtime SkSL: Reflect inputs in SkRuntimeEffect Adds a new structure to describe the inputs, including type, shape, name, etc. This removes any references to the type variables in the compiler's context, and centralizes the logic for parsing those type variables. Also normalizes the rules for what types are supported. (This was inconsistent among the various functions before). Now: - bool and int must be 'in' - float may be 'in' or 'uniform' - float[2-4] and matrices must be 'uniform' Includes a new Slide that allows for interactive editing of a runtime shader. Change-Id: Ic2af68a80c8bb645ba96417c430da24de0a9c2d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260497 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 16:23:12 +00:00
class SkSLSlide : public Slide {
public:
SkSLSlide();
// TODO: We need a way for primarily interactive slides to always be as large as the window
SkISize getDimensions() const override { return SkISize::MakeEmpty(); }
void draw(SkCanvas* canvas) override;
Runtime SkSL: API sketch for child shaders/effects Only works on GPU backend for now, and still only supports single-argument sample (at original coords). Change-Id: I4c36ebd0c370ca65126786802c5ea268c3f32edd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260899 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 20:44:27 +00:00
void load(SkScalar winWidth, SkScalar winHeight) override;
void unload() override;
Runtime SkSL: Reflect inputs in SkRuntimeEffect Adds a new structure to describe the inputs, including type, shape, name, etc. This removes any references to the type variables in the compiler's context, and centralizes the logic for parsing those type variables. Also normalizes the rules for what types are supported. (This was inconsistent among the various functions before). Now: - bool and int must be 'in' - float may be 'in' or 'uniform' - float[2-4] and matrices must be 'uniform' Includes a new Slide that allows for interactive editing of a runtime shader. Change-Id: Ic2af68a80c8bb645ba96417c430da24de0a9c2d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260497 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 16:23:12 +00:00
private:
In SkSLSlide, directly use Viewer's shader error handler With the CPU backend, there is no GrContext on the canvas, so we were sending errors to the default handler (SkDebugf + assert), so editing shaders was impossible. Now they fail gracefully (and produce a popup window with the message). Change-Id: I29bad24f201be59ba1cec45f446a433c01cf86dc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297461 Reviewed-by: Mike Klein <mtklein@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-06-18 18:18:27 +00:00
bool rebuild();
Runtime SkSL: API sketch for child shaders/effects Only works on GPU backend for now, and still only supports single-argument sample (at original coords). Change-Id: I4c36ebd0c370ca65126786802c5ea268c3f32edd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260899 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 20:44:27 +00:00
Runtime SkSL: Reflect inputs in SkRuntimeEffect Adds a new structure to describe the inputs, including type, shape, name, etc. This removes any references to the type variables in the compiler's context, and centralizes the logic for parsing those type variables. Also normalizes the rules for what types are supported. (This was inconsistent among the various functions before). Now: - bool and int must be 'in' - float may be 'in' or 'uniform' - float[2-4] and matrices must be 'uniform' Includes a new Slide that allows for interactive editing of a runtime shader. Change-Id: Ic2af68a80c8bb645ba96417c430da24de0a9c2d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260497 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 16:23:12 +00:00
SkString fSkSL;
Handle runtime effect shader errors better - Expose shader error handler on GrBaseContextPriv - Use that to report errors that happen during (late) SkSL conversion - Remove various asserts. We expect these functions not to fail, but they absolutely can for any kind of error that gets past the first compile in SkRuntimeEffect::Make. We'll still make a GLSLFP, but it won't inject any code, so the resulting shader will *also* fail to compile. Injecting our own errors first gives the user a better idea what's actually broken. - SkSLSlide also reports errors via the error handler now, too. Change-Id: I4b871cdaa5e3217b042ebf000bb7474afaeab04c Reviewed-on: https://skia-review.googlesource.com/c/skia/+/275679 Reviewed-by: Ethan Nicholas <ethannicholas@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2020-03-06 20:23:54 +00:00
bool fCodeIsDirty;
Runtime SkSL: Reflect inputs in SkRuntimeEffect Adds a new structure to describe the inputs, including type, shape, name, etc. This removes any references to the type variables in the compiler's context, and centralizes the logic for parsing those type variables. Also normalizes the rules for what types are supported. (This was inconsistent among the various functions before). Now: - bool and int must be 'in' - float may be 'in' or 'uniform' - float[2-4] and matrices must be 'uniform' Includes a new Slide that allows for interactive editing of a runtime shader. Change-Id: Ic2af68a80c8bb645ba96417c430da24de0a9c2d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260497 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 16:23:12 +00:00
sk_sp<SkRuntimeEffect> fEffect;
SkAutoTMalloc<char> fInputs;
Runtime SkSL: API sketch for child shaders/effects Only works on GPU backend for now, and still only supports single-argument sample (at original coords). Change-Id: I4c36ebd0c370ca65126786802c5ea268c3f32edd Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260899 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 20:44:27 +00:00
SkTArray<sk_sp<SkShader>> fChildren;
// Named shaders that can be selected as inputs
SkTArray<std::pair<const char*, sk_sp<SkShader>>> fShaders;
Runtime SkSL: Reflect inputs in SkRuntimeEffect Adds a new structure to describe the inputs, including type, shape, name, etc. This removes any references to the type variables in the compiler's context, and centralizes the logic for parsing those type variables. Also normalizes the rules for what types are supported. (This was inconsistent among the various functions before). Now: - bool and int must be 'in' - float may be 'in' or 'uniform' - float[2-4] and matrices must be 'uniform' Includes a new Slide that allows for interactive editing of a runtime shader. Change-Id: Ic2af68a80c8bb645ba96417c430da24de0a9c2d8 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/260497 Reviewed-by: Brian Salomon <bsalomon@google.com> Commit-Queue: Brian Osman <brianosman@google.com>
2019-12-18 16:23:12 +00:00
};
#endif
Reference in New Issue Copy Permalink