Fix min/max signed zero and NaN handling.

src/OpenGL/libGLESv2/libGLESv3.cpp

@@ -52,7 +52,6 @@ static bool validImageSize(GLint level, GLsizei width, GLsizei height)
 	return true;
 }
 
-
 static bool validateColorBufferFormat(GLenum textureFormat, GLenum colorbufferFormat)
 {
 	GLenum validationError = ValidateCompressedFormat(textureFormat, egl::getClientVersion(), false);

src/Reactor/Main.cpp

@@ -460,8 +460,8 @@ TEST(SubzeroReactorTest, MinMax)
 
 			EXPECT_EQ(out[0][0], 0x00000000);
 			EXPECT_EQ(out[0][1], 0x00000000);
-			EXPECT_EQ(out[0][2], 0x80000000);
-			EXPECT_EQ(out[0][3], 0x00000000);
+			EXPECT_EQ(out[0][2], 0x00000000);
+			EXPECT_EQ(out[0][3], 0x80000000);
 
 			EXPECT_EQ(out[1][0], 0x3F800000);
 			EXPECT_EQ(out[1][1], 0x3F800000);

src/Reactor/SubzeroReactor.cpp

@@ -6040,11 +6040,11 @@ namespace sw
 	RValue<Float4> Max(RValue<Float4> x, RValue<Float4> y)
 	{
 		Ice::Variable *condition = ::function->makeVariable(Ice::IceType_v4i1);
-		auto cmp = Ice::InstFcmp::create(::function, Ice::InstFcmp::Ule, condition, x.value, y.value);
+		auto cmp = Ice::InstFcmp::create(::function, Ice::InstFcmp::Ogt, condition, x.value, y.value);
 		::basicBlock->appendInst(cmp);
 
 		Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4f32);
-		auto select = Ice::InstSelect::create(::function, result, condition, y.value, x.value);
+		auto select = Ice::InstSelect::create(::function, result, condition, x.value, y.value);
 		::basicBlock->appendInst(select);
 
 		return RValue<Float4>(V(result));
@@ -6053,11 +6053,11 @@ namespace sw
 	RValue<Float4> Min(RValue<Float4> x, RValue<Float4> y)
 	{
 		Ice::Variable *condition = ::function->makeVariable(Ice::IceType_v4i1);
-		auto cmp = Ice::InstFcmp::create(::function, Ice::InstFcmp::Ugt, condition, x.value, y.value);
+		auto cmp = Ice::InstFcmp::create(::function, Ice::InstFcmp::Olt, condition, x.value, y.value);
 		::basicBlock->appendInst(cmp);
 
 		Ice::Variable *result = ::function->makeVariable(Ice::IceType_v4f32);
-		auto select = Ice::InstSelect::create(::function, result, condition, y.value, x.value);
+		auto select = Ice::InstSelect::create(::function, result, condition, x.value, y.value);
 		::basicBlock->appendInst(select);
 
 		return RValue<Float4>(V(result));

pnacl-subzero @ 47b6ba6d

-Subproject commit c48bb8b02c98ae49438e43aa1143a958784822a5
+Subproject commit 47b6ba6db7c8b8dd36ac54dbd19ae7b4a5b77424