Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 0 insertions, 31 deletions

diff --git a/examples/quick/shadereffects/content/shaders/+hlsl/genie.vert b/examples/quick/shadereffects/content/shaders/+hlsl/genie.vert
deleted file mode 100644
index 40876e7996..0000000000
--- a/examples/quick/shadereffects/content/shaders/+hlsl/genie.vert
+++ /dev/null
@@ -1,31 +0,0 @@
-cbuffer ConstantBuffer : register(b0)
-{
-    float4x4 qt_Matrix;
-    float qt_Opacity;
-    float bend;
-    float minimize;
-    float side;
-    float width;
-    float height;
-};
-
-struct PSInput
-{
-    float4 position : SV_POSITION;
-    float2 coord : TEXCOORD0;
-};
-
-PSInput main(float4 position : POSITION, float2 coord : TEXCOORD0)
-{
-    PSInput result;
-    result.coord = coord;
-
-    float4 pos = position;
-    pos.y = lerp(position.y, height, minimize);
-    float t = pos.y / height;
-    t = (3.0 - 2.0 * t) * t * t;
-    pos.x = lerp(position.x, side * width, t * bend);
-    result.position = mul(qt_Matrix, pos);
-
-    return result;
-}