new flag CACHEPICFLAG_NOCLAMP; use it for R_PolygonBegin polygons

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8475 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/clvm_cmds.c b/clvm_cmds.c
index fb5a7e597146956c9415c4cedb3b324885ef944e..16c9ce81f4ad356534c7fd52bc372e907ec75917 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -2586,7 +2586,7 @@ void VM_CL_R_PolygonBegin (void)
                return;
        }
        picname = PRVM_G_STRING(OFS_PARM0);
                return;
        }
        picname = PRVM_G_STRING(OFS_PARM0);

-       polys->begin_texture = picname[0] ? Draw_CachePic (picname)->tex : r_texture_white;
+       polys->begin_texture = picname[0] ? Draw_CachePic_Flags (picname, CACHEPICFLAG_NOCLAMP)->tex : r_texture_white;

        polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1);
        polys->begin_vertices = 0;
        polys->begin_active = true;
        polys->begin_drawflag = (int)PRVM_G_FLOAT(OFS_PARM1);
        polys->begin_vertices = 0;
        polys->begin_active = true;

diff --git a/draw.h b/draw.h
index c4bf81d9bc27f9ba1b6a8aa8752dd8db59eed25e..8646c6a30155cbad56350c70aca8e4354a5df1cc 100644 (file)
--- a/draw.h
+++ b/draw.h
@@ -43,6 +43,7 @@ typedef enum cachepicflags_e
        CACHEPICFLAG_NOTPERSISTENT = 1,
        CACHEPICFLAG_QUIET = 2,
        CACHEPICFLAG_NOCOMPRESSION = 4,
        CACHEPICFLAG_NOTPERSISTENT = 1,
        CACHEPICFLAG_QUIET = 2,
        CACHEPICFLAG_NOCOMPRESSION = 4,

+       CACHEPICFLAG_NOCLAMP = 8,

 }
 cachepicflags_t;
 
 }
 cachepicflags_t;
 

diff --git a/gl_draw.c b/gl_draw.c
index 655b31f4cbe7966c54e03ad4d500dc0ff55ba476..157ae425cd440d671c94d9f6c38720d4502f11f8 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -452,7 +452,7 @@ cachepic_t *Draw_CachePic_Flags(const char *path, unsigned int cachepicflags)
        flags = TEXF_ALPHA;
        if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
                flags |= TEXF_PRECACHE;
        flags = TEXF_ALPHA;
        if (!(cachepicflags & CACHEPICFLAG_NOTPERSISTENT))
                flags |= TEXF_PRECACHE;

-       if (strcmp(path, "gfx/colorcontrol/ditherpattern"))
+       if (!(flags & CACHEPICFLAG_NOCLAMP))

                flags |= TEXF_CLAMP;
        if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
                flags |= TEXF_COMPRESS;
                flags |= TEXF_CLAMP;
        if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer)
                flags |= TEXF_COMPRESS;

diff --git a/menu.c b/menu.c
index 696f753a17b87a6d70414dcfbc6e43c25ca61d28..44b17df3763636329773c85064e028829d5ecad8 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -2176,7 +2176,7 @@ static void M_Options_ColorControl_Draw (void)
        float x, c, s, t, u, v;
        cachepic_t      *p, *dither;
 
        float x, c, s, t, u, v;
        cachepic_t      *p, *dither;
 

-       dither = Draw_CachePic ("gfx/colorcontrol/ditherpattern");
+       dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP);

 
        M_Background(320, 256);
 
 
        M_Background(320, 256);