diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-07-28 11:54:44 +0200 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-07-29 15:40:27 +0000 |
commit | 5e8347fdbab98d721f031634a9f6c8b217072d34 (patch) | |
tree | ca507e39d1ffb058e6c622d17e19e1b236531f05 /src/quick | |
parent | 182983943b76bc0e40ff7693853ef2262323fa80 (diff) |
Move shapes-related shaders to under the shapes plugin
Do not leave them in quick/items' qrc.
Change-Id: I12360a54caa368219a7a80645f92af66aa9de9ba
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/items/items.qrc | 4 | ||||
-rw-r--r-- | src/quick/items/shaders/lineargradient.frag | 9 | ||||
-rw-r--r-- | src/quick/items/shaders/lineargradient.vert | 15 | ||||
-rw-r--r-- | src/quick/items/shaders/lineargradient_core.frag | 12 | ||||
-rw-r--r-- | src/quick/items/shaders/lineargradient_core.vert | 17 |
5 files changed, 0 insertions, 57 deletions
diff --git a/src/quick/items/items.qrc b/src/quick/items/items.qrc index da9bf0c828..6aaf757c29 100644 --- a/src/quick/items/items.qrc +++ b/src/quick/items/items.qrc @@ -8,9 +8,5 @@ <file>shaders/shadereffect_core.vert</file> <file>shaders/shadereffectfallback_core.frag</file> <file>shaders/shadereffectfallback_core.vert</file> - <file>shaders/lineargradient.vert</file> - <file>shaders/lineargradient.frag</file> - <file>shaders/lineargradient_core.vert</file> - <file>shaders/lineargradient_core.frag</file> </qresource> </RCC> diff --git a/src/quick/items/shaders/lineargradient.frag b/src/quick/items/shaders/lineargradient.frag deleted file mode 100644 index 7f4a739109..0000000000 --- a/src/quick/items/shaders/lineargradient.frag +++ /dev/null @@ -1,9 +0,0 @@ -uniform sampler2D gradTabTexture; -uniform highp float opacity; - -varying highp float gradTabIndex; - -void main() -{ - gl_FragColor = texture2D(gradTabTexture, vec2(gradTabIndex, 0.5)) * opacity; -} diff --git a/src/quick/items/shaders/lineargradient.vert b/src/quick/items/shaders/lineargradient.vert deleted file mode 100644 index eb21b8886b..0000000000 --- a/src/quick/items/shaders/lineargradient.vert +++ /dev/null @@ -1,15 +0,0 @@ -attribute vec4 vertexCoord; -attribute vec4 vertexColor; - -uniform mat4 matrix; -uniform vec2 gradStart; -uniform vec2 gradEnd; - -varying float gradTabIndex; - -void main() -{ - vec2 gradVec = gradEnd - gradStart; - gradTabIndex = dot(gradVec, vertexCoord.xy - gradStart) / (gradVec.x * gradVec.x + gradVec.y * gradVec.y); - gl_Position = matrix * vertexCoord; -} diff --git a/src/quick/items/shaders/lineargradient_core.frag b/src/quick/items/shaders/lineargradient_core.frag deleted file mode 100644 index 5908acfa67..0000000000 --- a/src/quick/items/shaders/lineargradient_core.frag +++ /dev/null @@ -1,12 +0,0 @@ -#version 150 core - -uniform sampler2D gradTabTexture; -uniform float opacity; - -in float gradTabIndex; -out vec4 fragColor; - -void main() -{ - fragColor = texture(gradTabTexture, vec2(gradTabIndex, 0.5)) * opacity; -} diff --git a/src/quick/items/shaders/lineargradient_core.vert b/src/quick/items/shaders/lineargradient_core.vert deleted file mode 100644 index 60b56f38e3..0000000000 --- a/src/quick/items/shaders/lineargradient_core.vert +++ /dev/null @@ -1,17 +0,0 @@ -#version 150 core - -in vec4 vertexCoord; -in vec4 vertexColor; - -uniform mat4 matrix; -uniform vec2 gradStart; -uniform vec2 gradEnd; - -out float gradTabIndex; - -void main() -{ - vec2 gradVec = gradEnd - gradStart; - gradTabIndex = dot(gradVec, vertexCoord.xy - gradStart) / (gradVec.x * gradVec.x + gradVec.y * gradVec.y); - gl_Position = matrix * vertexCoord; -} |