From 33c3c0c0aa774bb7462e3c42aa04c591a66376a7 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Mon, 14 Nov 2022 00:02:42 +0100 Subject: Group all solid triangles independently of color --- glow/src/shader/common/gradient.vert | 9 +++++++++ glow/src/shader/common/solid.frag | 18 ++++++++++++++++++ glow/src/shader/common/solid.vert | 11 +++++++++++ glow/src/shader/common/triangle.frag | 18 ------------------ glow/src/shader/common/triangle.vert | 9 --------- 5 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 glow/src/shader/common/gradient.vert create mode 100644 glow/src/shader/common/solid.frag create mode 100644 glow/src/shader/common/solid.vert delete mode 100644 glow/src/shader/common/triangle.frag delete mode 100644 glow/src/shader/common/triangle.vert (limited to 'glow/src/shader/common') diff --git a/glow/src/shader/common/gradient.vert b/glow/src/shader/common/gradient.vert new file mode 100644 index 00000000..fe505997 --- /dev/null +++ b/glow/src/shader/common/gradient.vert @@ -0,0 +1,9 @@ +uniform mat4 u_Transform; + +in vec2 i_Position; +out vec2 raw_position; + +void main() { + gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0); + raw_position = i_Position; +} diff --git a/glow/src/shader/common/solid.frag b/glow/src/shader/common/solid.frag new file mode 100644 index 00000000..174ffdd3 --- /dev/null +++ b/glow/src/shader/common/solid.frag @@ -0,0 +1,18 @@ +#ifdef GL_ES +#ifdef GL_FRAGMENT_PRECISION_HIGH +precision highp float; +#else +precision mediump float; +#endif +#endif + +#ifdef HIGHER_THAN_300 +out vec4 fragColor; +#define gl_FragColor fragColor +#endif + +in vec4 v_Color; + +void main() { + 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; +} diff --git a/glow/src/shader/common/triangle.frag b/glow/src/shader/common/triangle.frag deleted file mode 100644 index 8260f6a6..00000000 --- a/glow/src/shader/common/triangle.frag +++ /dev/null @@ -1,18 +0,0 @@ -#ifdef GL_ES -#ifdef GL_FRAGMENT_PRECISION_HIGH -precision highp float; -#else -precision mediump float; -#endif -#endif - -#ifdef HIGHER_THAN_300 -out vec4 fragColor; -#define gl_FragColor fragColor -#endif - -uniform vec4 color; - -void main() { - gl_FragColor = color; -} diff --git a/glow/src/shader/common/triangle.vert b/glow/src/shader/common/triangle.vert deleted file mode 100644 index fe505997..00000000 --- a/glow/src/shader/common/triangle.vert +++ /dev/null @@ -1,9 +0,0 @@ -uniform mat4 u_Transform; - -in vec2 i_Position; -out vec2 raw_position; - -void main() { - gl_Position = u_Transform * vec4(i_Position, 0.0, 1.0); - raw_position = i_Position; -} -- cgit