Fix texture binding issues that were breaking r_shadow_bouncegrid.

[xonotic/darkplaces.git] / gl_rmain.c

diff --git a/gl_rmain.c b/gl_rmain.c
index d6ea4baf56561ff29fee0d6fb6142aae31d9cd09..8be5a2d8906e7c8af20029ac3615416f6e514389 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -69,12 +69,6 @@ cvar_t r_motionblur_mousefactor = {CVAR_SAVE, "r_motionblur_mousefactor", "2", "
 cvar_t r_motionblur_mousefactor_minspeed = {CVAR_SAVE, "r_motionblur_mousefactor_minspeed", "0", "lower value of mouse acceleration when it starts to factor into blur equation"};
 cvar_t r_motionblur_mousefactor_maxspeed = {CVAR_SAVE, "r_motionblur_mousefactor_maxspeed", "50", "upper value of mouse acceleration when it reaches the peak factor into blur equation"};
 
-// TODO do we want a r_equalize_entities cvar that works on all ents, or would that be a cheat?
-cvar_t r_equalize_entities_fullbright = {CVAR_SAVE, "r_equalize_entities_fullbright", "0", "render fullbright entities by equalizing their lightness, not by not rendering light (DEPRECATED)"};
-cvar_t r_equalize_entities_minambient = {CVAR_SAVE, "r_equalize_entities_minambient", "0.5", "light equalizing: ensure at least this ambient/diffuse ratio (DEPRECATED)"};
-cvar_t r_equalize_entities_by = {CVAR_SAVE, "r_equalize_entities_by", "0.7", "light equalizing: exponent of dynamics compression (0 = no compression, 1 = full compression) (DEPRECATED)"};
-cvar_t r_equalize_entities_to = {CVAR_SAVE, "r_equalize_entities_to", "0.8", "light equalizing: target light level (DEPRECATED)"};
-
 cvar_t r_depthfirst = {CVAR_SAVE, "r_depthfirst", "0", "renders a depth-only version of the scene before normal rendering begins to eliminate overdraw, values: 0 = off, 1 = world depth, 2 = world and model depth"};
 cvar_t r_useinfinitefarclip = {CVAR_SAVE, "r_useinfinitefarclip", "1", "enables use of a special kind of projection matrix that has an extremely large farclip"};
 cvar_t r_farclip_base = {0, "r_farclip_base", "65536", "farclip (furthest visible distance) for rendering when r_useinfinitefarclip is 0"};
@@ -581,7 +575,7 @@ static void R_BuildFogHeightTexture(void)
        r_refdef.fog_height_table2d = (unsigned char *)Mem_Alloc(r_main_mempool, size * size * 4);
        memcpy(r_refdef.fog_height_table1d, inpixels, size * 4);
        Mem_Free(inpixels);
-       // LordHavoc: now the magic - what is that table2d for?  it is a cooked
+       // LadyHavoc: now the magic - what is that table2d for?  it is a cooked
        // average fog color table accounting for every fog layer between a point
        // and the camera.  (Note: attenuation is handled separately!)
        for (y = 0;y < size;y++)
@@ -3202,10 +3196,6 @@ void GL_Main_Init(void)
        Cvar_RegisterVariable(&r_motionblur_mousefactor);
        Cvar_RegisterVariable(&r_motionblur_mousefactor_minspeed);
        Cvar_RegisterVariable(&r_motionblur_mousefactor_maxspeed);
-       Cvar_RegisterVariable(&r_equalize_entities_fullbright);
-       Cvar_RegisterVariable(&r_equalize_entities_minambient);
-       Cvar_RegisterVariable(&r_equalize_entities_by);
-       Cvar_RegisterVariable(&r_equalize_entities_to);
        Cvar_RegisterVariable(&r_depthfirst);
        Cvar_RegisterVariable(&r_useinfinitefarclip);
        Cvar_RegisterVariable(&r_farclip_base);
@@ -3488,7 +3478,7 @@ int R_CullBoxCustomPlanes(const vec3_t mins, const vec3_t maxs, int numplanes, c
 
 //==================================================================================
 
-// LordHavoc: this stores temporary data used within the same frame
+// LadyHavoc: this stores temporary data used within the same frame
 
 typedef struct r_framedata_mem_s
 {
@@ -3761,7 +3751,7 @@ r_meshbuffer_t *R_BufferData_Store(size_t datasize, const void *data, r_bufferda
 
 //==================================================================================
 
-// LordHavoc: animcache originally written by Echon, rewritten since then
+// LadyHavoc: animcache originally written by Echon, rewritten since then
 
 /**
  * Animation cache prevents re-generating mesh data for an animated model
@@ -4348,7 +4338,7 @@ static void R_View_SetFrustum(const int *scissor)
        for (i = 0;i < r_refdef.view.numfrustumplanes;i++)
                PlaneClassify(r_refdef.view.frustum + i);
 
-       // LordHavoc: note to all quake engine coders, Quake had a special case
+       // LadyHavoc: note to all quake engine coders, Quake had a special case
        // for 90 degrees which assumed a square view (wrong), so I removed it,
        // Quake2 has it disabled as well.
 
@@ -6764,7 +6754,7 @@ texture_t *R_GetCurrentTexture(texture_t *t)
                t->currentmaterialflags |= MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
        else if (t->currentalpha < 1)
                t->currentmaterialflags |= MATERIALFLAG_ALPHA | MATERIALFLAG_BLENDED | MATERIALFLAG_NOSHADOW;
-       // LordHavoc: prevent bugs where code checks add or alpha at higher priority than customblend by clearing these flags
+       // LadyHavoc: prevent bugs where code checks add or alpha at higher priority than customblend by clearing these flags
        if (t->currentmaterialflags & MATERIALFLAG_CUSTOMBLEND)
                t->currentmaterialflags &= ~(MATERIALFLAG_ADD | MATERIALFLAG_ALPHA);
        if (rsurface.ent_flags & RENDER_DOUBLESIDED)