go back to using MATERIALFLAGMASK_DEPTHSORTED for transparent sorting

decisions
clear MATERIALFLAG_BLENDED on watershader materials

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

diff --git a/gl_rmain.c b/gl_rmain.c
index 6d36bde9cb1e105f2c6d0373b86272936b368c12..175e047bd157894e446031bcaef2f60d0823f9e9 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4194,12 +4194,17 @@ void R_UpdateTextureInfo(const entity_render_t *ent, texture_t *t)
                t->currentmaterialflags |= MATERIALFLAG_SHORTDEPTHRANGE;
        if (ent->flags & RENDER_VIEWMODEL)
                t->currentmaterialflags |= MATERIALFLAG_SHORTDEPTHRANGE;
-       if (t->backgroundnumskinframes && !(t->currentmaterialflags & MATERIALFLAG_BLENDED))
-               t->currentmaterialflags |= MATERIALFLAG_VERTEXTEXTUREBLEND;
-       if (t->currentmaterialflags & (MATERIALFLAG_BLENDED | MATERIALFLAG_NODEPTHTEST))
-               t->currentmaterialflags |= MATERIALFLAG_SORTTRANSPARENT;
-       if (t->currentmaterialflags & (MATERIALFLAG_REFRACTION | MATERIALFLAG_WATER))
-               t->currentmaterialflags &= ~MATERIALFLAG_SORTTRANSPARENT;
+       if (t->currentmaterialflags & MATERIALFLAG_BLENDED)
+       {
+               if (t->currentmaterialflags & (MATERIALFLAG_REFRACTION | MATERIALFLAG_WATERSHADER))
+                       t->currentmaterialflags &= ~MATERIALFLAG_BLENDED;
+       }
+       else
+       {
+               if (t->backgroundnumskinframes)
+                       t->currentmaterialflags |= MATERIALFLAG_VERTEXTEXTUREBLEND;
+               t->currentmaterialflags &= ~(MATERIALFLAG_REFRACTION | MATERIALFLAG_WATERSHADER);
+       }
 
        // make sure that the waterscroll matrix is used on water surfaces when
        // there is no tcmod
@@ -5552,7 +5557,7 @@ static void R_DrawTextureSurfaceList_ShowSurfaces(int texturenumsurfaces, msurfa
 static void R_DrawTextureSurfaceList_Sky(int texturenumsurfaces, msurface_t **texturesurfacelist)
 {
        // transparent sky would be ridiculous
-       if ((rsurface.texture->currentmaterialflags & MATERIALFLAG_SORTTRANSPARENT))
+       if (rsurface.texture->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED)
                return;
        if (rsurface.mode != RSURFMODE_SKY)
        {
@@ -6140,7 +6145,7 @@ void R_QueueSurfaceList(entity_render_t *ent, int numsurfaces, msurface_t **surf
                                ;
                        continue;
                }
-               if (rsurface.texture->currentmaterialflags & MATERIALFLAG_SORTTRANSPARENT)
+               if (rsurface.texture->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED)
                {
                        // transparent surfaces get pushed off into the transparent queue
                        const msurface_t *surface = surfacelist[i];

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 3dad14f3aefc2cc9e29bc85d6917f6255c87b202..17de2ac8aebc61cbc839c86a54271d6dff60cd27 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -1077,7 +1077,7 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
                        // now figure out what to do with this particular range of surfaces
                        if (rsurface.texture->currentmaterialflags & (MATERIALFLAG_WALL | MATERIALFLAG_WATER))
                        {
-                               if (rsurface.texture->currentmaterialflags & MATERIALFLAG_SORTTRANSPARENT)
+                               if (rsurface.texture->currentmaterialflags & MATERIALFLAGMASK_DEPTHSORTED)
                                {
                                        vec3_t tempcenter, center;
                                        for (l = k;l < kend;l++)

diff --git a/model_brush.h b/model_brush.h
index 20dd05b2c315a31ff5fa7b281514624608e5ee49..7ec6c1a639ef3ce115edc21ef07066e8f0ba2663 100644 (file)
--- a/model_brush.h
+++ b/model_brush.h
@@ -104,12 +104,12 @@ mplane_t;
 #define MATERIALFLAG_REFRACTION 524288
 // render reflection
 #define MATERIALFLAG_REFLECTION 1048576
-// render water, comprising refraction and reflection (note: this is always opaque, the shader does the alpha effect)
-#define MATERIALFLAG_SORTTRANSPARENT 2097152
 // use model lighting on this material (q1bsp lightmap sampling or q3bsp lightgrid, implies FULLBRIGHT is false)
 #define MATERIALFLAG_MODELLIGHT 4194304
 // add directional model lighting to this material (q3bsp lightgrid only)
 #define MATERIALFLAG_MODELLIGHT_DIRECTIONAL 8388608
+// combined mask of all attributes that require depth sorted rendering
+#define MATERIALFLAGMASK_DEPTHSORTED (MATERIALFLAG_BLENDED | MATERIALFLAG_NODEPTHTEST)
 
 typedef struct medge_s
 {