From 0de01be8e5014bfd5afe696387770d81383bd8ee Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 24 Aug 2008 15:03:26 +0000 Subject: [PATCH] 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 --- clvm_cmds.c | 2 +- draw.h | 1 + gl_draw.c | 2 +- menu.c | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/clvm_cmds.c b/clvm_cmds.c index fb5a7e59..16c9ce81 100644 --- 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); - 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; diff --git a/draw.h b/draw.h index c4bf81d9..8646c6a3 100644 --- a/draw.h +++ b/draw.h @@ -43,6 +43,7 @@ typedef enum cachepicflags_e CACHEPICFLAG_NOTPERSISTENT = 1, CACHEPICFLAG_QUIET = 2, CACHEPICFLAG_NOCOMPRESSION = 4, + CACHEPICFLAG_NOCLAMP = 8, } cachepicflags_t; diff --git a/gl_draw.c b/gl_draw.c index 655b31f4..157ae425 100644 --- 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; - if (strcmp(path, "gfx/colorcontrol/ditherpattern")) + if (!(flags & CACHEPICFLAG_NOCLAMP)) flags |= TEXF_CLAMP; if (!(cachepicflags & CACHEPICFLAG_NOCOMPRESSION) && gl_texturecompression_2d.integer) flags |= TEXF_COMPRESS; diff --git a/menu.c b/menu.c index 696f753a..44b17df3 100644 --- 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; - dither = Draw_CachePic ("gfx/colorcontrol/ditherpattern"); + dither = Draw_CachePic_Flags ("gfx/colorcontrol/ditherpattern", CACHEPICFLAG_NOCLAMP); M_Background(320, 256); -- 2.39.2