diff options
| author | GregF <greg@LunarG.com> | 2015-12-15 11:23:43 -0700 |
|---|---|---|
| committer | GregF <greg@LunarG.com> | 2015-12-15 11:47:16 -0700 |
| commit | b22270bf6e3f035df4cb619905049366c32589bd (patch) | |
| tree | 673c4c168d76d0ec24d09a76412b72b4e15c839d | |
| parent | b55becdc13b70e67d54e5116ed9a38b8d7dca463 (diff) | |
| download | usermoji-b22270bf6e3f035df4cb619905049366c32589bd.tar.xz | |
cube and tri: change shader version numbers to 400
| -rw-r--r-- | demos/cube.frag | 2 | ||||
| -rw-r--r-- | demos/cube.vert | 7 | ||||
| -rw-r--r-- | demos/tri.frag | 2 | ||||
| -rw-r--r-- | demos/tri.vert | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/demos/cube.frag b/demos/cube.frag index 3c29b7d0..c0c29055 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 cd22fbe0..70829ad3 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 7672fb72..564abe88 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 9915a6bd..2d731395 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; |