OpenGL Renderer:

- Change toon highlight blending to match SoftRasterizer. Fixes the “Shadows of Almia” logo in the Pokemon Ranger: Shadows of Almia title screen. (Addresses one of the issues noted in bug #1253.)

desmume/src/OGLRender.cpp

@@ -317,7 +317,7 @@ static const char *fragmentShader_100 = {"\
 		else if(polyMode == 2) \n\
 		{ \n\
 			vec3 toonColor = vec3(texture1D(texToonTable, vtxColor.r).rgb); \n\
-			newFragColor.rgb = (stateToonShadingMode == 0) ? mainTexColor.rgb * toonColor.rgb : min((mainTexColor.rgb * vtxColor.rgb) + toonColor.rgb, 1.0); \n\
+			newFragColor.rgb = (stateToonShadingMode == 0) ? mainTexColor.rgb * toonColor.rgb : min((mainTexColor.rgb * vtxColor.r) + toonColor.rgb, 1.0); \n\
 		} \n\
 		else if(polyMode == 3) \n\
 		{ \n\

desmume/src/OGLRender_3_2.cpp

@@ -211,7 +211,7 @@ static const char *GeometryFragShader_150 = {"\
 		else if (polyMode == 2u) \n\
 		{ \n\
 			vec3 newToonColor = state.toonColor[int((vtxColor.r * 31.0) + 0.5)].rgb;\n\
-			newFragColor.rgb = (state.toonShadingMode == 0) ? mainTexColor.rgb * newToonColor.rgb : min((mainTexColor.rgb * vtxColor.rgb) + newToonColor.rgb, 1.0); \n\
+			newFragColor.rgb = (state.toonShadingMode == 0) ? mainTexColor.rgb * newToonColor.rgb : min((mainTexColor.rgb * vtxColor.r) + newToonColor.rgb, 1.0); \n\
 		} \n\
 		else if (polyMode == 3u) \n\
 		{ \n\

desmume/src/rasterize.cpp

@@ -532,6 +532,7 @@ public:
 				
 				if (gfx3d.renderState.shading == GFX3D_State::HIGHLIGHT)
 				{
+					// Tested in the "Shadows of Almia" logo in the Pokemon Ranger: Shadows of Almia title screen.
 					dst.r = modulate_table[mainTexColor.r][src.r];
 					dst.g = modulate_table[mainTexColor.g][src.r];
 					dst.b = modulate_table[mainTexColor.b][src.r];