From 0c99c75edf65c2b2864bf52287e993528a67778d Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Thu, 12 Jan 2012 17:53:48 -0600
Subject: [PATCH] mesa: Always check color space before deciding to reconfigure

* Gives a slight performance boost
* Variable name cleanup
---
 .../opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
index 6a1c8fa1d8..7d0046e86a 100644
--- a/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
+++ b/src/add-ons/opengl/mesa_software_renderer/MesaSoftwareRenderer.cpp
@@ -366,19 +366,18 @@ MesaSoftwareRenderer::LockGL()
 
 	_mesa_make_current(fContext, &fFrameBuffer->base, &fFrameBuffer->base);
 
-	color_space cs = B_RGBA32;
+	color_space colorSpace = BScreen(GLView()->Window()).ColorSpace();
 
 	BAutolock lock(fInfoLocker);
 	if (fDirectModeEnabled && fInfo != NULL) {
-		cs = BScreen(GLView()->Window()).ColorSpace();
 		fNewWidth = fInfo->window_bounds.right
 			- fInfo->window_bounds.left + 1;
 		fNewHeight = fInfo->window_bounds.bottom
 			- fInfo->window_bounds.top + 1;
 	}
 
-	if (cs != fColorSpace) {
-		fColorSpace = cs;
+	if (fColorSpace != colorSpace) {
+		fColorSpace = colorSpace;
 		_SetupRenderBuffer(fFrontRenderBuffer, fColorSpace);
 		if (fBackRenderBuffer->active)
 			_SetupRenderBuffer(fBackRenderBuffer, fColorSpace);