aboutsummaryrefslogtreecommitdiffstats
path: root/examples/resources
diff options
context:
space:
mode:
Diffstat (limited to 'examples/resources')
-rw-r--r--examples/resources/colourshader.frag10
-rw-r--r--examples/resources/colourshader.vert15
-rw-r--r--examples/resources/textureshader.frag8
-rw-r--r--examples/resources/textureshader.vert7
4 files changed, 32 insertions, 8 deletions
diff --git a/examples/resources/colourshader.frag b/examples/resources/colourshader.frag
new file mode 100644
index 00000000..e49d1ebb
--- /dev/null
+++ b/examples/resources/colourshader.frag
@@ -0,0 +1,10 @@
+#version 450
+
+layout(location = 0) in vec4 fragment_colour;
+
+layout(location = 0) out vec4 colour;
+
+void main()
+{
+ colour = fragment_colour;
+}
diff --git a/examples/resources/colourshader.vert b/examples/resources/colourshader.vert
new file mode 100644
index 00000000..e5c10d77
--- /dev/null
+++ b/examples/resources/colourshader.vert
@@ -0,0 +1,15 @@
+#version 450
+
+layout(location = 0) in vec2 vertex_position;
+layout(location = 1) in vec4 vertex_colour;
+
+layout(location = 0) out vec4 fragment_colour;
+
+uniform mat4 P;
+
+void main()
+{
+ gl_Position = vec4(vertex_position, 0.f, 1.f);
+
+ fragment_colour = vertex_colour;
+}
diff --git a/examples/resources/textureshader.frag b/examples/resources/textureshader.frag
index ef728b04..8d916be6 100644
--- a/examples/resources/textureshader.frag
+++ b/examples/resources/textureshader.frag
@@ -4,13 +4,15 @@ layout(location = 0) in vec2 fragment_position;
layout(location = 1) in vec4 fragment_colour;
layout(location = 2) in vec2 fragment_uv;
-out vec4 colour;
+layout(location = 0) out vec4 colour;
+layout(location = 1) out vec4 colour2;
uniform sampler2D texture_sampler;
void main()
{
- vec4 texture_color = texture(texture_sampler, fragment_uv);
+ vec4 texture_colour = texture(texture_sampler, fragment_uv);
- colour = texture_color * fragment_colour;
+ colour2 = vec4(1.f, 0.f, 0.f, 1.f);
+ colour = texture_colour;
}
diff --git a/examples/resources/textureshader.vert b/examples/resources/textureshader.vert
index 3277d8b0..b0c11a6c 100644
--- a/examples/resources/textureshader.vert
+++ b/examples/resources/textureshader.vert
@@ -12,12 +12,9 @@ uniform mat4 P;
void main()
{
- gl_Position.xy = (P*vec4(vertex_position, 0.0, 1.0)).xy;
- gl_Position.z = 0.0;
- gl_Position.w = 1.0;
+ gl_Position = vec4((P*vec4(vertex_position, 0.f, 1.f)).xy, 0.f, 1.f);
fragment_position = vertex_position;
fragment_colour = vertex_colour;
- fragment_uv = vec2(vertex_uv.x, 1-vertex_uv.y);
-
+ fragment_uv = vec2(vertex_uv.x, 1-vertex_uv.y);
}