commit fe453651c48eef34e49dd5a1cf29ebeab707126a
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Mar 16 06:23:28 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Tue Mar 16 06:23:28 2010 +0000
tree a91b5213c3196fa1e912e1f826a44731a58f81ad
parent 12d5407ec2fd0725b1e0cae5af084056288c1e82

Blend conformance bugfixes.

Trac #11327

Fixes a bug where color conversion swapped blue and green values.
Fixes a bug where CONSTANT_COLOR/CONSTANT_ALPHA conflict guard
failed to check for ONE_MINUS variants.

Author: Shannon Woods
Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

git-svn-id: https://angleproject.googlecode.com/svn/trunk@27 736b8ea6-26fd-11df-bfd4-992fa37f6226

libGLESv2/utilities.cpp

diff --git a/libGLESv2/utilities.cpp b/libGLESv2/utilities.cpp
index 33a34c3..295bf6e 100644
--- a/libGLESv2/utilities.cpp
+++ b/libGLESv2/utilities.cpp
@@ -37,8 +37,8 @@
 D3DCOLOR ConvertColor(gl::Color color)
 {
     return D3DCOLOR_RGBA(gl::unorm<8>(color.red),
-                         gl::unorm<8>(color.blue),
                          gl::unorm<8>(color.green),
+                         gl::unorm<8>(color.blue),
                          gl::unorm<8>(color.alpha));
 }