Remove drawnoviewtype

By moving the code into drawviewtype. The advantage is that now there is
only one function so we don't need the function pointer or many small if
statements, only one big if statement.

Author: Robert Alm Nilsson

src/engine/rendergl.cpp

@@ -1949,7 +1949,7 @@ void viewproject(int targtype = VP_CAMERA)
     }
 }
 
-void drawnoviewtype(int targtype)
+void drawviewtype(int targtype)
 {
     if(targtype == VP_LEFT || targtype == VP_RIGHT)
     {
@@ -1966,174 +1966,153 @@ void drawnoviewtype(int targtype)
         }
     }
 
-    xtravertsva = xtraverts = glde = gbatches = 0;
+    if(!hasnoview())
+    {
+        updatedynlights();
 
-    int w = screenw, h = screenh;
-    if(forceaspect) w = int(ceil(h*forceaspect));
-    gettextres(w, h);
+        setfog(fogmat, fogblend, abovemat);
+        viewproject(targtype);
+        setcamprojmatrix();
 
-    hudmatrix.ortho(0, w, h, 0, -1, 1);
-    resethudmatrix();
+        glEnable(GL_CULL_FACE);
+        glEnable(GL_DEPTH_TEST);
 
-    glClearColor(0.f, 0.f, 0.f, 1);
-    if(clearview(viewtype, targtype)) glClear(GL_COLOR_BUFFER_BIT);
+        xtravertsva = xtraverts = glde = gbatches = 0;
 
-    hudshader->set();
+        visiblecubes();
 
-    hud::update(screenw, screenh);
-    hud::drawhud(true);
-    hud::drawlast();
+        glClearColor(0, 0, 0, 0);
+        glClear(GL_DEPTH_BUFFER_BIT | (wireframe && editmode && clearview(viewtype, targtype) ? GL_COLOR_BUFFER_BIT : 0));
 
-    if(targtype == VP_LEFT || targtype == VP_RIGHT)
-    {
-        if(viewtype >= VW_STEREO)
-        {
-            setcolormask();
-            glColorMask(COLORMASK, GL_TRUE);
-        }
-    }
-}
+        if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-void drawviewtype(int targtype)
-{
-    updatedynlights();
+        if(limitsky()) drawskybox(farplane, true);
 
-    setfog(fogmat, fogblend, abovemat);
-    viewproject(targtype);
-    setcamprojmatrix();
-    if(targtype == VP_LEFT || targtype == VP_RIGHT)
-    {
-        if(viewtype >= VW_STEREO)
-        {
-            switch(viewtype)
-            {
-                case VW_STEREO_BLEND: setcolormask(targtype == VP_LEFT, false, targtype == VP_RIGHT); break;
-                case VW_STEREO_AVG: setcolormask(targtype == VP_LEFT, true, targtype == VP_RIGHT); break;
-                case VW_STEREO_BLEND_REDCYAN:
-                case VW_STEREO_REDCYAN: setcolormask(targtype == VP_LEFT, targtype == VP_RIGHT, targtype == VP_RIGHT); break;
-            }
-            glColorMask(COLORMASK, GL_TRUE);
-        }
-    }
+        rendergeom(causticspass);
+        if(!wireframe && editmode && (outline || (fullbright && blankgeom))) renderoutline();
 
-    glEnable(GL_CULL_FACE);
-    glEnable(GL_DEPTH_TEST);
-
-    xtravertsva = xtraverts = glde = gbatches = 0;
+        queryreflections();
+        generategrass();
 
-    visiblecubes();
-
-    glClearColor(0, 0, 0, 0);
-    glClear(GL_DEPTH_BUFFER_BIT | (wireframe && editmode && clearview(viewtype, targtype) ? GL_COLOR_BUFFER_BIT : 0));
+        if(!limitsky()) drawskybox(farplane, false);
 
-    if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+        renderdecals(true);
+        renderavatar(true);
 
-    if(limitsky()) drawskybox(farplane, true);
+        rendermapmodels();
+        rendergame();
 
-    rendergeom(causticspass);
-    if(!wireframe && editmode && (outline || (fullbright && blankgeom))) renderoutline();
+        if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-    queryreflections();
-    generategrass();
+        drawglaretex();
+        drawdepthfxtex();
+        drawreflections();
 
-    if(!limitsky()) drawskybox(farplane, false);
+        if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-    renderdecals(true);
-    renderavatar(true);
+        renderwater();
+        rendergrass();
 
-    rendermapmodels();
-    rendergame();
+        rendermaterials();
+        renderalphageom();
 
-    if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+        if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-    drawglaretex();
-    drawdepthfxtex();
-    drawreflections();
+        renderparticles(true);
 
-    if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+        if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
-    renderwater();
-    rendergrass();
+        renderavatar(false, true);
 
-    rendermaterials();
-    renderalphageom();
+        if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-    if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+        glDisable(GL_CULL_FACE);
+        glDisable(GL_DEPTH_TEST);
 
-    renderparticles(true);
+        if(!viewtype)
+        {
+            addmotionblur();
+            addglare();
+        }
+        if(isliquid(fogmat&MATF_VOLUME)) drawfogoverlay(fogmat, fogblend, abovemat);
+        if(!viewtype) renderpostfx();
 
-    if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
+        if(editmode && !pixeling)
+        {
+            glEnable(GL_DEPTH_TEST);
+            glDepthMask(GL_FALSE);
 
-    renderavatar(false, true);
+            renderblendbrush();
+            rendereditcursor();
 
-    if(wireframe && editmode) glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
+            glDepthMask(GL_TRUE);
+            glDisable(GL_DEPTH_TEST);
+        }
 
-    glDisable(GL_CULL_FACE);
-    glDisable(GL_DEPTH_TEST);
+        int w = screenw, h = screenh;
+        if(forceaspect) w = int(ceil(h*forceaspect));
+        gettextres(w, h);
 
-    if(!viewtype)
-    {
-        addmotionblur();
-        addglare();
-    }
-    if(isliquid(fogmat&MATF_VOLUME)) drawfogoverlay(fogmat, fogblend, abovemat);
-    if(!viewtype) renderpostfx();
+        hudmatrix.ortho(0, w, h, 0, -1, 1);
+        resethudmatrix();
 
-    if(editmode && !pixeling)
-    {
-        glEnable(GL_DEPTH_TEST);
-        glDepthMask(GL_FALSE);
+        gle::colorf(1, 1, 1);
 
-        renderblendbrush();
-        rendereditcursor();
+        if(!pixeling || !editmode)
+        {
+            extern int debugsm;
+            if(debugsm)
+            {
+                extern void viewshadowmap();
+                viewshadowmap();
+            }
 
-        glDepthMask(GL_TRUE);
-        glDisable(GL_DEPTH_TEST);
-    }
+            extern int debugglare;
+            if(debugglare)
+            {
+                extern void viewglaretex();
+                viewglaretex();
+            }
 
-    int w = screenw, h = screenh;
-    if(forceaspect) w = int(ceil(h*forceaspect));
-    gettextres(w, h);
+            extern int debugdepthfx;
+            if(debugdepthfx)
+            {
+                extern void viewdepthfxtex();
+                viewdepthfxtex();
+            }
 
-    hudmatrix.ortho(0, w, h, 0, -1, 1);
-    resethudmatrix();
+            extern void debugparticles();
+            debugparticles();
 
-    gle::colorf(1, 1, 1);
+            hudshader->set();
+            hud::drawhud();
+            rendertexturepanel(w, h);
+            hud::drawlast();
+        }
 
-    if(!pixeling || !editmode)
+        renderedgame = false;
+    }
+    else
     {
-        extern int debugsm;
-        if(debugsm)
-        {
-            extern void viewshadowmap();
-            viewshadowmap();
-        }
+        xtravertsva = xtraverts = glde = gbatches = 0;
 
-        extern int debugglare;
-        if(debugglare)
-        {
-            extern void viewglaretex();
-            viewglaretex();
-        }
+        int w = screenw, h = screenh;
+        if(forceaspect) w = int(ceil(h*forceaspect));
+        gettextres(w, h);
 
-        extern int debugdepthfx;
-        if(debugdepthfx)
-        {
-            extern void viewdepthfxtex();
-            viewdepthfxtex();
-        }
+        hudmatrix.ortho(0, w, h, 0, -1, 1);
+        resethudmatrix();
 
-        extern void debugparticles();
-        debugparticles();
+        glClearColor(0.f, 0.f, 0.f, 1);
+        if(clearview(viewtype, targtype)) glClear(GL_COLOR_BUFFER_BIT);
 
         hudshader->set();
-        hud::drawhud();
-        rendertexturepanel(w, h);
+
+        hud::update(screenw, screenh);
+        hud::drawhud(true);
         hud::drawlast();
     }
 
