remove PRECACHE_PIC_NOCLAMP because it currently has no chance to work

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11658 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=1bf48fb5c6721f76dd21ebaa44405cb9d9611e46

diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc
index d3348bc50930a311790987ebd3291733c0bb1438..2d376d4fe41cf0f16832856850e3239cda1b72f5 100644 (file)
--- a/dpdefs/csprogsdefs.qc
+++ b/dpdefs/csprogsdefs.qc
@@ -1083,7 +1083,6 @@ float MOVETYPE_FLY_WORLDONLY = 33;
 //constant definitions:
 float PRECACHE_PIC_FROMWAD = 1; // this one actually is part of EXT_CSQC
 float PRECACHE_PIC_NOTPERSISTENT = 2; // picture may get deallocated when unused
-float PRECACHE_PIC_NOCLAMP = 4; // do not clamp to edge
 float PRECACHE_PIC_MIPMAP = 8; // mipmap the texture for possibly better downscaling at memory expense
 //notes: these constants are given as optional second argument to precache_pic()
 

diff --git a/dpdefs/menudefs.qc b/dpdefs/menudefs.qc
index bf22931940562b04d47685c940b405142f8ca1b4..ad8666ed3548786759d2faeb6b9c59dcd5711377 100644 (file)
--- a/dpdefs/menudefs.qc
+++ b/dpdefs/menudefs.qc
@@ -410,7 +410,6 @@ float(string s1, string s2, float len) strncasecmp = #230;
 //constant definitions:
 float PRECACHE_PIC_FROMWAD = 1; // this one actually is part of EXT_CSQC
 float PRECACHE_PIC_NOTPERSISTENT = 2; // picture may get deallocated when unused
-float PRECACHE_PIC_NOCLAMP = 4; // do not clamp to edge
 float PRECACHE_PIC_MIPMAP = 8; // mipmap the texture for possibly better downscaling at memory expense
 //notes: these constants are given as optional second argument to precache_pic()
 

diff --git a/gl_draw.c b/gl_draw.c
index 127a0b377c8c30fc299255750095d971a8c78cae..589140e26fc57305a3f5b2749aec2f95b9bb42d5 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -343,7 +343,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
                        // if it was created (or replaced) by Draw_NewPic, just return it
                        if(pic->flags & CACHEPICFLAG_NEWPIC)
                                return pic;
-                       if (!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag
+                       if (!((pic->texflags ^ texflags) & ~(TEXF_COMPRESS | TEXF_MIPMAP))) // ignore TEXF_COMPRESS when comparing, because fallback pics remove the flag, and ignore TEXF_MIPMAP because QC specifies that
                        {
                                if(!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
                                {

diff --git a/prvm_cmds.c b/prvm_cmds.c
index 4e9cd325edc68841b1ddd61c42e7ba05e105122b..fab17c9b26bb5bab877ee0359f9696fa4abdbdec 100644 (file)
--- a/prvm_cmds.c
+++ b/prvm_cmds.c
@@ -3243,7 +3243,7 @@ string    precache_pic(string pic)
 */
 #define PRECACHE_PIC_FROMWAD 1 /* FTEQW, not supported here */
 #define PRECACHE_PIC_NOTPERSISTENT 2
-#define PRECACHE_PIC_NOCLAMP 4
+//#define PRECACHE_PIC_NOCLAMP 4
 #define PRECACHE_PIC_MIPMAP 8
 void VM_precache_pic(prvm_prog_t *prog)
 {
@@ -3261,8 +3261,8 @@ void VM_precache_pic(prvm_prog_t *prog)
                int f = PRVM_G_FLOAT(OFS_PARM1);
                if(f & PRECACHE_PIC_NOTPERSISTENT)
                        flags |= CACHEPICFLAG_NOTPERSISTENT;
-               if(f & PRECACHE_PIC_NOCLAMP)
-                       flags |= CACHEPICFLAG_NOCLAMP;
+               //if(f & PRECACHE_PIC_NOCLAMP)
+               //      flags |= CACHEPICFLAG_NOCLAMP;
                if(f & PRECACHE_PIC_MIPMAP)
                        flags |= CACHEPICFLAG_MIPMAP;
        }