r1445 - trunk/code/renderer
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Aug 12 15:34:43 EDT 2008
Author: tma
Date: 2008-08-12 15:34:43 -0400 (Tue, 12 Aug 2008)
New Revision: 1445
Modified:
trunk/code/renderer/tr_backend.c
trunk/code/renderer/tr_bsp.c
trunk/code/renderer/tr_font.c
trunk/code/renderer/tr_image.c
trunk/code/renderer/tr_local.h
trunk/code/renderer/tr_shader.c
Log:
* s/GL_CLAMP/GL_CLAMP_TO_EDGE/g (If this change appears to cause you problems
and you're using an nVidia graphics card, make sure your 'conformant texture
clamp' setting is set to on for ioq3)
Modified: trunk/code/renderer/tr_backend.c
===================================================================
--- trunk/code/renderer/tr_backend.c 2008-08-09 19:12:30 UTC (rev 1444)
+++ trunk/code/renderer/tr_backend.c 2008-08-12 19:34:43 UTC (rev 1445)
@@ -776,8 +776,8 @@
qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
- qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
- qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
+ qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
} else {
if (dirty) {
// otherwise, just subimage upload it so that drivers can tell we are going to be changing
@@ -818,8 +818,8 @@
qglTexImage2D( GL_TEXTURE_2D, 0, GL_RGB8, cols, rows, 0, GL_RGBA, GL_UNSIGNED_BYTE, data );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
- qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP );
- qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP );
+ qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE );
+ qglTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE );
} else {
if (dirty) {
// otherwise, just subimage upload it so that drivers can tell we are going to be changing
Modified: trunk/code/renderer/tr_bsp.c
===================================================================
--- trunk/code/renderer/tr_bsp.c 2008-08-09 19:12:30 UTC (rev 1444)
+++ trunk/code/renderer/tr_bsp.c 2008-08-12 19:34:43 UTC (rev 1445)
@@ -205,7 +205,7 @@
}
}
tr.lightmaps[i] = R_CreateImage( va("*lightmap%d",i), image,
- LIGHTMAP_SIZE, LIGHTMAP_SIZE, qfalse, qfalse, GL_CLAMP );
+ LIGHTMAP_SIZE, LIGHTMAP_SIZE, qfalse, qfalse, GL_CLAMP_TO_EDGE );
}
if ( r_lightmap->integer == 2 ) {
Modified: trunk/code/renderer/tr_font.c
===================================================================
--- trunk/code/renderer/tr_font.c 2008-08-09 19:12:30 UTC (rev 1444)
+++ trunk/code/renderer/tr_font.c 2008-08-12 19:34:43 UTC (rev 1445)
@@ -493,7 +493,7 @@
}
//Com_sprintf (name, sizeof(name), "fonts/fontImage_%i_%i", imageNumber++, pointSize);
- image = R_CreateImage(name, imageBuff, 256, 256, qfalse, qfalse, GL_CLAMP);
+ image = R_CreateImage(name, imageBuff, 256, 256, qfalse, qfalse, GL_CLAMP_TO_EDGE);
h = RE_RegisterShaderFromImage(name, LIGHTMAP_2D, image, qfalse);
for (j = lastStart; j < i; j++) {
font->glyphs[j].glyph = h;
Modified: trunk/code/renderer/tr_image.c
===================================================================
--- trunk/code/renderer/tr_image.c 2008-08-09 19:12:30 UTC (rev 1444)
+++ trunk/code/renderer/tr_image.c 2008-08-12 19:34:43 UTC (rev 1445)
@@ -199,7 +199,7 @@
case GL_REPEAT:
ri.Printf( PRINT_ALL, "rept " );
break;
- case GL_CLAMP:
+ case GL_CLAMP_TO_EDGE:
ri.Printf( PRINT_ALL, "clmp " );
break;
default:
@@ -1004,7 +1004,7 @@
data[y][x][3] = 255;
}
}
- tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, qfalse, qfalse, GL_CLAMP );
+ tr.dlightImage = R_CreateImage("*dlight", (byte *)data, DLIGHT_SIZE, DLIGHT_SIZE, qfalse, qfalse, GL_CLAMP_TO_EDGE );
}
@@ -1094,7 +1094,7 @@
// standard openGL clamping doesn't really do what we want -- it includes
// the border color at the edges. OpenGL 1.2 has clamp-to-edge, which does
// what we want.
- tr.fogImage = R_CreateImage("*fog", (byte *)data, FOG_S, FOG_T, qfalse, qfalse, GL_CLAMP );
+ tr.fogImage = R_CreateImage("*fog", (byte *)data, FOG_S, FOG_T, qfalse, qfalse, GL_CLAMP_TO_EDGE );
ri.Hunk_FreeTempMemory( data );
borderColor[0] = 1.0;
@@ -1172,7 +1172,7 @@
for(x=0;x<32;x++) {
// scratchimage is usually used for cinematic drawing
- tr.scratchImage[x] = R_CreateImage("*scratch", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, qfalse, qtrue, GL_CLAMP );
+ tr.scratchImage[x] = R_CreateImage("*scratch", (byte *)data, DEFAULT_SIZE, DEFAULT_SIZE, qfalse, qtrue, GL_CLAMP_TO_EDGE );
}
R_CreateDlightImage();
Modified: trunk/code/renderer/tr_local.h
===================================================================
--- trunk/code/renderer/tr_local.h 2008-08-09 19:12:30 UTC (rev 1444)
+++ trunk/code/renderer/tr_local.h 2008-08-12 19:34:43 UTC (rev 1445)
@@ -103,7 +103,7 @@
qboolean mipmap;
qboolean allowPicmip;
- int wrapClampMode; // GL_CLAMP or GL_REPEAT
+ int wrapClampMode; // GL_CLAMP_TO_EDGE or GL_REPEAT
struct image_s* next;
} image_t;
Modified: trunk/code/renderer/tr_shader.c
===================================================================
--- trunk/code/renderer/tr_shader.c 2008-08-09 19:12:30 UTC (rev 1444)
+++ trunk/code/renderer/tr_shader.c 2008-08-12 19:34:43 UTC (rev 1445)
@@ -657,7 +657,7 @@
return qfalse;
}
- stage->bundle[0].image[0] = R_FindImageFile( token, !shader.noMipMaps, !shader.noPicMip, GL_CLAMP );
+ stage->bundle[0].image[0] = R_FindImageFile( token, !shader.noMipMaps, !shader.noPicMip, GL_CLAMP_TO_EDGE );
if ( !stage->bundle[0].image[0] )
{
ri.Printf( PRINT_WARNING, "WARNING: R_FindImageFile could not find '%s' in shader '%s'\n", token, shader.name );
@@ -1230,11 +1230,8 @@
for (i=0 ; i<6 ; i++) {
Com_sprintf( pathname, sizeof(pathname), "%s_%s.tga"
, token, suf[i] );
-#ifdef GL_CLAMP_TO_EDGE
shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, qtrue, qtrue, GL_CLAMP_TO_EDGE );
-#else
- shader.sky.outerbox[i] = R_FindImageFile( ( char * ) pathname, qtrue, qtrue, GL_CLAMP );
-#endif
+
if ( !shader.sky.outerbox[i] ) {
shader.sky.outerbox[i] = tr.defaultImage;
}
@@ -2516,7 +2513,7 @@
// if not defined in the in-memory shader descriptions,
// look for a single supported image file
//
- image = R_FindImageFile( name, mipRawImage, mipRawImage, mipRawImage ? GL_REPEAT : GL_CLAMP );
+ image = R_FindImageFile( name, mipRawImage, mipRawImage, mipRawImage ? GL_REPEAT : GL_CLAMP_TO_EDGE );
if ( !image ) {
ri.Printf( PRINT_DEVELOPER, "Couldn't find image file for shader %s\n", name );
shader.defaultShader = qtrue;
More information about the quake3-commits
mailing list