Make the VBO handling in RSurf_PrepareVerticesForBatch much more consistent by refact...

[xonotic/darkplaces.git] / r_shadow.c

diff --git a/r_shadow.c b/r_shadow.c
index b26d9e9d789d16c296a700315676e5659c6c81b5..56febbd8b66c5d60d3beebc13aa90d4b7cb2f600 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -1202,7 +1202,7 @@ static void R_Shadow_MakeTextures_MakeCorona(void)
                        pixels[y][x][3] = 255;
                }
        }
-       r_shadow_lightcorona = R_SkinFrame_LoadInternalBGRA("lightcorona", TEXF_FORCELINEAR, &pixels[0][0][0], 32, 32, false);
+       r_shadow_lightcorona = R_SkinFrame_LoadInternalBGRA("lightcorona", TEXF_FORCELINEAR, &pixels[0][0][0], 32, 32, 0, 0, 0, false);
 }
 
 static unsigned int R_Shadow_MakeTextures_SamplePoint(float x, float y, float z)
@@ -2923,7 +2923,7 @@ void R_Shadow_RenderLighting(int texturenumsurfaces, const msurface_t **textures
        VectorMultiply(specularcolor, rsurface.rtlight->currentcolor, specularcolor);
        if (VectorLength2(ambientcolor) + VectorLength2(diffusecolor) + VectorLength2(specularcolor) < (1.0f / 1048576.0f))
                return;
-       negated = (rsurface.rtlight->currentcolor[0] + rsurface.rtlight->currentcolor[1] + rsurface.rtlight->currentcolor[2] < 0) && vid.support.ext_blend_subtract;
+       negated = (rsurface.rtlight->currentcolor[0] + rsurface.rtlight->currentcolor[1] + rsurface.rtlight->currentcolor[2] < 0);
        if(negated)
        {
                VectorNegate(ambientcolor, ambientcolor);
@@ -4529,7 +4529,7 @@ static void R_DrawCorona(rtlight_t *rtlight, float cscale, float scale)
        if (VectorLength(color) > (1.0f / 256.0f))
        {
                float vertex3f[12];
-               qboolean negated = (color[0] + color[1] + color[2] < 0) && vid.support.ext_blend_subtract;
+               qboolean negated = (color[0] + color[1] + color[2] < 0);
                if(negated)
                {
                        VectorNegate(color, color);