From: Derek Foreman <manmower@gmail.com>
Date: Sun, 8 Jun 2003 23:41:21 +0000 (+0000)
Subject: GL_REPLACE textures for now
X-Git-Tag: gl-oldtheme~27
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=156e4b316c01f19f94a08855ab7686aef7f156a2;p=dana%2Fopenbox.git

GL_REPLACE textures for now
---

diff --git a/render2/texture.c b/render2/texture.c
index fc55d1b4..84ee5562 100644
--- a/render2/texture.c
+++ b/render2/texture.c
@@ -47,7 +47,7 @@ void RrTextureSetRGBA(struct RrSurface *sur,
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND);
+    glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h,
                  0, GL_RGBA, GL_UNSIGNED_BYTE, data);
 }
@@ -103,13 +103,13 @@ void RrTexturePaint(struct RrSurface *sur, struct RrTexture *tex,
         glTexCoord2f(0, 0);
         glVertex2i(x, y);
         glTexCoord2f(1, 0);
-        glVertex2i(x+w - 1, y); 
+        glVertex2i(x+w, y); 
         glTexCoord2f(1, 1);
-        glVertex2i(x+w - 1, y+h - 1);
+        glVertex2i(x+w, y+h);
 
-        glVertex2i(x+w - 1, y+h - 1);
+        glVertex2i(x+w, y+h);
         glTexCoord2f(0, 1);
-        glVertex2i(x, y+h - 1);
+        glVertex2i(x, y+h);
         glTexCoord2f(0, 0);
         glVertex2i(x, y);
         glEnd();