373

[xonotic/darkplaces.git] / gl_textures.c

diff --git a/gl_textures.c b/gl_textures.c
index d79c17a503cd11d28427924847d992611efdacf1..4288f3da8c41045413176dd1bf8e676499fc5a32 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -552,7 +552,7 @@ void R_Textures_Frame (void)
                        for (image = pool->imagechain;image;image = image->imagechain)
                        {
                                // only update already uploaded images
-                               if (!(image->flags & GLTEXF_UPLOAD))
+                               if (!(image->flags & GLTEXF_UPLOAD) && (image->flags & TEXF_MIPMAP))
                                {
                                        qglGetIntegerv(gltexturetypebindingenums[image->texturetype], &oldbindtexnum);
 
@@ -589,7 +589,7 @@ static void GL_SetupTextureParameters(int flags, int texturetype)
 
        CHECKGLERROR
 
-       if (gl_support_anisotropy)
+       if (gl_support_anisotropy && (flags & TEXF_MIPMAP))
        {
                int aniso = bound(1, gl_texture_anisotropy.integer, gl_max_anisotropy);
                if (gl_texture_anisotropy.integer != aniso)
@@ -887,7 +887,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
                                continue;
                        if (image->texturetype != glt->texturetype)
                                continue;
-                       if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP))
+                       if ((image->flags ^ glt->flags) & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_FORCENEAREST | TEXF_FORCELINEAR))
                                continue;
                        if (image->glformat != texinfo->glformat || image->glinternalformat != texinfo->glinternalformat)
                                continue;
@@ -976,7 +976,7 @@ static void R_FindImageForTexture(gltexture_t *glt)
        image->texturetype = glt->texturetype;
        image->glinternalformat = texinfo->glinternalformat;
        image->glformat = texinfo->glformat;
-       image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP)) | GLTEXF_UPLOAD;
+       image->flags = (glt->flags & (TEXF_MIPMAP | TEXF_ALPHA | TEXF_CLAMP | TEXF_PICMIP | TEXF_FORCENEAREST | TEXF_FORCELINEAR)) | GLTEXF_UPLOAD;
        image->bytesperpixel = texinfo->internalbytesperpixel;
        image->sides = image->texturetype == GLTEXTURETYPE_CUBEMAP ? 6 : 1;
        // get a texture number to use