bugfix: ensure all attributes are correctly bound

Terasology · Jun 27, 2021 · 5d10521 · 5d10521
1 parent b6292a2
commit 5d10521
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 35 deletions.
diff --git a/assets/shaders/blur_vert.glsl b/assets/shaders/blur_vert.glsl
@@ -2,9 +2,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/downSampler_vert.glsl b/assets/shaders/downSampler_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/highPass_vert.glsl b/assets/shaders/highPass_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/initialPost_vert.glsl b/assets/shaders/initialPost_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/lightBufferPass_vert.glsl b/assets/shaders/lightBufferPass_vert.glsl
@@ -2,9 +2,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/lightGeometryPass_vert.glsl b/assets/shaders/lightGeometryPass_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 out vec4 v_vertexProjPos;

diff --git a/assets/shaders/lightShafts_vert.glsl b/assets/shaders/lightShafts_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/outputPass_vert.glsl b/assets/shaders/outputPass_vert.glsl
@@ -2,9 +2,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/post_vert.glsl b/assets/shaders/post_vert.glsl
@@ -3,10 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
-
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/prePostComposite_vert.glsl b/assets/shaders/prePostComposite_vert.glsl
@@ -2,9 +2,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/shadowMap_vert.glsl b/assets/shaders/shadowMap_vert.glsl
@@ -7,8 +7,6 @@ layout (location = 0) in vec3 in_vert;
 uniform mat4 modelViewMatrix;
 uniform mat4 projectionMatrix;
 
-//out vec4 v_pos;
-
 void main() {
 	gl_Position = projectionMatrix * modelViewMatrix *  vec4(in_vert, 1.0);
 

diff --git a/assets/shaders/sky_vert.glsl b/assets/shaders/sky_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out	vec4 v_position;
 out vec2 v_uv0;

diff --git a/assets/shaders/sobel_vert.glsl b/assets/shaders/sobel_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/ssaoBlur_vert.glsl b/assets/shaders/ssaoBlur_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/ssao_vert.glsl b/assets/shaders/ssao_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/toneMapping_vert.glsl b/assets/shaders/toneMapping_vert.glsl
@@ -3,9 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;
 

diff --git a/assets/shaders/vignette_vert.glsl b/assets/shaders/vignette_vert.glsl
@@ -2,9 +2,7 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 layout (location = 0) in vec3 in_vert;
-layout (location = 1) in vec3 in_normal;
 layout (location = 2) in vec2 in_uv0;
-layout (location = 4) in vec4 in_color0;
 
 out vec2 v_uv0;