From 09456ec3911e3554343e273482c3fc2ee900ed67 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sat, 5 Oct 2013 09:39:05 +0000
Subject: [PATCH] GLDraw slightly optimized

git-svn-id: svn://ultimatepp.org/upp/trunk@6394 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/GLDraw/GLDraw.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/uppsrc/GLDraw/GLDraw.cpp b/uppsrc/GLDraw/GLDraw.cpp
index dfdee20c2..3067d6488 100644
--- a/uppsrc/GLDraw/GLDraw.cpp
+++ b/uppsrc/GLDraw/GLDraw.cpp
@@ -84,11 +84,10 @@ void GLDraw::PutImage(Point p, const Image& img, const Rect& src)
 	
 	LLOG("Texture ID: " << sd.texture_id);
 
-	glColor3f(1.0f, 1.0f, 1.0f);
-	
 	if(src == img.GetSize()) {
 		Rect r(p, img.GetSize());
 		glBegin(GL_TRIANGLE_STRIP);
+			glColor3f(1.0f, 1.0f, 1.0f);
 			glTexCoord2f(0, 0);
 			glVertex2i(r.left, r.top);
 			glTexCoord2f(1, 0);
@@ -109,6 +108,7 @@ void GLDraw::PutImage(Point p, const Image& img, const Rect& src)
 		h.top = (double)s.top / iszf.cy;
 		h.bottom = (double)s.bottom / iszf.cy;
 		glBegin(GL_TRIANGLE_STRIP);
+			glColor3f(1.0f, 1.0f, 1.0f);
 			glTexCoord2f(h.left, h.top);
 			glVertex2i(r.left, r.top);
 			glTexCoord2f(h.right, h.top);
@@ -133,19 +133,20 @@ void GLDraw::SetColor(Color c)
 void GLDraw::PutRect(const Rect& r, Color color)
 {
 	LLOG("PutRect " << r << " " << color);
-	if(color == InvertColor()) {
+	bool inv = color == InvertColor();
+	if(inv)
 		glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
-		glColor3f(1.0f, 1.0f, 1.0f);
-	}
-	else
-		SetColor(color);
 	glBegin(GL_TRIANGLE_STRIP);
+		if(inv)
+			glColor3f(1.0f, 1.0f, 1.0f);
+		else
+			SetColor(color);
 		glVertex2i(r.left, r.top);
 		glVertex2i(r.right, r.top);
 		glVertex2i(r.left, r.bottom);
 		glVertex2i(r.right, r.bottom);
 	glEnd();
-	if(color == InvertColor())
+	if(inv)
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 }