Update version to 150

onnowhere · Sep 1, 2022 · ad2a0c7 · ad2a0c7
1 parent 7477339
commit ad2a0c7
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 46 deletions.
diff --git a/Depth Shader Test (Distance)/assets/minecraft/shaders/program/blit_util.vsh b/Depth Shader Test (Distance)/assets/minecraft/shaders/program/blit_util.vsh
@@ -1,14 +1,14 @@
-#version 110
+#version 150
 
-attribute vec4 Position;
+in vec4 Position;
 
 uniform mat4 ProjMat;
 uniform vec2 InSize;
 
-varying vec2 texCoord;
-varying vec2 oneTexel;
+out vec2 texCoord;
+out vec2 oneTexel;
 
-void main(){
+void main() {
     vec4 outPos = ProjMat * vec4(Position.xy, 0.0, 1.0);
     gl_Position = vec4(outPos.xy, 0.2, 1.0);
 

diff --git a/Depth Shader Test (Distance)/assets/minecraft/shaders/program/distance.fsh b/Depth Shader Test (Distance)/assets/minecraft/shaders/program/distance.fsh
@@ -1,12 +1,13 @@
-#version 110
+#version 150
 
 uniform sampler2D DiffuseSampler;
 uniform sampler2D DiffuseDepthSampler;
 
 uniform vec2 ScreenSize;
 uniform float _FOV;
 
-varying vec2 texCoord;
+in vec2 texCoord;
+out vec4 fragColor;
 
 float near = 0.1; 
 float far  = 1000.0;
@@ -18,11 +19,11 @@ float LinearizeDepth(float depth)
 }
 
 void main() {
-    float depth = LinearizeDepth(texture2D(DiffuseDepthSampler, texCoord).r);
+    float depth = LinearizeDepth(texture(DiffuseDepthSampler, texCoord).r);
     float distance = length(vec3(1., (2.*texCoord - 1.) * vec2(ScreenSize.x/ScreenSize.y,1.) * tan(radians(_FOV / 2.))) * depth);
     if (mod(distance, 1.0) <= 0.05) {
-        gl_FragColor = vec4(0.0,0.0,0.0,1.0);
+        fragColor = vec4(0.0,0.0,0.0,1.0);
     } else {
-        gl_FragColor = vec4(texture2D(DiffuseSampler, texCoord).rgb, 1.0);
+        fragColor = vec4(texture(DiffuseSampler, texCoord).rgb, 1.0);
     }
 }
diff --git a/Depth Shader Test (Distance)/pack.mcmeta b/Depth Shader Test (Distance)/pack.mcmeta
@@ -1,6 +1,6 @@
 {
    "pack": {
-      "pack_format": 7,
+      "pack_format": 9,
       "description": "§bBy Onnowhere"
    }
 }
diff --git a/Depth Shader Test (DoF)/assets/minecraft/shaders/program/blit_util.vsh b/Depth Shader Test (DoF)/assets/minecraft/shaders/program/blit_util.vsh
@@ -1,14 +1,14 @@
-#version 110
+#version 150
 
-attribute vec4 Position;
+in vec4 Position;
 
 uniform mat4 ProjMat;
 uniform vec2 InSize;
 
-varying vec2 texCoord;
-varying vec2 oneTexel;
+out vec2 texCoord;
+out vec2 oneTexel;
 
-void main(){
+void main() {
     vec4 outPos = ProjMat * vec4(Position.xy, 0.0, 1.0);
     gl_Position = vec4(outPos.xy, 0.2, 1.0);
 

diff --git a/Depth Shader Test (DoF)/assets/minecraft/shaders/program/depth_of_field.fsh b/Depth Shader Test (DoF)/assets/minecraft/shaders/program/depth_of_field.fsh
@@ -1,4 +1,4 @@
-#version 110
+#version 150
 
 uniform sampler2D BlurSampler;
 uniform sampler2D DiffuseSampler;
@@ -9,8 +9,9 @@ uniform sampler2D TranslucentDepthSampler;
 uniform vec2 FocusRange;
 uniform vec2 DepthScale;
 
-varying vec2 texCoord;
-varying vec2 oneTexel;
+in vec2 texCoord;
+in vec2 oneTexel;
+out vec4 fragColor;
 
 float near = 0.1; 
 float far  = 100.0; 
@@ -22,10 +23,10 @@ float LinearizeDepth(float depth)
 }
 
 void main() {
-    float depth = LinearizeDepth(texture2D(TranslucentDepthSampler, texCoord).r) / far; // divide by far for demonstration
+    float depth = LinearizeDepth(texture(TranslucentDepthSampler, texCoord).r) / far; // divide by far for demonstration
     depth = clamp(depth, 0.0, 1.0);
-    vec4 col = vec4(texture2D(DiffuseSampler, texCoord).rgb, 1.0);
-    vec4 col_blur = vec4(texture2D(BlurSampler, texCoord).rgb, 1.0);
+    vec4 col = vec4(texture(DiffuseSampler, texCoord).rgb, 1.0);
+    vec4 col_blur = vec4(texture(BlurSampler, texCoord).rgb, 1.0);
     vec2 focus_range = FocusRange;
     if (depth > focus_range.y) {
         depth *= DepthScale.x;
@@ -40,5 +41,5 @@ void main() {
         depth = clamp(depth, 0.0, 1.0);
         col = col*(depth) + col_blur*(1.0-depth);
     }
-    gl_FragColor = col;
+    fragColor = col;
 }
diff --git a/Depth Shader Test (DoF)/pack.mcmeta b/Depth Shader Test (DoF)/pack.mcmeta
@@ -1,6 +1,6 @@
 {
    "pack": {
-      "pack_format": 7,
+      "pack_format": 9,
       "description": "§bBy Onnowhere"
    }
 }
diff --git a/Depth Shader Test (Fog)/assets/minecraft/shaders/program/blit_util.vsh b/Depth Shader Test (Fog)/assets/minecraft/shaders/program/blit_util.vsh
@@ -1,14 +1,14 @@
-#version 110
+#version 150
 
-attribute vec4 Position;
+in vec4 Position;
 
 uniform mat4 ProjMat;
 uniform vec2 InSize;
 
-varying vec2 texCoord;
-varying vec2 oneTexel;
+out vec2 texCoord;
+out vec2 oneTexel;
 
-void main(){
+void main() {
     vec4 outPos = ProjMat * vec4(Position.xy, 0.0, 1.0);
     gl_Position = vec4(outPos.xy, 0.2, 1.0);
 

diff --git a/Depth Shader Test (Fog)/assets/minecraft/shaders/program/depth_test.fsh b/Depth Shader Test (Fog)/assets/minecraft/shaders/program/depth_test.fsh
@@ -1,12 +1,13 @@
-#version 110
+#version 150
 
 uniform sampler2D DiffuseSampler;
 uniform sampler2D DiffuseDepthSampler;
 
-varying vec2 texCoord;
-varying vec2 oneTexel;
+in vec2 texCoord;
+in vec2 oneTexel;
+out vec4 fragColor;
 
 void main() {
-    float col = 1.0-(1.0-texture2D(DiffuseDepthSampler, texCoord).r)*500.0;
-    gl_FragColor = vec4(vec3(col), 1.0);
+    float col = 1.0-(1.0-texture(DiffuseDepthSampler, texCoord).r)*500.0;
+    fragColor = vec4(vec3(col), 1.0);
 }
diff --git a/Depth Shader Test (Fog)/pack.mcmeta b/Depth Shader Test (Fog)/pack.mcmeta
@@ -1,6 +1,6 @@
 {
    "pack": {
-      "pack_format": 7,
+      "pack_format": 9,
       "description": "§bBy Onnowhere"
    }
 }
diff --git a/Depth Shader Test (Stripes)/assets/minecraft/shaders/program/blit_util.vsh b/Depth Shader Test (Stripes)/assets/minecraft/shaders/program/blit_util.vsh
@@ -1,14 +1,14 @@
-#version 110
+#version 150
 
-attribute vec4 Position;
+in vec4 Position;
 
 uniform mat4 ProjMat;
 uniform vec2 InSize;
 
-varying vec2 texCoord;
-varying vec2 oneTexel;
+out vec2 texCoord;
+out vec2 oneTexel;
 
-void main(){
+void main() {
     vec4 outPos = ProjMat * vec4(Position.xy, 0.0, 1.0);
     gl_Position = vec4(outPos.xy, 0.2, 1.0);
 

diff --git a/Depth Shader Test (Stripes)/assets/minecraft/shaders/program/stripes.fsh b/Depth Shader Test (Stripes)/assets/minecraft/shaders/program/stripes.fsh
@@ -1,9 +1,10 @@
-#version 110
+#version 150
 
 uniform sampler2D DiffuseSampler;
 uniform sampler2D DiffuseDepthSampler;
 
-varying vec2 texCoord;
+in vec2 texCoord;
+out vec4 fragColor;
 
 float near = 0.1; 
 float far  = 1000.0; 
@@ -15,10 +16,10 @@ float LinearizeDepth(float depth)
 }
 
 void main() {
-    float depth = LinearizeDepth(texture2D(DiffuseDepthSampler, texCoord).r);
+    float depth = LinearizeDepth(texture(DiffuseDepthSampler, texCoord).r);
     if (mod(depth, 1.0) <= 0.02) {
-        gl_FragColor = vec4(0.0,0.0,0.0,1.0);
+        fragColor = vec4(0.0,0.0,0.0,1.0);
     } else {
-        gl_FragColor = vec4(texture2D(DiffuseSampler, texCoord).rgb, 1.0);
+        fragColor = vec4(texture(DiffuseSampler, texCoord).rgb, 1.0);
     }
 }
diff --git a/Depth Shader Test (Stripes)/pack.mcmeta b/Depth Shader Test (Stripes)/pack.mcmeta
@@ -1,6 +1,6 @@
 {
    "pack": {
-      "pack_format": 7,
+      "pack_format": 9,
       "description": "§bBy Onnowhere"
    }
 }