got rid of lots of unnecessary m.transparent = lines, as well as some depthdisable...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2291 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_particles.c b/cl_particles.c
index 2c9f2147ae54b0938dba14d9cb9d8cb67fcabddb..be86db568bf96f0d113f6590e21679ea30b02eb8 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -1266,7 +1266,6 @@ void R_DrawParticleCallback(void *calldata1, int calldata2)
        }
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        if (additive)
                m.blendfunc2 = GL_ONE;

diff --git a/gl_models.c b/gl_models.c
index acfd701bb0f703c6b057789b14aa1ba8d9aa28ea..bf87df5a9993edeecc3c747ab7e020d32cdf407a 100644 (file)
--- a/gl_models.c
+++ b/gl_models.c
@@ -276,19 +276,16 @@ void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
                memset(&m, 0, sizeof(m));
                if (ent->effects & EF_ADDITIVE)
                {
-                       m.transparent = true;
                        m.blendfunc1 = GL_SRC_ALPHA;
                        m.blendfunc2 = GL_ONE;
                }
                else if (ent->alpha != 1.0 || skinframe->fog != NULL)
                {
-                       m.transparent = true;
                        m.blendfunc1 = GL_SRC_ALPHA;
                        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
                }
                else
                {
-                       m.transparent = false;
                        m.blendfunc1 = GL_ONE;
                        m.blendfunc2 = GL_ZERO;
                }
