diff options
author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-28 15:49:26 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-04-29 09:36:43 +0000 |
commit | 3169744ab415268a9b6ff544d1bd49031ef3c08a (patch) | |
tree | 18362e5a8dd62ab940e82a9f055be50c75432866 /src/quick/items/qquickshadereffect_p.h | |
parent | cb1033fd603a438041a16ba55547d77133ad1e79 (diff) |
D3D12: Fix 'ShaderEffect in a ShaderEffectSource as property value'
Import (and clean up) the dropshadow from the shadereffects example.
This is very useful since it tests a lot more paths and cases than
the wobble.
To overcome the issue of not having some of functionality available before
the item is added to a window, make QQuickGenericShaderEffect smarter and
enhance the documentation.
The handling of vertical mirroring is revised. The GLSL and HLSL version of
the dropshadow shaders produce correct, identical output now.
Change-Id: I94800997bfba781140d80720eb6f340cda480747
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/quick/items/qquickshadereffect_p.h')
-rw-r--r-- | src/quick/items/qquickshadereffect_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickshadereffect_p.h b/src/quick/items/qquickshadereffect_p.h index 390703350f..0410514c36 100644 --- a/src/quick/items/qquickshadereffect_p.h +++ b/src/quick/items/qquickshadereffect_p.h @@ -90,9 +90,9 @@ public: Q_ENUM(Status) enum ShaderType { + UnknownShadingLanguage, GLSL, - HLSL, - Metal + HLSL }; Q_ENUM(ShaderType) |