From 90144e1dcc2d72a3298f4e92fc2cdf2dd8bab06a Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 10 Apr 2012 20:14:52 +0000
Subject: [PATCH] Polymer: when drawing art sky, temporarily set texcoord s
 wrapping to clamping.

This properly fixes the unwanted vertical lines.

git-svn-id: https://svn.eduke32.com/eduke32@2606 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/glbuild.h | 1 +
 polymer/eduke32/build/src/glbuild.c     | 3 +++
 polymer/eduke32/build/src/polymer.c     | 9 +++++++++
 3 files changed, 13 insertions(+)

diff --git a/polymer/eduke32/build/include/glbuild.h b/polymer/eduke32/build/include/glbuild.h
index c91255c1f..2f3817406 100644
--- a/polymer/eduke32/build/include/glbuild.h
+++ b/polymer/eduke32/build/include/glbuild.h
@@ -134,6 +134,7 @@ extern void (APIENTRY * bglCopyTexSubImage2D)(GLenum target, GLint level, GLint
 extern void (APIENTRY * bglTexSubImage2D)( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels );	// 1.1
 extern void (APIENTRY * bglTexParameterf)( GLenum target, GLenum pname, GLfloat param );
 extern void (APIENTRY * bglTexParameteri)( GLenum target, GLenum pname, GLint param );
+extern void (APIENTRY * bglGetTexParameteriv)( GLenum target, GLenum pname, GLint *params );
 extern void (APIENTRY * bglGetTexLevelParameteriv)( GLenum target, GLint level, GLenum pname, GLint *params );
 extern void (APIENTRY * bglCompressedTexImage2DARB)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
 extern void (APIENTRY * bglGetCompressedTexImageARB)(GLenum, GLint, GLvoid *);
diff --git a/polymer/eduke32/build/src/glbuild.c b/polymer/eduke32/build/src/glbuild.c
index 4fa555c9c..f864ec847 100644
--- a/polymer/eduke32/build/src/glbuild.c
+++ b/polymer/eduke32/build/src/glbuild.c
@@ -94,6 +94,7 @@ void (APIENTRY *bglCopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset,
 void (APIENTRY *bglTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels);	// 1.1
 void (APIENTRY *bglTexParameterf)(GLenum target, GLenum pname, GLfloat param);
 void (APIENTRY *bglTexParameteri)(GLenum target, GLenum pname, GLint param);
+void (APIENTRY *bglGetTexParameteriv)(GLenum target, GLenum pname, GLint *params);
 void (APIENTRY *bglGetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint *params);
 void (APIENTRY *bglCompressedTexImage2DARB)(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *);
 void (APIENTRY *bglGetCompressedTexImageARB)(GLenum, GLint, GLvoid *);
@@ -447,6 +448,7 @@ int32_t loadgldriver(const char *driver)
     bglTexSubImage2D	= GETPROC("glTexSubImage2D");
     bglTexParameterf	= GETPROC("glTexParameterf");
     bglTexParameteri	= GETPROC("glTexParameteri");
+    bglGetTexParameteriv = GETPROC("glGetTexParameteriv");
     bglGetTexLevelParameteriv = GETPROC("glGetTexLevelParameteriv");
     bglTexGenfv         = GETPROC("glTexGenfv");
 
@@ -735,6 +737,7 @@ int32_t unloadgldriver(void)
     bglTexSubImage2D	= NULL;
     bglTexParameterf	= NULL;
     bglTexParameteri	= NULL;
+    bglGetTexParameteriv   = NULL;
     bglGetTexLevelParameteriv   = NULL;
     bglCompressedTexImage2DARB  = NULL;
     bglGetCompressedTexImageARB = NULL;
diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c
index 4aa9bc122..d01710324 100644
--- a/polymer/eduke32/build/src/polymer.c
+++ b/polymer/eduke32/build/src/polymer.c
@@ -3804,9 +3804,18 @@ static void         polymer_drawartsky(int16_t tilenum, char palnum, int8_t shad
     j = (1<<pskybits);
     while (i < j)
     {
+        GLint oldswrap;
+
         bglColor4f(glcolors[pskyoff[i]][0], glcolors[pskyoff[i]][1], glcolors[pskyoff[i]][2], 1.0f);
         bglBindTexture(GL_TEXTURE_2D, glpics[pskyoff[i]]);
+
+        bglGetTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, &oldswrap);
+        bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, glinfo.clamptoedge?GL_CLAMP_TO_EDGE:GL_CLAMP);
+
         polymer_drawartskyquad(i, (i + 1) & (j - 1), height);
+
+        bglTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, oldswrap);
+
         i++;
     }
 }