@@ -336,19 +333,16 @@ void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
        memset(&m, 0, sizeof(m));
        if (ent->effects & EF_ADDITIVE)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE;
        }
        else if (ent->alpha != 1.0 || skinframe->fog != NULL)
        {
-               m.transparent = true;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
@@ -370,7 +364,6 @@ void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
                if (skinframe->pants)
                {
                        memset(&m, 0, sizeof(m));
-                       m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
                        m.blendfunc1 = GL_SRC_ALPHA;
                        m.blendfunc2 = GL_ONE;
                        m.numtriangles = model->numtris;
@@ -392,7 +385,6 @@ void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
                if (skinframe->shirt)
                {
                        memset(&m, 0, sizeof(m));
-                       m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
                        m.blendfunc1 = GL_SRC_ALPHA;
                        m.blendfunc2 = GL_ONE;
                        m.numtriangles = model->numtris;
@@ -415,7 +407,6 @@ void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
        if (skinframe->glow)
        {
                memset(&m, 0, sizeof(m));
-               m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE;
                m.numtriangles = model->numtris;
@@ -434,7 +425,6 @@ void R_DrawQ1Q2AliasModelCallback (void *calldata1, int calldata2)
        if (fog)
        {
                memset(&m, 0, sizeof(m));
-               m.transparent = ent->effects & EF_ADDITIVE || ent->alpha != 1.0 || skinframe->fog != NULL;
                m.blendfunc1 = GL_SRC_ALPHA;
                m.blendfunc2 = GL_ONE;
                m.numtriangles = model->numtris;
@@ -760,7 +750,6 @@ void R_DrawZymoticModelMeshCallback (void *calldata1, int calldata2)
        memset(&mbuf, 0, sizeof(mbuf));
        mbuf.numverts = m->numverts;
        mbuf.numtriangles = renderlist[0];
-       mbuf.transparent = false;
        if (ent->effects & EF_ADDITIVE)
        {
                mbuf.blendfunc1 = GL_SRC_ALPHA;
@@ -793,7 +782,6 @@ void R_DrawZymoticModelMeshCallback (void *calldata1, int calldata2)
                memset(&mbuf, 0, sizeof(mbuf));
                mbuf.numverts = m->numverts;
                mbuf.numtriangles = renderlist[0];
-               mbuf.transparent = false;
                mbuf.blendfunc1 = GL_SRC_ALPHA;
                mbuf.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
                // FIXME: need alpha mask for fogging...

diff --git a/gl_rsurf.c b/gl_rsurf.c
index c0dbab4600164a26156be8cdef6a68a1903837c6..10002fff7069a86d118fb7c79f188986b97e9faa 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -641,7 +641,6 @@ static void RSurfShader_Sky(entity_render_t *ent, msurface_t *firstsurf)
        {
                // draw depth-only polys
                memset(&m, 0, sizeof(m));
-               m.transparent = false;
                if (skyrendermasked)
                {
                        m.blendfunc1 = GL_ZERO;
@@ -652,7 +651,6 @@ static void RSurfShader_Sky(entity_render_t *ent, msurface_t *firstsurf)
                {
                        m.blendfunc1 = GL_ONE;
                        m.blendfunc2 = GL_ZERO;
-                       m.depthwrite = false;
                }
                for (mesh = surf->mesh;mesh;mesh = mesh->chain)
                {
@@ -757,12 +755,9 @@ static void RSurfShader_Water_Pass_Base(entity_render_t *ent, msurface_t *surf)
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        if (surf->flags & SURF_DRAWFULLBRIGHT || ent->effects & EF_FULLBRIGHT)
        {
@@ -871,8 +866,6 @@ static void RSurfShader_Water_Pass_Fog(entity_render_t *ent, msurface_t *surf)
        m.transparent = ent->effects & EF_ADDITIVE || surf->currenttexture->fogtexture != NULL || alpha < 1;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->fogtexture);
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
@@ -938,12 +931,9 @@ static void RSurfShader_Wall_Pass_BaseVertex(entity_render_t *ent, msurface_t *s
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
 
        size3 = ((surf->extents[0]>>4)+1)*((surf->extents[1]>>4)+1)*3;
@@ -1052,12 +1042,9 @@ static void RSurfShader_Wall_Pass_BaseFullbright(entity_render_t *ent, msurface_
        }
        else
        {
-               m.transparent = false;
                m.blendfunc1 = GL_ONE;
                m.blendfunc2 = GL_ZERO;
        }
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        ca = ent->alpha;
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
@@ -1176,11 +1163,8 @@ static void RSurfShader_OpaqueWall_Pass_TripleTexCombine(entity_render_t *ent, m
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        m.texrgbscale[0] = 1.0f;
        m.tex[1] = R_GetTexture(surf->lightmaptexture);
@@ -1222,11 +1206,8 @@ static void RSurfShader_OpaqueWall_Pass_BaseMTex(entity_render_t *ent, msurface_
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        m.tex[1] = R_GetTexture(surf->lightmaptexture);
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
@@ -1262,11 +1243,8 @@ static void RSurfShader_OpaqueWall_Pass_BaseTexture(entity_render_t *ent, msurfa
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
@@ -1299,11 +1277,8 @@ static void RSurfShader_OpaqueWall_Pass_BaseLightmap(entity_render_t *ent, msurf
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ZERO;
        m.blendfunc2 = GL_SRC_COLOR;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->lightmaptexture);
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
@@ -1342,11 +1317,8 @@ static void RSurfShader_OpaqueWall_Pass_Light(entity_render_t *ent, msurface_t *
                return;
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->texture);
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
@@ -1386,7 +1358,6 @@ static void RSurfShader_OpaqueWall_Pass_Fog(entity_render_t *ent, msurface_t *su
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
@@ -1420,11 +1391,8 @@ static void RSurfShader_OpaqueWall_Pass_BaseDetail(entity_render_t *ent, msurfac
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_DST_COLOR;
        m.blendfunc2 = GL_SRC_COLOR;
-       m.depthwrite = false;
-       m.depthdisable = false;
        m.tex[0] = R_GetTexture(surf->currenttexture->detailtexture);
        for (mesh = surf->mesh;mesh;mesh = mesh->chain)
        {
@@ -1455,7 +1423,6 @@ static void RSurfShader_OpaqueWall_Pass_Glow(entity_render_t *ent, msurface_t *s
        surfmesh_t *mesh;
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
        m.tex[0] = R_GetTexture(surf->currenttexture->glowtexture);

diff --git a/r_crosshairs.c b/r_crosshairs.c
index a4466ce3f1e309db707c5fde15296785979a0b73..4a765927393be2f30134bc6223ea9ee425a3d34b 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -166,7 +166,6 @@ void R_DrawCrosshairSprite(rtexture_t *texture, vec3_t origin, vec_t scale, floa
        }
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
        m.depthdisable = true;

diff --git a/r_explosion.c b/r_explosion.c
index da305b980a2af2713ccc0278d6ceb69427eb0eee..5cd7fb9aed3d8fb7c9e0dab174b165efd5ae89f0 100644 (file)
--- a/r_explosion.c
+++ b/r_explosion.c
@@ -182,7 +182,6 @@ void R_DrawExplosionCallback(void *calldata1, int calldata2)
        e = calldata1;
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE;
        m.numtriangles = EXPLOSIONTRIS;

diff --git a/r_light.c b/r_light.c
index f801562fb758ca66b34a6f2cb198e5349ed06635..13895c3e3f986cdcdf37e0f2941b9b16f48a01a6 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -138,7 +138,6 @@ void R_DrawCoronas(void)
        float scale, viewdist, diff[3], dist;
        rdlight_t *rd;
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ONE;
        m.depthdisable = true; // magic

diff --git a/r_sky.c b/r_sky.c
index 7e2113552672dd7ab15134dee5b00624f8a01e0e..d7f95cff5dcbef2a4a14b5486aa13ef369f96963 100644 (file)
--- a/r_sky.c
+++ b/r_sky.c
@@ -164,7 +164,6 @@ static void R_SkyBox(void)
        m.texcoords[0][i * 2 + 1] = (t) * (254.0f/256.0f) + (1.0f/256.0f);
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
        m.depthdisable = true; // don't modify or read zbuffer
@@ -340,7 +339,6 @@ static void R_SkySphere(void)
        speedscale2 -= (int)speedscale2;
 
        memset(&m, 0, sizeof(m));
-       m.transparent = false;
        m.blendfunc1 = GL_ONE;
        m.blendfunc2 = GL_ZERO;
        m.depthdisable = true; // don't modify or read zbuffer

diff --git a/r_sprites.c b/r_sprites.c
index 40abceffb23b96ebe1bde3c2a4eb6908aa296d68..8277f21179050a378de811ac37c36a5c2115c6af 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -82,8 +82,6 @@ static void R_DrawSpriteImage (int wantoverbright, int additive, mspriteframe_t
 {
        rmeshbufferinfo_t m;
        memset(&m, 0, sizeof(m));
-       // the mesh was sorted already, so don't transparent sort
-       m.transparent = false;
        m.blendfunc1 = GL_SRC_ALPHA;
        m.blendfunc2 = GL_ONE_MINUS_SRC_ALPHA;
        if (additive)