-    renderedgame = false;
-
     if(targtype == VP_LEFT || targtype == VP_RIGHT)
     {
         if(viewtype >= VW_STEREO)
@@ -2178,22 +2157,21 @@ void gl_drawframe()
         game::project(w, h);
     }
 
-    void (*drawviewtype_fn)(int) = hasnoview() ? drawnoviewtype : drawviewtype;
     int oldcurtime = curtime;
 
     switch(viewtype)
     {
         case VW_NORMAL:
-            drawviewtype_fn(VP_CAMERA);
+            drawviewtype(VP_CAMERA);
             break;
 
         case VW_LEFTRIGHT:
         case VW_CROSSEYED:
-            drawviewtype_fn(VP_LEFT);
+            drawviewtype(VP_LEFT);
             views[VP_LEFT].copy();
             curtime = 0;
 
-            drawviewtype_fn(VP_RIGHT);
+            drawviewtype(VP_RIGHT);
             views[VP_RIGHT].copy();
             curtime = oldcurtime;
 
@@ -2214,14 +2192,14 @@ void gl_drawframe()
 
         case VW_STEREO_BLEND:
         case VW_STEREO_BLEND_REDCYAN:
-            drawviewtype_fn(VP_LEFT);
+            drawviewtype(VP_LEFT);
             curtime = 0;
 
-            drawviewtype_fn(VP_RIGHT);
+            drawviewtype(VP_RIGHT);
             views[VP_RIGHT].copy();
             curtime = 0;
 
-            drawviewtype_fn(VP_CAMERA);
+            drawviewtype(VP_CAMERA);
             curtime = oldcurtime;
 
             glDisable(GL_BLEND);
@@ -2237,13 +2215,13 @@ void gl_drawframe()
 
         case VW_STEREO_AVG:
         case VW_STEREO_REDCYAN:
-            drawviewtype_fn(VP_LEFT);
+            drawviewtype(VP_LEFT);
             if(viewtype == VW_STEREO_AVG)
             {
                 views[VP_LEFT].copy();
             }
             curtime = 0;
-            drawviewtype_fn(VP_RIGHT);
+            drawviewtype(VP_RIGHT);
             curtime = oldcurtime;
 
             glDisable(GL_BLEND);