diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2022-11-28 20:29:01 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-11-28 20:29:01 +0100 |
| commit | 8d67e21d48dcefbbb675cfad07849607ce0fe1b7 (patch) | |
| tree | 58072c44539d4b7009fff3defe97834438234b1b /glow/src/shader/common | |
| parent | 457d0560caf91884b148422e1ace3d64a38e0e33 (diff) | |
| parent | bb2bf063b472396d44f9f3114a87ba79dfd5f62e (diff) | |
| download | iced-8d67e21d48dcefbbb675cfad07849607ce0fe1b7.tar.gz iced-8d67e21d48dcefbbb675cfad07849607ce0fe1b7.tar.bz2 iced-8d67e21d48dcefbbb675cfad07849607ce0fe1b7.zip | |
Merge pull request #1538 from iced-rs/group-solid-triangles
Group all solid triangles independently of color
Diffstat (limited to 'glow/src/shader/common')
| -rw-r--r-- | glow/src/shader/common/gradient.vert (renamed from glow/src/shader/common/triangle.vert) | 0 | ||||
| -rw-r--r-- | glow/src/shader/common/solid.frag (renamed from glow/src/shader/common/triangle.frag) | 4 | ||||
| -rw-r--r-- | glow/src/shader/common/solid.vert | 11 |
3 files changed, 13 insertions, 2 deletions
diff --git a/glow/src/shader/common/triangle.vert b/glow/src/shader/common/gradient.vert index fe505997..fe505997 100644 --- a/glow/src/shader/common/triangle.vert +++ b/glow/src/shader/common/gradient.vert diff --git a/glow/src/shader/common/triangle.frag b/glow/src/shader/common/solid.frag index 8260f6a6..174ffdd3 100644 --- a/glow/src/shader/common/triangle.frag +++ b/glow/src/shader/common/solid.frag @@ -11,8 +11,8 @@ out vec4 fragColor; #define gl_FragColor fragColor #endif -uniform vec4 color; +in vec4 v_Color; void main() { - gl_FragColor = color; + gl_FragColor = v_Color; } diff --git a/glow/src/shader/common/solid.vert b/glow/src/shader/common/solid.vert new file mode 100644 index 00000000..59ed88e5 --- /dev/null +++ b/glow/src/shader/common/solid.vert @@ -0,0 +1,11 @@ +uniform mat4 u_Transform; + +in vec2 i_Position; +in vec4 i_Color; + +out vec4 v_Color; + +void main() { + gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0); + v_Color = i_Color; +} |