From b22270bf6e3f035df4cb619905049366c32589bd Mon Sep 17 00:00:00 2001 From: GregF Date: Tue, 15 Dec 2015 11:23:43 -0700 Subject: [PATCH] cube and tri: change shader version numbers to 400 --- demos/cube.frag | 2 +- demos/cube.vert | 7 ++++++- demos/tri.frag | 2 +- demos/tri.vert | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/demos/cube.frag b/demos/cube.frag index 3c29b7d..c0c2905 100644 --- a/demos/cube.frag +++ b/demos/cube.frag @@ -1,7 +1,7 @@ /* * Fragment shader for cube demo */ -#version 140 +#version 400 #extension GL_ARB_separate_shader_objects : enable #extension GL_ARB_shading_language_420pack : enable layout (binding = 1) uniform sampler2D tex; diff --git a/demos/cube.vert b/demos/cube.vert index cd22fbe..70829ad 100644 --- a/demos/cube.vert +++ b/demos/cube.vert @@ -1,7 +1,7 @@ /* * Vertex shader used by Cube demo. */ -#version 140 +#version 400 #extension GL_ARB_separate_shader_objects : enable #extension GL_ARB_shading_language_420pack : enable layout(std140, binding = 0) uniform buf { @@ -11,6 +11,11 @@ layout(std140, binding = 0) uniform buf { } ubuf; layout (location = 0) out vec4 texcoord; + +out gl_PerVertex { + vec4 gl_Position; +}; + void main() { texcoord = ubuf.attr[gl_VertexID]; diff --git a/demos/tri.frag b/demos/tri.frag index 7672fb7..564abe8 100644 --- a/demos/tri.frag +++ b/demos/tri.frag @@ -1,7 +1,7 @@ /* * Fragment shader for tri demo */ -#version 140 +#version 400 #extension GL_ARB_separate_shader_objects : enable #extension GL_ARB_shading_language_420pack : enable layout (binding = 0) uniform sampler2D tex; diff --git a/demos/tri.vert b/demos/tri.vert index 9915a6b..2d73139 100644 --- a/demos/tri.vert +++ b/demos/tri.vert @@ -1,7 +1,7 @@ /* * Vertex shader used by tri demo. */ -#version 140 +#version 400 #extension GL_ARB_separate_shader_objects : enable #extension GL_ARB_shading_language_420pack : enable layout (location = 0) in vec4 pos; -- 2.7.4