From 4ec3a2fcccf8c77ff4018c7baef33f7f75388a66 Mon Sep 17 00:00:00 2001 From: LordMZTE Date: Thu, 2 Nov 2023 07:06:32 +0100 Subject: [PATCH] wlbg: don't use deprecated functions in shaders --- scripts/wlbg/src/bg_frag.glsl | 4 +++- scripts/wlbg/src/bg_vert.glsl | 2 +- scripts/wlbg/src/main_frag.glsl | 4 +++- scripts/wlbg/src/main_vert.glsl | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/wlbg/src/bg_frag.glsl b/scripts/wlbg/src/bg_frag.glsl index a6f1708..b2b6aa0 100644 --- a/scripts/wlbg/src/bg_frag.glsl +++ b/scripts/wlbg/src/bg_frag.glsl @@ -6,6 +6,8 @@ uniform float time; in vec2 fragCoord; +out vec4 fragColor; + // shader: https://www.shadertoy.com/view/Ms2SDc const float PI=3.14159265358979323846; @@ -62,5 +64,5 @@ void main() { float c=(n.x+n.y+n.z)*0.1; vec3 color=vec3(c,c,c)-t*0.0625; //color*=0.6+0.4*rand(vec2(t,t),iTime); // noise! - gl_FragColor=vec4(vec3(c+t*0.08,c+t*0.02,c*1.5-t*0.01)+color*color,1.0); + fragColor=vec4(vec3(c+t*0.08,c+t*0.02,c*1.5-t*0.01)+color*color,1.0); } diff --git a/scripts/wlbg/src/bg_vert.glsl b/scripts/wlbg/src/bg_vert.glsl index 5356098..df32e1c 100644 --- a/scripts/wlbg/src/bg_vert.glsl +++ b/scripts/wlbg/src/bg_vert.glsl @@ -4,7 +4,7 @@ precision mediump float; uniform vec2 offset; -attribute vec4 vPos; +in vec4 vPos; out vec2 fragCoord; diff --git a/scripts/wlbg/src/main_frag.glsl b/scripts/wlbg/src/main_frag.glsl index 8ec2e89..aedd328 100644 --- a/scripts/wlbg/src/main_frag.glsl +++ b/scripts/wlbg/src/main_frag.glsl @@ -10,11 +10,13 @@ uniform float hasCursor; in vec2 fragCoord; in vec2 fragUv; +out vec4 fragColor; + void main() { vec2 diff = cursorPos - fragUv; float light = clamp(.1 - (diff.x * diff.x + diff.y * diff.y), 0.0, 1.0); vec2 zoomedUv = fragUv * .9 + (.1 / 2.0); - gl_FragColor = mix(texture(bg, zoomedUv + (cursorPos - .5) / 10.0), vec4(1.0), light * hasCursor); + fragColor = mix(texture(bg, zoomedUv + (cursorPos - .5) / 10.0), vec4(1.0), light * hasCursor); } diff --git a/scripts/wlbg/src/main_vert.glsl b/scripts/wlbg/src/main_vert.glsl index 0b5b066..3404cab 100644 --- a/scripts/wlbg/src/main_vert.glsl +++ b/scripts/wlbg/src/main_vert.glsl @@ -2,8 +2,8 @@ precision mediump float; -attribute vec4 vPos; -attribute vec2 uv; +in vec4 vPos; +in vec2 uv; out vec2 fragCoord; out vec2 fragUv;