zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-22 04:01:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Temporary measure to avoid crashing in non-rtx mode

Browse source
This commit is contained in:
RaveYard 2023-09-20 23:52:18 +02:00 committed by Christoph Oelckers
parent e0b349b331
commit 3474dac9d0
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
wadsrc/static/shaders/lightmap/frag_raytrace.glsl
View file

@ -512,7 +512,7 @@ int TraceFirstHitTriangleNoPortal(vec3 origin, float tmin, vec3 dir, float tmax,
vec4 alphaBlend(vec4 a, vec4 b)
{
float na = a.w + b.w * (1.0 - a.w);
return vec4((a.xyz * a.w + b.xyz * b.w * (1.0 - a.w)) / na, na);
return vec4((a.xyz * a.w + b.xyz * b.w * (1.0 - a.w)) / na, max(0.001, na));
}
vec4 blend(vec4 a, vec4 b)
@ -536,6 +536,7 @@ int TraceFirstHitTriangleT(vec3 origin, float tmin, vec3 dir, float tmax, out fl
if(surface.PortalIndex == 0)
{
#if defined(USE_RAYQUERY)
int index = primitiveID * 3;
vec2 uv = vertices[elements[index + 0]].uv * primitiveWeights.x + vertices[elements[index + 1]].uv * primitiveWeights.y + vertices[elements[index + 2]].uv * primitiveWeights.z;
@ -553,6 +554,9 @@ int TraceFirstHitTriangleT(vec3 origin, float tmin, vec3 dir, float tmax, out fl
}
rayColor = blend(color, rayColor) * (1.0 - color.w);
#else
break;
#endif
}
// Portal was hit: Apply transformation onto the ray
@ -598,6 +602,7 @@ bool TracePoint(vec3 origin, vec3 target, float tmin, vec3 dir, float tmax)
if (surface.PortalIndex == 0)
{
#if defined(USE_RAYQUERY)
int index = primitiveID * 3;
vec2 uv = vertices[elements[index + 0]].uv * primitiveWeights.x + vertices[elements[index + 1]].uv * primitiveWeights.y + vertices[elements[index + 2]].uv * primitiveWeights.z;
@ -615,6 +620,10 @@ bool TracePoint(vec3 origin, vec3 target, float tmin, vec3 dir, float tmax)
}
rayColor = blend(color, rayColor) * (1.0 - color.w);
#else
rayColor.w = 0; // I suspect some rays are escaping out of bounds
break;
#endif
}
if(dot(surface.Normal, dir) >= 0.0)