diff --git a/core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/vert.vsh index f58a25234..3f614c123 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/vert.vsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/apply/blaze/vert.vsh @@ -10,6 +10,6 @@ out vec2 TexCoord; */ void main() { - gl_Position = vec4(vPosition, 0.0, 1.0); + gl_Position = vec4(vPosition, 1.0, 1.0); TexCoord = vPosition.xy * 0.5 + 0.5; } \ No newline at end of file diff --git a/core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/vert.vsh index d9b009b3b..1f66dd73b 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/vert.vsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/copy/blaze/vert.vsh @@ -7,6 +7,6 @@ out vec2 TexCoord; // DH copy void main() { - gl_Position = vec4(vPosition, 0.0, 1.0); + gl_Position = vec4(vPosition, 1.0, 1.0); TexCoord = vPosition.xy * 0.5 + 0.5; } \ No newline at end of file diff --git a/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/frag.fsh index 253b92fd5..e6d4c6af4 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/frag.fsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/frag.fsh @@ -1,13 +1,13 @@ #version 150 core +out vec4 fragColor; + layout (std140) uniform uniformBlock { mat4 uTransform; vec4 uColor; }; -out vec4 fragColor; - void main() { fragColor = uColor; diff --git a/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/vert.vsh index 7ff5df869..2c77ff433 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/vert.vsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/debug/blaze/vert.vsh @@ -1,13 +1,13 @@ #version 150 core +in vec3 vPosition; + layout (std140) uniform uniformBlock { mat4 uTransform; vec4 uColor; }; -in vec3 vPosition; - void main() { gl_Position = uTransform * vec4(vPosition, 1.0); diff --git a/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vert.vsh index 0e8671190..aa6289508 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vert.vsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/fade/blaze/vert.vsh @@ -2,13 +2,11 @@ in vec2 vPosition; -out vec4 fColor; out vec2 TexCoord; // DH vert fade test void main() { - gl_Position = vec4(vPosition, 0.0, 1.0); - fColor = vec4(vPosition, 0.0, 1.0); + gl_Position = vec4(vPosition, 1.0, 1.0); TexCoord = vPosition.xy * 0.5 + 0.5; } \ No newline at end of file diff --git a/core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/vert.vsh index 8e69ce9f8..ac0b3fd98 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/vert.vsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/generic/blaze/vert.vsh @@ -1,4 +1,4 @@ -#version 330 core +#version 150 core in vec3 vPosition; in vec4 aColor; // RGBA_FLOAT_COLOR diff --git a/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/vert.vert b/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/vert.vert index a7d9a6a96..28f404cb8 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/vert.vert +++ b/core/src/main/resources/assets/distanthorizons/shaders/generic/gl/instanced/vert.vert @@ -1,4 +1,4 @@ -#version 330 core +#version 150 core layout (location = 1) in vec4 aColor; layout (location = 2) in vec3 aScale; diff --git a/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/frag.fsh index 86be28a6b..2d0506caa 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/frag.fsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/frag.fsh @@ -1,8 +1,9 @@ #version 150 +// order matters, this must match the vertex shader's outputs +in vec3 vPos; in vec4 vertexColor; in vec3 vertexWorldPos; -in vec3 vPos; in vec4 gl_FragCoord; out vec4 fragColor; diff --git a/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/vert.vsh b/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/vert.vsh index e2eed781e..ab7d01afa 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/vert.vsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/lod/blaze/vert.vsh @@ -6,10 +6,10 @@ in vec4 vColor; in int irisMaterial; in int irisNormal; +// order matters, this must match the fragment shader's inputs out vec3 vPos; out vec4 vertexColor; out vec3 vertexWorldPos; -out float vertexYPos; layout (std140) uniform vertUniqueUniformBlock { @@ -39,7 +39,7 @@ void main() vertexWorldPos = vPosition.xyz + (uModelOffset - uCameraPos); - vertexYPos = vPosition.y + uWorldYOffset; + float vertexYPos = vPosition.y + uWorldYOffset; uint mirco = (meta & 0xFF00u) >> 8u; // mirco offset which is a xyz 2bit value // 0b00 = no offset diff --git a/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/frag.fsh index 16481db68..6ab05fa84 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/frag.fsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/ssao/blaze/frag.fsh @@ -1,5 +1,4 @@ #version 150 core -#extension GL_ARB_derivative_control : enable #define SAMPLE_MAX 64 diff --git a/core/src/main/resources/assets/distanthorizons/shaders/test/blaze/frag.fsh b/core/src/main/resources/assets/distanthorizons/shaders/test/blaze/frag.fsh index 3fd25f9db..475fa3b22 100644 --- a/core/src/main/resources/assets/distanthorizons/shaders/test/blaze/frag.fsh +++ b/core/src/main/resources/assets/distanthorizons/shaders/test/blaze/frag.fsh @@ -1,6 +1,7 @@ #version 150 core in vec4 fColor; + out vec4 fragColor; // DH frag test