From: Derek Foreman <manmower@gmail.com>
Date: Mon, 9 Jun 2003 02:09:36 +0000 (+0000)
Subject: only enable blend when needed
X-Git-Tag: gl-oldtheme~24
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=e1f817a95e4da655275b3227916f20c5c3ff7ab1;p=dana%2Fopenbox.git

only enable blend when needed
---

diff --git a/render2/instance.c b/render2/instance.c
index c21882c6..5f81b43d 100644
--- a/render2/instance.c
+++ b/render2/instance.c
@@ -110,7 +110,6 @@ struct RrInstance *RrInstanceNew(Display *display, int screen)
 
         assert(inst->glx_context);
         glEnable(GL_CULL_FACE);
-        glEnable(GL_BLEND);
         glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
         glMatrixMode(GL_PROJECTION);
diff --git a/render2/texture.c b/render2/texture.c
index 36486d79..0a19f07f 100644
--- a/render2/texture.c
+++ b/render2/texture.c
@@ -115,11 +115,14 @@ void RrTexturePaint(struct RrSurface *sur, struct RrTexture *tex,
     case RR_TEXTURE_NONE:
         break;
     case RR_TEXTURE_TEXT:
+glEnable(GL_BLEND);
         RrFontRenderString(sur, tex->data.text.font, &tex->data.text.color,
                            tex->data.text.layout, tex->data.text.string,
                            x, y, w, h);
+glDisable(GL_BLEND);
         break;
     case RR_TEXTURE_RGBA:
+glDisable(GL_BLEND);
         glColor3f(1.0, 1.0, 1.0);
         glBindTexture(GL_TEXTURE_2D, tex->data.rgba.texid);
         glBegin(GL_TRIANGLES);