Merge branch 'master' into wii-usb

dolphin-emu · Dec 30, 2012 · 29f91ee · 29f91ee
2 parents 35466fb + e5d5365
commit 29f91ee
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,7 +102,7 @@ if(NOT MSVC)
 endif(NOT MSVC)
 
 # gcc uses some optimizations which might break stuff without this flag
-add_definitions(-fno-strict-aliasing -fno-exceptions)
+add_definitions(-fno-strict-aliasing -fno-exceptions -Wno-psabi)
 
 include(CheckCXXCompilerFlag)
 

diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -302,8 +302,7 @@ void PixelShaderManager::SetConstants()
 			float GC_ALIGNED16(material[4]);
 			float NormalizationCoef = 1 / 255.0f;
 
-			// TODO:  This code is wrong.  i goes out of range for xfregs.ambColor.
-			for (int i = 0; i < 4; ++i)
+			for (int i = 0; i < 2; ++i)
 			{
 				if (nMaterialsChanged & (1 << i))
 				{
@@ -317,6 +316,21 @@ void PixelShaderManager::SetConstants()
 					SetPSConstant4fv(C_PMATERIALS + i, material);
 				}
 			}
+
+			for (int i = 0; i < 2; ++i)
+			{
+				if (nMaterialsChanged & (1 << (i + 2)))
+				{
+					u32 data = *(xfregs.matColor + i);
+
+					material[0] = ((data >> 24) & 0xFF) * NormalizationCoef;
+					material[1] = ((data >> 16) & 0xFF) * NormalizationCoef;
+					material[2] = ((data >>  8) & 0xFF) * NormalizationCoef;
+					material[3] = ( data        & 0xFF) * NormalizationCoef;
+
+					SetPSConstant4fv(C_PMATERIALS + i + 2, material);
+				}
+			}
 
 			nMaterialsChanged = 0;
 		}

diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
@@ -251,8 +251,7 @@ void VertexShaderManager::SetConstants()
 		float GC_ALIGNED16(material[4]);
 		float NormalizationCoef = 1 / 255.0f;
 
-		// TODO:  This code is wrong.  i goes out of range for xfregs.ambColor.
-		for (int i = 0; i < 4; ++i)
+		for (int i = 0; i < 2; ++i)
 		{
 			if (nMaterialsChanged & (1 << i))
 			{
@@ -266,6 +265,21 @@ void VertexShaderManager::SetConstants()
 				SetVSConstant4fv(C_MATERIALS + i, material);
 			}
 		}
+
+		for (int i = 0; i < 2; ++i)
+		{
+			if (nMaterialsChanged & (1 << (i + 2)))
+			{
+				u32 data = *(xfregs.matColor + i);
+
+				material[0] = ((data >> 24) & 0xFF) * NormalizationCoef;
+				material[1] = ((data >> 16) & 0xFF) * NormalizationCoef;
+				material[2] = ((data >>  8) & 0xFF) * NormalizationCoef;
+				material[3] = ( data        & 0xFF) * NormalizationCoef;
+
+				SetVSConstant4fv(C_MATERIALS + i + 2, material);
+			}
+		}
 
 		nMaterialsChanged = 0;
 	}

diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
@@ -146,9 +146,6 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
 	glTexImage2D(TEX2D, 0, GL_RGBA, (GLsizei)width, (GLsizei)height, 0, GL_RGBA, GL_UNSIGNED_BYTE, texture);
 	glTexParameteri(TEX2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	glTexParameteri(TEX2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-
-	GLfloat u_max = (GLfloat)width;
-	GLfloat v_max = (GLfloat)glHeight;
 
 	static const GLfloat verts[4][2] = {
 		{ -1, -1}, // Left top
@@ -158,6 +155,9 @@ void SWRenderer::DrawTexture(u8 *texture, int width, int height)
 	};
 	//Texture rectangle uses pixel coordinates
 #ifndef USE_GLES
+	GLfloat u_max = (GLfloat)width;
+	GLfloat v_max = (GLfloat)height;
+
 	static const GLfloat texverts[4][2] = {
 		{0, v_max},
 		{0, 0},