Print different message for invalid sv->cl cmd. Improve consistency overall

[xonotic/darkplaces.git] / r_shadow.c

diff --git a/r_shadow.c b/r_shadow.c
index 12941412e1778c8770e9ad0914e3dfdcf6046f8e..0dbcdfab36906d321d41382cbb2a5de007411f8c 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -1536,7 +1536,6 @@ static void R_Shadow_RenderMode_ShadowMap(int side, int size, int x, int y)
        float nearclip, farclip, bias;
        r_viewport_t viewport;
        int flipped;
-       float clearcolor[4];
 
        if (r_shadow_rendermode != R_SHADOW_RENDERMODE_SHADOWMAP2D)
        {
@@ -1565,7 +1564,6 @@ static void R_Shadow_RenderMode_ShadowMap(int side, int size, int x, int y)
        r_refdef.view.cullface_front = flipped ? r_shadow_cullface_back : r_shadow_cullface_front;
        r_refdef.view.cullface_back = flipped ? r_shadow_cullface_front : r_shadow_cullface_back;
 
-       Vector4Set(clearcolor, 1,1,1,1);
        if (r_shadow_shadowmap2ddepthbuffer)
                GL_ColorMask(1,1,1,1);
        else
@@ -1724,7 +1722,6 @@ static void R_Shadow_BounceGrid_GenerateSettings(r_shadow_bouncegrid_settings_t
        settings->rng_type                      = r_shadow_bouncegrid_rng_type.integer;
        settings->rng_seed                      = r_shadow_bouncegrid_rng_seed.integer;
        settings->bounceminimumintensity2       = bounceminimumintensity * bounceminimumintensity;
-       settings->bounceminimumintensity2       = bounceminimumintensity * bounceminimumintensity;
        settings->normalizevectors              = r_shadow_bouncegrid_normalizevectors.integer != 0;
        settings->subsamples                    = bound(1, r_shadow_bouncegrid_subsamples.integer, 4);
 
@@ -1948,8 +1945,6 @@ static void R_Shadow_BounceGrid_AssignPhotons_Task(taskqueue_task_t *t)
        randomseed_t randomseed;
        vec3_t baseshotcolor;
 
-       t->started = 1;
-
        normalphotonscaling = 1.0f / max(0.0000001f, r_shadow_bouncegrid_state.settings.energyperphoton);
        for (lightindex = 0;lightindex < range2;lightindex++)
        {
@@ -2333,7 +2328,6 @@ static void R_Shadow_BounceGrid_Slice(int zi)
 
 static void R_Shadow_BounceGrid_Slice_Task(taskqueue_task_t *t)
 {
-       t->started = 1;
        R_Shadow_BounceGrid_Slice((int)t->i[0]);
        t->done = 1;
 }
@@ -2347,7 +2341,6 @@ static void R_Shadow_BounceGrid_EnqueueSlices_Task(taskqueue_task_t *t)
                TaskQueue_Yield(t);
                return;
        }
-       t->started = 1;
        slices = r_shadow_bouncegrid_state.resolution[2] - 2;
        for (i = 0; i < slices; i++)
                TaskQueue_Setup(r_shadow_bouncegrid_state.slices_tasks + i, NULL, R_Shadow_BounceGrid_Slice_Task, i + 1, 0, NULL, NULL);
@@ -2393,7 +2386,6 @@ static void R_Shadow_BounceGrid_BlurPixels_Task(taskqueue_task_t *t)
 {
        float *pixels[4];
        unsigned int resolution[3];
-       t->started = 1;
        if (r_shadow_bouncegrid_state.settings.blur)
        {
                VectorCopy(r_shadow_bouncegrid_state.resolution, resolution);
@@ -2593,7 +2585,6 @@ static void R_Shadow_BounceGrid_ConvertPixelsAndUpload(void)
 
 void R_Shadow_BounceGrid_ClearTex_Task(taskqueue_task_t *t)
 {
-       t->started = 1;
        memset(r_shadow_bouncegrid_state.highpixels, 0, r_shadow_bouncegrid_state.numpixels * sizeof(float[4]));
        t->done = 1;
 }
@@ -2730,7 +2721,6 @@ static void R_Shadow_BounceGrid_TracePhotons_Shot(r_shadow_bouncegrid_photon_t *
 static void R_Shadow_BounceGrid_TracePhotons_ShotTask(taskqueue_task_t *t)
 {
        r_shadow_bouncegrid_photon_t *p = (r_shadow_bouncegrid_photon_t *)t->p[0];
-       t->started = 1;
        R_Shadow_BounceGrid_TracePhotons_Shot(p, r_shadow_bouncegrid_state.settings.maxbounce, p->start, p->end, p->color, p->bounceminimumintensity2, p->startrefractiveindex);
        t->done = 1;
 }
@@ -2738,7 +2728,6 @@ static void R_Shadow_BounceGrid_TracePhotons_ShotTask(taskqueue_task_t *t)
 static void R_Shadow_BounceGrid_EnqueuePhotons_Task(taskqueue_task_t *t)
 {
        int i;
-       t->started = 1;
        for (i = 0; i < r_shadow_bouncegrid_state.numphotons; i++)
                TaskQueue_Setup(r_shadow_bouncegrid_state.photons_tasks + i, NULL, R_Shadow_BounceGrid_TracePhotons_ShotTask, 0, 0, r_shadow_bouncegrid_state.photons + i, NULL);
        TaskQueue_Setup(&r_shadow_bouncegrid_state.photons_done_task, NULL, TaskQueue_Task_CheckTasksDone, r_shadow_bouncegrid_state.numphotons, 0, r_shadow_bouncegrid_state.photons_tasks, NULL);
@@ -3727,7 +3716,7 @@ static void R_Shadow_DrawLightShadowMaps(rtlight_t *rtlight)
 {
        int i;
        int numsurfaces;
-       unsigned char *shadowtrispvs, *lighttrispvs, *surfacesides;
+       unsigned char *shadowtrispvs, *surfacesides;
        int numlightentities;
        int numlightentities_noselfshadow;
        int numshadowentities;
@@ -3775,7 +3764,6 @@ static void R_Shadow_DrawLightShadowMaps(rtlight_t *rtlight)
        shadowentities = rtlight->cached_shadowentities;
        shadowentities_noselfshadow = rtlight->cached_shadowentities_noselfshadow;
        shadowtrispvs = rtlight->cached_shadowtrispvs;
-       lighttrispvs = rtlight->cached_lighttrispvs;
        surfacelist = rtlight->cached_surfacelist;
 
        // make this the active rtlight for rendering purposes
@@ -3870,11 +3858,9 @@ static void R_Shadow_DrawLight(rtlight_t *rtlight)
 {
        int i;
        int numsurfaces;
-       unsigned char *shadowtrispvs, *lighttrispvs;
+       unsigned char *lighttrispvs;
        int numlightentities;
        int numlightentities_noselfshadow;
-       int numshadowentities;
-       int numshadowentities_noselfshadow;
        entity_render_t **lightentities;
        entity_render_t **lightentities_noselfshadow;
        entity_render_t **shadowentities;
@@ -3896,14 +3882,11 @@ static void R_Shadow_DrawLight(rtlight_t *rtlight)
 
        numlightentities = rtlight->cached_numlightentities;
        numlightentities_noselfshadow = rtlight->cached_numlightentities_noselfshadow;
-       numshadowentities = rtlight->cached_numshadowentities;
-       numshadowentities_noselfshadow = rtlight->cached_numshadowentities_noselfshadow;
        numsurfaces = rtlight->cached_numsurfaces;
        lightentities = rtlight->cached_lightentities;
        lightentities_noselfshadow = rtlight->cached_lightentities_noselfshadow;
        shadowentities = rtlight->cached_shadowentities;
        shadowentities_noselfshadow = rtlight->cached_shadowentities_noselfshadow;
-       shadowtrispvs = rtlight->cached_shadowtrispvs;
        lighttrispvs = rtlight->cached_lighttrispvs;
        surfacelist = rtlight->cached_surfacelist;
        castshadows = rtlight->castshadows;
@@ -3928,7 +3911,6 @@ static void R_Shadow_DrawLight(rtlight_t *rtlight)
        {
                float borderbias;
                int size;
-               float shadowmapoffsetnoselfshadow = 0;
                matrix4x4_t radiustolight = rtlight->matrix_worldtolight;
                Matrix4x4_Abs(&radiustolight);
 
@@ -3937,9 +3919,6 @@ static void R_Shadow_DrawLight(rtlight_t *rtlight)
 
                //Con_Printf("distance %f lodlinear %i size %i\n", distance, lodlinear, size);
 
-               if (rtlight->cached_numshadowentities_noselfshadow)
-                       shadowmapoffsetnoselfshadow = rtlight->shadowmapatlassidesize * 2;
-
                // render lighting using the depth texture as shadowmap
                // draw lighting in the unmasked areas
                if (numsurfaces + numlightentities)