Specify the location of all shader in/out parameters.

also normalized the version and layout formatting
progress towards #1376

assets/cubyz/shaders/animation_pre_processing.glsl

@@ -1,6 +1,6 @@
-#version 430
+#version 460
 
-layout (local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
 
 struct AnimationData {
 	uint startFrame;

assets/cubyz/shaders/background/fragment.fs

@@ -1,8 +1,8 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 fragColor;
+layout(location = 0) out vec4 fragColor;
 
-in vec2 outTexCoords;
+layout(location = 0) in vec2 outTexCoords;
 
 uniform sampler2D image;
 

assets/cubyz/shaders/background/vertex.vs

@@ -1,9 +1,9 @@
-#version 330
+#version 460
 
-layout (location=0) in vec3 vertexPos;
+layout(location = 0) in vec3 vertexPos;
-layout (location=1) in vec2 texCoords;
+layout(location = 1) in vec2 texCoords;
 
-out vec2 outTexCoords;
+layout(location = 0) out vec2 outTexCoords;
 
 uniform mat4 viewMatrix;
 uniform mat4 projectionMatrix;

assets/cubyz/shaders/block_selection_fragment.fs

@@ -1,6 +1,6 @@
-#version 430
+#version 460
 
-in vec3 mvVertexPos;
+layout(location = 0) in vec3 mvVertexPos;
 
 layout(location = 0) out vec4 fragColor;
 

assets/cubyz/shaders/block_selection_vertex.vs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout (location=0)  in vec3 position;
+layout(location = 0) in vec3 position;
 
-out vec3 mvVertexPos;
+layout(location = 0) out vec3 mvVertexPos;
 
 uniform mat4 projectionMatrix;
 uniform mat4 viewMatrix;

assets/cubyz/shaders/bloom/color_extractor_downsample.fs

@@ -1,10 +1,10 @@
-#version 430
+#version 460
 
-layout(location=0) out vec4 fragColor;
+layout(location = 0) out vec4 fragColor;
 
-in vec2 texCoords;
+layout(location = 0) in vec2 texCoords;
-in vec2 normalizedTexCoords;
+layout(location = 1) in vec2 normalizedTexCoords;
-in vec3 direction;
+layout(location = 2) in vec3 direction;
 
 layout(binding = 3) uniform sampler2D color;
 

assets/cubyz/shaders/bloom/color_extractor_downsample.vs

@@ -1,10 +1,10 @@
-#version 430
+#version 460
 
-layout (location=0)  in vec2 inTexCoords;
+layout(location = 0) in vec2 inTexCoords;
 
-out vec2 texCoords;
+layout(location = 0) out vec2 texCoords;
-out vec2 normalizedTexCoords;
+layout(location = 1) out vec2 normalizedTexCoords;
-out vec3 direction;
+layout(location = 2) out vec3 direction;
 
 layout(binding = 3) uniform sampler2D color;
 

assets/cubyz/shaders/bloom/first_pass.fs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout(location=0) out vec4 fragColor;
+layout(location = 0) out vec4 fragColor;
 
-in vec2 texCoords;
+layout(location = 0) in vec2 texCoords;
 
 layout(binding = 3) uniform sampler2D color;
 

assets/cubyz/shaders/bloom/first_pass.vs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout (location=0)  in vec2 inTexCoords;
+layout(location = 0) in vec2 inTexCoords;
 
-out vec2 texCoords;
+layout(location = 0) out vec2 texCoords;
 
 void main() {
 	texCoords = inTexCoords;

assets/cubyz/shaders/bloom/second_pass.fs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout(location=0) out vec4 fragColor;
+layout(location = 0) out vec4 fragColor;
 
-in vec2 texCoords;
+layout(location = 0) in vec2 texCoords;
 
 layout(binding = 3) uniform sampler2D color;
 

assets/cubyz/shaders/bloom/second_pass.vs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout(location=0) in vec2 inTexCoords;
+layout(location = 0) in vec2 inTexCoords;
 
-out vec2 texCoords;
+layout(location = 0) out vec2 texCoords;
 
 void main() {
 	texCoords = inTexCoords;

assets/cubyz/shaders/chunks/chunk_fragment.fs

@@ -1,15 +1,15 @@
-#version 430
+#version 460
 
-in vec3 mvVertexPos;
+layout(location = 0) in vec3 mvVertexPos;
-in vec3 direction;
+layout(location = 1) in vec3 direction;
-in vec3 light;
+layout(location = 2) in vec3 light;
-in vec2 uv;
+layout(location = 3) in vec2 uv;
-flat in vec3 normal;
+layout(location = 4) flat in vec3 normal;
-flat in int textureIndex;
+layout(location = 5) flat in int textureIndex;
-flat in int isBackFace;
+layout(location = 6) flat in int isBackFace;
-flat in int ditherSeed;
+layout(location = 7) flat in int ditherSeed;
-flat in float distanceForLodCheck;
+layout(location = 8) flat in float distanceForLodCheck;
-flat in int opaqueInLod;
+layout(location = 9) flat in int opaqueInLod;
 
 uniform sampler2DArray texture_sampler;
 uniform sampler2DArray emissionSampler;

assets/cubyz/shaders/chunks/chunk_vertex.vs

@@ -1,15 +1,15 @@
 #version 460
 
-out vec3 mvVertexPos;
+layout(location = 0) out vec3 mvVertexPos;
-out vec3 direction;
+layout(location = 1) out vec3 direction;
-out vec3 light;
+layout(location = 2) out vec3 light;
-out vec2 uv;
+layout(location = 3) out vec2 uv;
-flat out vec3 normal;
+layout(location = 4) flat out vec3 normal;
-flat out int textureIndex;
+layout(location = 5) flat out int textureIndex;
-flat out int isBackFace;
+layout(location = 6) flat out int isBackFace;
-flat out int ditherSeed;
+layout(location = 7) flat out int ditherSeed;
-flat out float distanceForLodCheck;
+layout(location = 8) flat out float distanceForLodCheck;
-flat out int opaqueInLod;
+layout(location = 9) flat out int opaqueInLod;
 
 uniform vec3 ambientLight;
 uniform mat4 projectionMatrix;

assets/cubyz/shaders/chunks/fillIndirectBuffer.glsl

@@ -1,6 +1,6 @@
-#version 430
+#version 460
 
-layout (local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
+layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in;
 
 struct AnimationData {
 	uint frames;

assets/cubyz/shaders/chunks/occlusionTestFragment.fs

@@ -2,7 +2,7 @@
 
 layout(early_fragment_tests) in;
 
-flat in uint chunkID;
+layout(location = 0) flat in uint chunkID;
 
 struct ChunkData {
 	ivec4 position;

assets/cubyz/shaders/chunks/occlusionTestVertex.vs

@@ -1,6 +1,6 @@
 #version 460
 
-flat out uint chunkID;
+layout(location = 0) flat out uint chunkID;
 
 struct ChunkData {
 	ivec4 position;

assets/cubyz/shaders/chunks/transparent_fragment.fs

@@ -1,15 +1,15 @@
-#version 430
+#version 460
 
-in vec3 mvVertexPos;
+layout(location = 0) in vec3 mvVertexPos;
-in vec3 direction;
+layout(location = 1) in vec3 direction;
-in vec3 light;
+layout(location = 2) in vec3 light;
-in vec2 uv;
+layout(location = 3) in vec2 uv;
-flat in vec3 normal;
+layout(location = 4) flat in vec3 normal;
-flat in int textureIndex;
+layout(location = 5) flat in int textureIndex;
-flat in int isBackFace;
+layout(location = 6) flat in int isBackFace;
-flat in int ditherSeed;
+layout(location = 7) flat in int ditherSeed;
-flat in float distanceForLodCheck;
+layout(location = 8) flat in float distanceForLodCheck;
-flat in int opaqueInLod;
+layout(location = 9) flat in int opaqueInLod;
 
 uniform sampler2DArray texture_sampler;
 uniform sampler2DArray emissionSampler;
@@ -23,8 +23,8 @@ uniform vec3 playerPositionFraction;
 
 layout(binding = 5) uniform sampler2D depthTexture;
 
-layout (location = 0, index = 0) out vec4 fragColor;
+layout(location = 0, index = 0) out vec4 fragColor;
-layout (location = 0, index = 1) out vec4 blendColor;
+layout(location = 0, index = 1) out vec4 blendColor;
 
 struct Fog {
 	vec3 color;

assets/cubyz/shaders/deferred_render_pass.fs

@@ -1,7 +1,9 @@
-#version 430
+#version 460
-out vec4 fragColor;
+
-in vec2 texCoords;
+layout(location = 0) out vec4 fragColor;
-flat in vec3[4] directions;
+
+layout(location = 0) in vec2 texCoords;
+layout(location = 1) flat in vec3[4] directions;
 
 uniform sampler2D color;
 

assets/cubyz/shaders/deferred_render_pass.vs

@@ -1,9 +1,9 @@
-#version 430
+#version 460
 
-layout (location=0)  in vec2 inTexCoords;
+layout(location = 0) in vec2 inTexCoords;
 
-out vec2 texCoords;
+layout(location = 0) out vec2 texCoords;
-flat out vec3[4] directions;
+layout(location = 1) flat out vec3[4] directions;
 
 uniform mat4 invViewMatrix;
 uniform vec2 tanXY;

assets/cubyz/shaders/entity_fragment.fs

@@ -1,9 +1,9 @@
-#version 430
+#version 460
 
-in vec2 outTexCoord;
+layout(location = 0) in vec2 outTexCoord;
-in vec3 mvVertexPos;
+layout(location = 1) in vec3 mvVertexPos;
-in vec3 outLight;
+layout(location = 2) in vec3 outLight;
-flat in vec3 normal;
+layout(location = 3) flat in vec3 normal;
 
 out vec4 fragColor;
 

assets/cubyz/shaders/entity_vertex.vs

@@ -1,9 +1,9 @@
-#version 430
+#version 460
 
-out vec2 outTexCoord;
+layout(location = 0) out vec2 outTexCoord;
-out vec3 mvVertexPos;
+layout(location = 1) out vec3 mvVertexPos;
-out vec3 outLight;
+layout(location = 2) out vec3 outLight;
-flat out vec3 normal;
+layout(location = 3) flat out vec3 normal;
 
 uniform mat4 projectionMatrix;
 uniform mat4 viewMatrix;

assets/cubyz/shaders/fake_reflection.fs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-in vec3 coords;
+layout(location = 0) in vec3 coords;
 
-out vec4 fragColor;
+layout(location = 0) out vec4 fragColor;
 
 uniform vec3 normalVector;
 uniform vec3 upVector;

assets/cubyz/shaders/fake_reflection.vs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout (location=0)  in vec2 inTexCoords;
+layout(location = 0) in vec2 inTexCoords;
 
-out vec3 coords;
+layout(location = 0) out vec3 coords;
 
 uniform float reflectionMapSize;
 

assets/cubyz/shaders/graphics/Circle.fs

@@ -1,9 +1,9 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
-flat in vec4 color;
+layout(location = 0) in vec2 unitPosition;
-in vec2 unitPosition;
+layout(location = 1) flat in vec4 color;
 
 // Like smooth step, but with linear interpolation instead of s-curve.
 float linearstep(float edge0, float edge1, float x) {

assets/cubyz/shaders/graphics/Circle.vs

@@ -1,9 +1,9 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec2 vertex_pos;
+layout(location = 0) in vec2 vertex_pos;
 
-flat out vec4 color;
+layout(location = 0) out vec2 unitPosition;
-out vec2 unitPosition;
+layout(location = 1) flat out vec4 color;
 
 
 //in pixel

assets/cubyz/shaders/graphics/Image.fs

@@ -1,10 +1,10 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 uniform sampler2D image;
 
-flat in vec4 fColor;
+layout(location = 0) in vec2 uv;
-in vec2 uv;
+layout(location = 1) flat in vec4 fColor;
 
 void main() {
 	frag_color = texture(image, uv)*fColor;

assets/cubyz/shaders/graphics/Image.vs

@@ -1,9 +1,9 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec2 vertex_pos;
+layout(location = 0) in vec2 vertex_pos;
 
-out vec2 uv;
+layout(location = 0) out vec2 uv;
-flat out vec4 fColor;
+layout(location = 1) flat out vec4 fColor;
 
 //in pixel
 uniform vec2 start;

assets/cubyz/shaders/graphics/Line.fs

@@ -1,8 +1,8 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
-flat in vec4 color;
+layout(location = 0) flat in vec4 color;
 
 uniform sampler2D texture_sampler;
 

assets/cubyz/shaders/graphics/Line.vs

@@ -1,8 +1,8 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec2 vertex_pos;
+layout(location = 0) in vec2 vertex_pos;
 
-flat out vec4 color;
+layout(location = 0) flat out vec4 color;
 
 
 //in pixel

assets/cubyz/shaders/graphics/Rect.fs

@@ -1,9 +1,9 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
-flat in vec4 color;
+layout(location = 0) flat in vec4 color;
 
-void main(){
+void main() {
 	frag_color = color;
 }

assets/cubyz/shaders/graphics/Rect.vs

@@ -1,9 +1,8 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec2 vertex_pos;
+layout(location = 0) in vec2 vertex_pos;
-
-flat out vec4 color;
 
+layout(location = 0) flat out vec4 color;
 
 //in pixel
 uniform vec2 start;
@@ -12,7 +11,6 @@ uniform vec2 screen;
 
 uniform int rectColor;
 
-
 void main() {
 	// Convert to opengl coordinates:
 	vec2 position_percentage = (start + vertex_pos*size)/screen;

assets/cubyz/shaders/graphics/RectBorder.fs

@@ -1,8 +1,8 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
-flat in vec4 color;
+layout(location = 0) flat in vec4 color;
 
 void main(){
 	frag_color = color;

assets/cubyz/shaders/graphics/RectBorder.vs

@@ -1,9 +1,8 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec4 vertex_pos;
+layout(location = 0) in vec4 vertex_pos;
-
-flat out vec4 color;
 
+layout(location = 0) flat out vec4 color;
 
 //in pixel
 uniform vec2 start;
@@ -13,7 +12,6 @@ uniform float lineWidth;
 
 uniform int rectColor;
 
-
 void main() {
 	// Convert to opengl coordinates:
 	vec2 position_percentage = (start + vertex_pos.xy*size + vertex_pos.zw*lineWidth)/screen;

assets/cubyz/shaders/graphics/Text.fs

@@ -1,9 +1,9 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
-in vec2 frag_face_pos;
+layout(location = 0) in vec2 frag_face_pos;
-flat in vec4 color;
+layout(location = 1) flat in vec4 color;
 
 uniform sampler2D texture_sampler;
 

assets/cubyz/shaders/graphics/Text.vs

@@ -1,10 +1,9 @@
-#version 330
+#version 460
 
-layout (location=0) in vec2 face_pos;
+layout(location = 0) in vec2 face_pos;
-
-out vec2 frag_face_pos;
-flat out vec4 color;
 
+layout(location = 0) out vec2 frag_face_pos;
+layout(location = 1) flat out vec4 color;
 
 // in pixels
 uniform vec4 texture_rect;
@@ -15,7 +14,6 @@ uniform int fontEffects;
 
 uniform float alpha;
 
-
 vec2 convert2Proportional(vec2 original, vec2 full) {
 	return vec2(original.x/full.x, original.y/full.y);
 }

assets/cubyz/shaders/graphics/graph.fs

@@ -1,6 +1,6 @@
-#version 430
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
 uniform vec3 lineColor;
 

assets/cubyz/shaders/graphics/graph.vs

@@ -1,4 +1,4 @@
-#version 430 core
+#version 460
 
 //in pixel
 uniform vec2 start;

assets/cubyz/shaders/item_drop.fs

@@ -1,15 +1,15 @@
-#version 430
+#version 460
 
-in vec3 startPosition;
+layout(location = 0) in vec3 startPosition;
-in vec3 direction;
+layout(location = 1) in vec3 direction;
-in vec3 cameraSpacePos;
+layout(location = 2) in vec3 cameraSpacePos;
-in vec2 uv;
+layout(location = 3) in vec2 uv;
-flat in int faceNormalIndex;
+layout(location = 4) flat in int faceNormalIndex;
-flat in vec3 faceNormal;
+layout(location = 5) flat in vec3 faceNormal;
-flat in int voxelModel;
+layout(location = 6) flat in int voxelModel;
-flat in int textureIndex;
+layout(location = 7) flat in int textureIndex;
-flat in uvec3 lower;
+layout(location = 8) flat in uvec3 lower;
-flat in uvec3 upper;
+layout(location = 9) flat in uvec3 upper;
 
 layout(location = 0) out vec4 fragColor;
 

assets/cubyz/shaders/item_drop.vs

@@ -1,15 +1,15 @@
-#version 430
+#version 460
 
-out vec3 startPosition;
+layout(location = 0) out vec3 startPosition;
-out vec3 direction;
+layout(location = 1) out vec3 direction;
-out vec3 cameraSpacePos;
+layout(location = 2) out vec3 cameraSpacePos;
-out vec2 uv;
+layout(location = 3) out vec2 uv;
-flat out int faceNormalIndex;
+layout(location = 4) flat out int faceNormalIndex;
-flat out vec3 faceNormal;
+layout(location = 5) flat out vec3 faceNormal;
-flat out int voxelModel;
+layout(location = 6) flat out int voxelModel;
-flat out int textureIndex;
+layout(location = 7) flat out int textureIndex;
-flat out uvec3 lower;
+layout(location = 8) flat out uvec3 lower;
-flat out uvec3 upper;
+layout(location = 9) flat out uvec3 upper;
 
 uniform mat4 projectionMatrix;
 uniform mat4 viewMatrix;

assets/cubyz/shaders/item_texture_post.fs

@@ -1,7 +1,8 @@
-#version 430
+#version 460
-out vec4 fragColor;
 
-in vec2 texCoords;
+layout(location = 0) out vec4 fragColor;
+
+layout(location = 0) in vec2 texCoords;
 
 uniform sampler2D color;
 uniform bool transparent;

assets/cubyz/shaders/item_texture_post.vs

@@ -1,8 +1,8 @@
-#version 430
+#version 460
 
-layout (location=0)  in vec2 inTexCoords;
+layout(location = 0) in vec2 inTexCoords;
 
-out vec2 texCoords;
+layout(location = 0) out vec2 texCoords;
 
 void main() {
 	texCoords = inTexCoords;

assets/cubyz/shaders/skybox/star.fs

@@ -1,10 +1,10 @@
-#version 430
+#version 460
 
-in vec3 pos;
+layout(location = 0) in vec3 pos;
-in flat vec3 centerPos;
+layout(location = 1) in flat vec3 centerPos;
-in flat vec3 color;
+layout(location = 2) in flat vec3 color;
 
-layout (location = 0, index = 0) out vec4 fragColor;
+layout(location = 0, index = 0) out vec4 fragColor;
 
 void main() {
 	if (dot(pos - centerPos, pos - centerPos) > 1.0/12.0)

assets/cubyz/shaders/skybox/star.vs

@@ -1,4 +1,4 @@
-#version 430
+#version 460
 
 struct star {
 	vec4 vertexPositions[3];
@@ -16,9 +16,9 @@ layout (std430, binding = 12) buffer _starBuffer {
 uniform mat4 mvp;
 uniform float starOpacity;
 
-out vec3 pos;
+layout(location = 0) out vec3 pos;
-out flat vec3 centerPos;
+layout(location = 1) out flat vec3 centerPos;
-out flat vec3 color;
+layout(location = 2) out flat vec3 color;
 
 void main() {
 	gl_Position = mvp*vec4(starData[gl_VertexID/3].vertexPositions[gl_VertexID%3].xyz, 1);

assets/cubyz/shaders/ui/button.fs

@@ -1,10 +1,10 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 uniform sampler2D image;
 
-flat in vec4 fColor;
+layout(location = 0) in vec2 startCoord;
-in vec2 startCoord;
+layout(location = 1) flat in vec4 fColor;
 
 uniform float scale;
 

assets/cubyz/shaders/ui/button.vs

@@ -1,9 +1,9 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec2 vertex_pos;
+layout(location = 0) in vec2 vertex_pos;
 
-out vec2 startCoord;
+layout(location = 0) out vec2 startCoord;
-flat out vec4 fColor;
+layout(location = 1) flat out vec4 fColor;
 
 //in pixel
 uniform vec2 start;

assets/cubyz/shaders/ui/window_border.fs

@@ -1,10 +1,10 @@
-#version 330
+#version 460
 
-layout (location=0) out vec4 frag_color;
+layout(location = 0) out vec4 frag_color;
 
-flat in vec4 fColor;
+layout(location = 0) flat in vec2 startCoord;
-flat in vec2 startCoord;
+layout(location = 1) flat in vec2 endCoord;
-flat in vec2 endCoord;
+layout(location = 2) flat in vec4 fColor;
 
 uniform vec2 start;
 uniform vec2 size;

assets/cubyz/shaders/ui/window_border.vs

@@ -1,10 +1,10 @@
-#version 330 core
+#version 460
 
-layout (location=0) in vec2 vertex_pos;
+layout(location = 0) in vec2 vertex_pos;
 
-flat out vec2 startCoord;
+layout(location = 0) flat out vec2 startCoord;
-flat out vec2 endCoord;
+layout(location = 1) flat out vec2 endCoord;
-flat out vec4 fColor;
+layout(location = 2) flat out vec4 fColor;
 
 //in pixel
 uniform vec2 start;