cleanup unused params in texture

Author: no-lex

src/engine/render/texture.cpp

@@ -309,7 +309,7 @@ static int formatsize(GLenum format)
     }
 }
 
-static void resizetexture(int w, int h, bool mipmap, bool canreduce, GLenum target, int compress, int &tw, int &th)
+static void resizetexture(int w, int h, bool mipmap, GLenum target, int compress, int &tw, int &th)
 {
     int hwlimit = target==GL_TEXTURE_CUBE_MAP ? hwcubetexsize : hwtexsize,
         sizelimit = mipmap && maxtexsize ? std::min(maxtexsize, hwlimit) : hwlimit;
@@ -503,7 +503,7 @@ const GLint *swizzlemask(GLenum format)
     return nullptr;
 }
 
-static void setuptexparameters(int tnum, const void *pixels, int clamp, int filter, GLenum format, GLenum target, bool swizzle)
+static void setuptexparameters(int tnum, int clamp, int filter, GLenum format, GLenum target, bool swizzle)
 {
     glBindTexture(target, tnum);
     glTexParameteri(target, GL_TEXTURE_WRAP_S, clamp&1 ? GL_CLAMP_TO_EDGE : (clamp&0x100 ? GL_MIRRORED_REPEAT : GL_REPEAT));
@@ -708,7 +708,7 @@ void createtexture(int tnum, int w, int h, const void *pixels, int clamp, int fi
            type = textype(component, format);
     if(tnum)
     {
-        setuptexparameters(tnum, pixels, clamp, filter, format, target, swizzle);
+        setuptexparameters(tnum, clamp, filter, format, target, swizzle);
     }
     if(!pw)
     {
@@ -723,7 +723,7 @@ void createtexture(int tnum, int w, int h, const void *pixels, int clamp, int fi
     bool mipmap = filter > 1;
     if(resize && pixels)
     {
-        resizetexture(w, h, mipmap, false, target, 0, tw, th);
+        resizetexture(w, h, mipmap, false, target, tw, th);
     }
     uploadtexture(subtarget, component, tw, th, format, type, pixels, pw, ph, pitch, mipmap);
 }
@@ -733,7 +733,7 @@ static void createcompressedtexture(int tnum, int w, int h, const uchar *data, i
     GLenum target = textarget(subtarget);
     if(tnum)
     {
-        setuptexparameters(tnum, data, clamp, filter, format, target, swizzle);
+        setuptexparameters(tnum, clamp, filter, format, target, swizzle);
     }
     uploadcompressedtexture(target, subtarget, format, w, h, data, align, blocksize, levels, filter > 1);
 }
@@ -743,7 +743,7 @@ void create3dtexture(int tnum, int w, int h, int d, const void *pixels, int clam
     GLenum format = GL_FALSE, type = textype(component, format);
     if(tnum)
     {
-        setuptexparameters(tnum, pixels, clamp, filter, format, target, swizzle);
+        setuptexparameters(tnum, clamp, filter, format, target, swizzle);
     }
     glTexImage3D(target, 0, component, w, h, d, 0, format, type, pixels);
 }
@@ -752,7 +752,7 @@ std::unordered_map<std::string, Texture> textures;
 
 Texture *notexture = nullptr; // used as default, ensured to be loaded
 
-GLenum texformat(int bpp, bool swizzle)
+GLenum texformat(int bpp)
 {
     switch(bpp)
     {
@@ -848,7 +848,7 @@ static Texture *newtexture(Texture *t, const char *rname, ImageData &s, int clam
 
     bool swizzle = !(clamp&0x10000);
     GLenum format;
-    format = texformat(s.bpp, swizzle);
+    format = texformat(s.bpp);
     t->bpp = s.bpp;
     if(alphaformat(format))
     {
@@ -880,7 +880,7 @@ static Texture *newtexture(Texture *t, const char *rname, ImageData &s, int clam
     }
     else
     {
-        resizetexture(t->w, t->h, mipit, canreduce, GL_TEXTURE_2D, compress, t->w, t->h);
+        resizetexture(t->w, t->h, mipit, GL_TEXTURE_2D, compress, t->w, t->h);
         createtexture(t->id, t->w, t->h, s.data, clamp, filter, format, GL_TEXTURE_2D, t->xs, t->ys, s.pitch, false, format, swizzle);
     }
     return t;

src/engine/render/texture.h

@@ -21,7 +21,7 @@ extern bool settexture(const char *name, int clamp = 0);
 //for imagedata manipulation
 extern void scaletexture(const uchar * RESTRICT src, uint sw, uint sh, uint bpp, uint pitch, uchar * RESTRICT dst, uint dw, uint dh);
 extern void reorienttexture(const uchar * RESTRICT src, int sw, int sh, int bpp, int stride, uchar * RESTRICT dst, bool flipx, bool flipy, bool swapxy);
-extern GLenum texformat(int bpp, bool swizzle = false);
+extern GLenum texformat(int bpp);
 
 struct Slot;
 struct VSlot;