qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-29 23:52:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[glsl] Fix some GLSL conformance issues

Browse source 
I'm not sure when things broke on my laptop (I thought I got warp and
fisheye working on my laptop), but it turns out things weren't quite
right, thus warp (and presumably fisheye) weren't working properly due
to GLSL errors that I only just noticed. This fixes water warp (and
probably fisheye).
This commit is contained in:
Bill Currie 2022-11-03 16:42:49 +09:00
parent ea3ff47cc5
commit a07eccd5c7
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/video/renderer/glsl/glsl_fisheye.c
View file

@ -53,12 +53,14 @@
static const char *fisheye_vert_effects[] = static const char *fisheye_vert_effects[] =
{ {
"QuakeForge.version.130",
"QuakeForge.Vertex.fstri", "QuakeForge.Vertex.fstri",
0 0
}; };
static const char *fisheye_frag_effects[] = static const char *fisheye_frag_effects[] =
{ {
"QuakeForge.version.130",
"QuakeForge.Math.const", "QuakeForge.Math.const",
"QuakeForge.Fragment.screen.fisheye", "QuakeForge.Fragment.screen.fisheye",
0 0

2
libs/video/renderer/glsl/glsl_warp.c
View file

@ -53,12 +53,14 @@
static const char *warp_vert_effects[] = static const char *warp_vert_effects[] =
{ {
"QuakeForge.version.130",
"QuakeForge.Vertex.fstri", "QuakeForge.Vertex.fstri",
0 0
}; };
static const char *warp_frag_effects[] = static const char *warp_frag_effects[] =
{ {
"QuakeForge.version.130",
"QuakeForge.Math.const", "QuakeForge.Math.const",
"QuakeForge.Fragment.screen.warp", "QuakeForge.Fragment.screen.warp",
0 0

8
libs/video/renderer/glsl/quakeforge.glsl
View file

@ -552,8 +552,9 @@ main (void)
gl_FragColor = fogBlend (col); gl_FragColor = fogBlend (col);
} }
-- Vertex.fstri -- version.130
#version 130 #version 130
-- Vertex.fstri
out vec2 uv; out vec2 uv;
@ -582,8 +583,9 @@ const vec2 B = vec2 (1, 1);
void void
main () main ()
{ {
uv = uv * (1.0 - 2.0*A) + A * (B + sin ((time * S + F * uv.yx) * 2.0*PI)); vec2 st;
vec4 c = texture2D (screenTex, uv); st = uv * (1.0 - 2.0*A) + A * (B + sin ((time * S + F * uv.yx) * 2.0*PI));
vec4 c = texture2D (screenTex, st);
gl_FragColor = c;//vec4(uv, c.x, 1); gl_FragColor = c;//vec4(uv, c.x, 1);
} }