glsl 1.20 💪

cgytrus · Sep 12, 2023 · 45a8e99 · 45a8e99
1 parent c96e6ee
commit 45a8e99
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/resources/shaders/pp-frag.glsl b/resources/shaders/pp-frag.glsl
@@ -1,19 +1,18 @@
-#version 150
+#version 120
 
-in vec2 TexCoords;
-
-out vec4 FragColor;
+varying vec2 TexCoords;
 
 uniform sampler2D screen;
+uniform vec2 screenSize;
 uniform bool fast;
 uniform bool first;
 uniform float radius;
 
 void main() {
-    float scaledRadius = radius * textureSize(screen, 0).y * 0.5;
-    vec2 texOffset = 1.0 / textureSize(screen, 0); // gets size of single texel
+    float scaledRadius = radius * screenSize.y * 0.5;
+    vec2 texOffset = 1.0 / screenSize; // gets size of single texel
 
-    vec3 result = texture(screen, TexCoords.st).rgb;
+    vec3 result = texture2D(screen, TexCoords.st).rgb;
     if (fast) {
         scaledRadius *= radius * 10.0 / ((radius * 10.0 + 1.0) * (radius * 10.0 + 1.0) - 1.0);
         float weight = 1.0;
@@ -22,16 +21,16 @@ void main() {
             for (int i = 1; float(i) < scaledRadius; i++) {
                 weight -= 1.0 / scaledRadius;
                 weightSum += weight * 2.0;
-                result += texture(screen, TexCoords.st + vec2(texOffset.x * i, 0.0)).rgb * weight;
-                result += texture(screen, TexCoords.st - vec2(texOffset.x * i, 0.0)).rgb * weight;
+                result += texture2D(screen, TexCoords.st + vec2(texOffset.x * i, 0.0)).rgb * weight;
+                result += texture2D(screen, TexCoords.st - vec2(texOffset.x * i, 0.0)).rgb * weight;
             }
         }
         else {
             for (int i = 1; float(i) < scaledRadius; i++) {
                 weight -= 1.0 / scaledRadius;
                 weightSum += weight * 2.0;
-                result += texture(screen, TexCoords.st + vec2(0.0, texOffset.y * i)).rgb * weight;
-                result += texture(screen, TexCoords.st - vec2(0.0, texOffset.y * i)).rgb * weight;
+                result += texture2D(screen, TexCoords.st + vec2(0.0, texOffset.y * i)).rgb * weight;
+                result += texture2D(screen, TexCoords.st - vec2(0.0, texOffset.y * i)).rgb * weight;
             }
         }
         result /= weightSum;
@@ -44,20 +43,20 @@ void main() {
             for (int i = 1; float(i) <= ceil(scaledRadius); i++) {
                 float weight = firstWeight * exp(-i * i / (2.0 * scaledRadius));
                 weightSum += weight * 2;
-                result += texture(screen, TexCoords.st + vec2(texOffset.x * i, 0.0)).rgb * weight;
-                result += texture(screen, TexCoords.st - vec2(texOffset.x * i, 0.0)).rgb * weight;
+                result += texture2D(screen, TexCoords.st + vec2(texOffset.x * i, 0.0)).rgb * weight;
+                result += texture2D(screen, TexCoords.st - vec2(texOffset.x * i, 0.0)).rgb * weight;
             }
         }
         else {
             for (int i = 1; float(i) <= ceil(scaledRadius); i++) {
                 float weight = firstWeight * exp(-i * i / (2.0 * scaledRadius));
                 weightSum += weight * 2;
-                result += texture(screen, TexCoords.st + vec2(0.0, texOffset.y * i)).rgb * weight;
-                result += texture(screen, TexCoords.st - vec2(0.0, texOffset.y * i)).rgb * weight;
+                result += texture2D(screen, TexCoords.st + vec2(0.0, texOffset.y * i)).rgb * weight;
+                result += texture2D(screen, TexCoords.st - vec2(0.0, texOffset.y * i)).rgb * weight;
             }
         }
         result /= weightSum;
     }
 
-    FragColor = vec4(result, 1.0);
+    gl_FragColor = vec4(result, 1.0);
 }
diff --git a/resources/shaders/pp-vert.glsl b/resources/shaders/pp-vert.glsl
@@ -1,10 +1,11 @@
-#version 150
-#extension GL_ARB_explicit_attrib_location : enable
+#version 120
+#extension GL_ARB_explicit_attrib_location : require
+#extension GL_ARB_separate_shader_objects : require
 
-in layout(location = 0) vec2 aPosition;
-in layout(location = 1) vec2 aTexCoords;
+attribute layout(location = 0) vec2 aPosition;
+attribute layout(location = 1) vec2 aTexCoords;
 
-out vec2 TexCoords;
+varying vec2 TexCoords;
 
 void main() {
     gl_Position = vec4(aPosition.x, aPosition.y, 0.0, 1.0);

diff --git a/src/pp.cpp b/src/pp.cpp
@@ -198,7 +198,8 @@ void setupPostProcess() {
         return;
     }
     log::info("{}", res.unwrap());
-    glUniform1i(glGetUniformLocation(ppShader.program, "screen"), 0);
+    glProgramUniform1i(ppShader.program, glGetUniformLocation(ppShader.program, "screen"), 0);
+    glProgramUniform2f(ppShader.program, glGetUniformLocation(ppShader.program, "screenSize"), size.width, size.height);
     ppShaderFast = glGetUniformLocation(ppShader.program, "fast");
     ppShaderFirst = glGetUniformLocation(ppShader.program, "first");
     ppShaderRadius = glGetUniformLocation(ppShader.program, "radius");