nudge dlights out of walls if they're too close

[xonotic/darkplaces.git] / r_shadow.c

diff --git a/r_shadow.c b/r_shadow.c
index 9fae3b8203786a5f5cb44c49e96d0bb9c97f9d73..058d5589b96c125b7e19b444ae747487b6b80f49 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -542,6 +542,7 @@ void R_Shadow_Stage_Begin(void)
        m.blendfunc2 = GL_ZERO;
        R_Mesh_State(&m);
        GL_Color(0, 0, 0, 1);
+       qglDisable(GL_SCISSOR_TEST);
        r_shadowstage = SHADOWSTAGE_NONE;
 
        c_rt_lights = c_rt_clears = c_rt_scissored = 0;
@@ -816,7 +817,9 @@ int R_Shadow_ScissorForBBox(const float *mins, const float *maxs)
        if (!r_shadow_scissor.integer)
                return false;
        // if view is inside the box, just say yes it's visible
-       if (BoxesOverlap(r_origin, r_origin, mins, maxs))
+       // LordHavoc: for some odd reason scissor seems broken without stencil
+       // (?!?  seems like a driver bug) so abort if gl_stencil is false
+       if (!gl_stencil || BoxesOverlap(r_origin, r_origin, mins, maxs))
        {
                qglDisable(GL_SCISSOR_TEST);
                return false;
@@ -838,8 +841,7 @@ int R_Shadow_ScissorForBBox(const float *mins, const float *maxs)
        if (DotProduct(vpn, v2) <= f)
        {
                // entirely behind nearclip plane
-               qglDisable(GL_SCISSOR_TEST);
-               return false;
+               return true;
        }
        if (DotProduct(vpn, v) >= f)
        {