From deef18dd6b40e6d935cf2fa16b3bb60a526a2ac4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sun, 28 Oct 2018 23:29:12 +0100
Subject: [PATCH] remove some unused code

---
 src/engine/rendergl.cc     | 22 ----------------------
 src/engine/renderlights.cc |  3 +--
 2 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc
index b9aace3..2943b3b 100644
--- a/src/engine/rendergl.cc
+++ b/src/engine/rendergl.cc
@@ -273,28 +273,6 @@ VAR(usetexcompress, 1, 0, 0);
 VAR(maxdrawbufs, 1, 0, 0);
 VAR(maxdualdrawbufs, 1, 0, 0);
 
-static bool checkseries(const char *s, const char *name, int low, int high)
-{
-    if(name) s = strstr(s, name);
-    if(!s) return false;
-    while(*s && !isdigit(*s)) ++s;
-    if(!*s) return false;
-    int n = 0;
-    while(isdigit(*s)) n = n*10 + (*s++ - '0');
-    return n >= low && n <= high;
-}
-
-static bool checkmesaversion(const char *s, int major, int minor, int patch)
-{
-    const char *v = strstr(s, "Mesa");
-    if(!v) return false;
-    int vmajor = 0, vminor = 0, vpatch = 0;
-    if(sscanf(v, "Mesa %d.%d.%d", &vmajor, &vminor, &vpatch) < 1) return false;
-    if(vmajor > major) return true; else if(vmajor < major) return false;
-    if(vminor > minor) return true; else if(vminor < minor) return false;
-    return vpatch >= patch;
-}
-
 VAR(dbgexts, 0, 0, 1);
 
 hashset<const char *> glexts;
diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc
index eabf1d8..1e1698d 100644
--- a/src/engine/renderlights.cc
+++ b/src/engine/renderlights.cc
@@ -64,7 +64,6 @@ void setupbloom(int w, int h)
         glBindBuffer_(GL_PIXEL_PACK_BUFFER, 0);
     }
 
-    static const uchar gray[12] = { 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32 };
     static const float grayf[12] = { 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f, 0.125f };
     createtexture(bloomtex[4], bloompbo ? 4 : 1, 1, (const void *)grayf, 3, 1, GL_R16F);
 
@@ -182,7 +181,7 @@ void setupao(int w, int h)
     delete[] noise;
 
     bool upscale = aoreduce && aobilateral && aobilateralupscale;
-    GLenum format = aoprec && GL_R8,
+    GLenum format = aoprec ? GL_R8 : GL_RGBA8,
            packformat = aobilateral && aopackdepth ? (aodepthformat ? GL_RG16F : GL_RGBA8) : format;
     int packfilter = upscale && aopackdepth && !aodepthformat ? 0 : 1;
     loopi(upscale ? 3 : 2)