changed TEXF_CLAMP to use GL_CLAMP_TO_EDGE (GL_EXT_texture_edge_clamp or GL_SGIS_text...

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

diff --git a/gl_textures.c b/gl_textures.c
index 710d2164010a733a7e9d56cdc0d9eed96b0e9c0e..f0b74a3c902fa4ea9a0ecc27c26a4f62fcaf0c27 100644 (file)
--- a/gl_textures.c
+++ b/gl_textures.c
@@ -558,7 +558,7 @@ void R_MakeResizeBufferBigger(int size)
 static void GL_SetupTextureParameters(int flags, int texturetype)
 {
        int textureenum = gltexturetypeenums[texturetype];
 static void GL_SetupTextureParameters(int flags, int texturetype)
 {
        int textureenum = gltexturetypeenums[texturetype];

-       int wrapmode = (flags & TEXF_CLAMP) ? GL_CLAMP : GL_REPEAT;
+       int wrapmode = ((flags & TEXF_CLAMP) && gl_support_clamptoedge) ? GL_CLAMP_TO_EDGE : GL_REPEAT;

 
        CHECKGLERROR
 
 
        CHECKGLERROR
 

diff --git a/glquake.h b/glquake.h
index ee2fb7a9b3f3c139019090ae64d38994ed06a517..4ad25be5a33790204466ef49fc5efc45707b9e64 100644 (file)
--- a/glquake.h
+++ b/glquake.h
@@ -348,6 +348,12 @@ extern int gl_dot3ext;
 #define GL_SCISSOR_BOX                         0x0C10
 #endif
 
 #define GL_SCISSOR_BOX                         0x0C10
 #endif
 

+// GL_SGIS_texture_edge_clamp or GL_EXT_texture_edge_clamp
+extern int gl_support_clamptoedge;
+#ifndef GL_CLAMP_TO_EDGE
+#define GL_CLAMP_TO_EDGE 0x812F
+#endif
+

 extern void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height);
 
 extern void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);
 extern void (GLAPIENTRY *qglScissor)(GLint x, GLint y, GLsizei width, GLsizei height);
 
 extern void (GLAPIENTRY *qglClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha);

diff --git a/vid_shared.c b/vid_shared.c
index 1bfff4511b086854135841e8035bd85e20f3b6d5..2260f240e2db5ad224b0092b13bc3b5a77679d5f 100644 (file)
--- a/vid_shared.c
+++ b/vid_shared.c
@@ -24,6 +24,8 @@ int gl_texture3d = false;
 int gl_texturecubemap = false;
 // GL_ARB_texture_env_dot3
 int gl_dot3arb = false;
 int gl_texturecubemap = false;
 // GL_ARB_texture_env_dot3
 int gl_dot3arb = false;

+// GL_SGIS_texture_edge_clamp
+int gl_support_clamptoedge = false;

 
 // LordHavoc: if window is hidden, don't update screen
 int vid_hidden = true;
 
 // LordHavoc: if window is hidden, don't update screen
 int vid_hidden = true;


@@ -353,6 +355,7 @@ void VID_CheckExtensions(void)
        gl_dot3arb = false;
        gl_supportslockarrays = false;
        gl_textureunits = 1;
        gl_dot3arb = false;
        gl_supportslockarrays = false;
        gl_textureunits = 1;

+       gl_support_clamptoedge = false;

 
        if (!GL_CheckExtension("OpenGL 1.1.0", opengl110funcs, NULL, false))
                Sys_Error("OpenGL 1.1.0 functions not found\n");
 
        if (!GL_CheckExtension("OpenGL 1.1.0", opengl110funcs, NULL, false))
                Sys_Error("OpenGL 1.1.0 functions not found\n");


@@ -379,6 +382,7 @@ void VID_CheckExtensions(void)
        gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false);
        gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false);
        gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false);
        gl_texture3d = GL_CheckExtension("GL_EXT_texture3D", texture3dextfuncs, "-notexture3d", false);
        gl_texturecubemap = GL_CheckExtension("GL_ARB_texture_cube_map", NULL, "-nocubemap", false);
        gl_supportslockarrays = GL_CheckExtension("GL_EXT_compiled_vertex_array", compiledvertexarrayfuncs, "-nocva", false);

+       gl_support_clamptoedge = GL_CheckExtension("GL_EXT_texture_edge_clamp", NULL, "-noedgeclamp", false) || GL_CheckExtension("GL_SGIS_texture_edge_clamp", NULL, "-noedgeclamp", false);

 
        // we don't care if it's an extension or not, they are identical functions, so keep it simple in the rendering code
        if (qglDrawRangeElements == NULL)
 
        // we don't care if it's an extension or not, they are identical functions, so keep it simple in the rendering code
        if (qglDrawRangeElements == NULL)