From 08ab6514476e7430ee0933397b6723d93d790a5b Mon Sep 17 00:00:00 2001 From: "Roy.li" Date: Tue, 5 Jan 2021 17:15:34 +0800 Subject: [PATCH 1/2] gl_PerVertex redeclare not support under version 410 --- data/gl-320/glsl-builtin-blocks.vert | 5 ----- 1 file changed, 5 deletions(-) diff --git a/data/gl-320/glsl-builtin-blocks.vert b/data/gl-320/glsl-builtin-blocks.vert index d8c3332c9..62f2a62ce 100644 --- a/data/gl-320/glsl-builtin-blocks.vert +++ b/data/gl-320/glsl-builtin-blocks.vert @@ -18,11 +18,6 @@ out block flat int Instance; } Out; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { Out.Texcoord = Texcoord; From eb44fc2585bdb64355cb7151ea6fc85536a81b17 Mon Sep 17 00:00:00 2001 From: "Roy.li" Date: Tue, 5 Jan 2021 17:15:34 +0800 Subject: [PATCH 2/2] gl_PerVertex redeclare not support under version 410 --- data/gl-320/glsl-builtin-blocks.vert | 5 ----- data/gl-320/primitive-point-quad.geom | 12 ------------ data/gl-400/buffer-uniform-array.vert | 5 ----- data/gl-400/multi-draw-indirect.vert | 5 ----- data/gl-400/texture-cube.vert | 5 ----- data/gl-400/transform-stream.geom | 7 ------- 6 files changed, 39 deletions(-) diff --git a/data/gl-320/glsl-builtin-blocks.vert b/data/gl-320/glsl-builtin-blocks.vert index d8c3332c9..62f2a62ce 100644 --- a/data/gl-320/glsl-builtin-blocks.vert +++ b/data/gl-320/glsl-builtin-blocks.vert @@ -18,11 +18,6 @@ out block flat int Instance; } Out; -out gl_PerVertex -{ - vec4 gl_Position; -}; - void main() { Out.Texcoord = Texcoord; diff --git a/data/gl-320/primitive-point-quad.geom b/data/gl-320/primitive-point-quad.geom index e2887297d..19dc86917 100644 --- a/data/gl-320/primitive-point-quad.geom +++ b/data/gl-320/primitive-point-quad.geom @@ -17,18 +17,6 @@ uniform mat4 MVP; uniform mat4 MV; uniform vec3 CameraPosition; -in gl_PerVertex -{ - vec4 gl_Position; - float gl_PointSize; -} gl_in[]; - -out gl_PerVertex -{ - vec4 gl_Position; - float gl_PointSize; -}; - in block { vec4 Color; diff --git a/data/gl-400/buffer-uniform-array.vert b/data/gl-400/buffer-uniform-array.vert index 5b3cc2a13..78a8442c5 100644 --- a/data/gl-400/buffer-uniform-array.vert +++ b/data/gl-400/buffer-uniform-array.vert @@ -15,11 +15,6 @@ uniform transform mat4 MVP; } Transform[2]; -out gl_PerVertex -{ - vec4 gl_Position; -}; - out block { flat int Instance; diff --git a/data/gl-400/multi-draw-indirect.vert b/data/gl-400/multi-draw-indirect.vert index 370dfb069..c0d4f75dd 100644 --- a/data/gl-400/multi-draw-indirect.vert +++ b/data/gl-400/multi-draw-indirect.vert @@ -30,11 +30,6 @@ layout(location = POSITION) in vec2 Position; layout(location = TEXCOORD) in vec2 Texcoord; layout(location = DRAW_ID) in int DrawID; -out gl_PerVertex -{ - vec4 gl_Position; -}; - out block { vec2 Texcoord; diff --git a/data/gl-400/texture-cube.vert b/data/gl-400/texture-cube.vert index 2d94ce63e..e1f82b50c 100644 --- a/data/gl-400/texture-cube.vert +++ b/data/gl-400/texture-cube.vert @@ -18,11 +18,6 @@ const vec3 ConstNormal = vec3(0, 0, 1); layout(location = POSITION) in vec2 Position; -out gl_PerVertex -{ - vec4 gl_Position; -}; - out block { vec3 Reflect; diff --git a/data/gl-400/transform-stream.geom b/data/gl-400/transform-stream.geom index 73295a519..5a4ccee87 100644 --- a/data/gl-400/transform-stream.geom +++ b/data/gl-400/transform-stream.geom @@ -20,13 +20,6 @@ out block layout(stream = 0) vec4 Color; } Out; -out gl_PerVertex -{ - vec4 gl_Position; - float gl_PointSize; - float gl_ClipDistance[]; -}; - void main() { for(int i = 0; i < gl_in.length(); ++i)