From: divverent Date: Tue, 24 Jan 2012 20:41:27 +0000 (+0000) Subject: add a (yet unused) CACHEPICFLAG_MIPMAP X-Git-Tag: xonotic-v0.6.0~56 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ba70a1ff335181d4beb615fac0d74b7894b70f9;p=xonotic%2Fdarkplaces.git add a (yet unused) CACHEPICFLAG_MIPMAP git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11653 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=a3ec15442c0a70e559a0f46167bd7a5d311871cf --- diff --git a/draw.h b/draw.h index 5cb62afa..471efedd 100644 --- a/draw.h +++ b/draw.h @@ -56,7 +56,8 @@ typedef enum cachepicflags_e CACHEPICFLAG_QUIET = 2, CACHEPICFLAG_NOCOMPRESSION = 4, CACHEPICFLAG_NOCLAMP = 8, - CACHEPICFLAG_NEWPIC = 16 // disables matching texflags check, because a pic created with Draw_NewPic should not be subject to that + CACHEPICFLAG_NEWPIC = 16, // disables matching texflags check, because a pic created with Draw_NewPic should not be subject to that + CACHEPICFLAG_MIPMAP = 32 } cachepicflags_t; diff --git a/gl_draw.c b/gl_draw.c index 05d6c925..127a0b37 100644 --- a/gl_draw.c +++ b/gl_draw.c @@ -328,6 +328,8 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags) texflags = TEXF_ALPHA; if (!(cachepicflags & CACHEPICFLAG_NOCLAMP)) texflags |= TEXF_CLAMP; + if (cachepicflags & CACHEPICFLAG_MIPMAP) + texflags |= TEXF_MIPMAP; if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer && gl_texturecompression.integer) texflags |= TEXF_COMPRESS;