commit 518142733c90f2236d839b180ef8459f8e5b627b
author Nicolas Capens <capn@google.com> Mon Oct 15 13:01:22 2018 -0400
committer Nicolas Capens <nicolascapens@google.com> Tue Oct 16 13:15:10 2018 +0000
tree b765801304b8ff522b5ae54bac132cbfe8935afb
parent 767b41b1a841031d139d43923eeca674e7a69d2f

Treat all non-zero GLboolean values as GL_TRUE.

Note that this is left undefined by the spec, but glGetBoolean converts
non-zero integers to GL_TRUE, so this makes things symmetric.

Bug swiftshader:90

Change-Id: Ie2d3b2b8d66e63f542f758ddc6482b451fb4140d
Reviewed-on: https://swiftshader-review.googlesource.com/c/21511
Tested-by: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>

src/OpenGL/libGLES_CM/libGLES_CM.cpp

diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.cpp b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
index 7e5247c..c7cf691 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.cpp
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.cpp
@@ -607,7 +607,7 @@
 
 	if(context)
 	{
-		context->setColorMask(red == GL_TRUE, green == GL_TRUE, blue == GL_TRUE, alpha == GL_TRUE);
+		context->setColorMask(red != GL_FALSE, green != GL_FALSE, blue != GL_FALSE, alpha != GL_FALSE);
 	}
 }
 
@@ -649,7 +649,7 @@
 
 	if(context)
 	{
-		context->setVertexAttribState(index, context->getArrayBuffer(), size, type, (normalized == GL_TRUE), stride, ptr);
+		context->setVertexAttribState(index, context->getArrayBuffer(), size, type, (normalized != GL_FALSE), stride, ptr);
 	}
 }
 
@@ -3473,7 +3473,7 @@
 
 	if(context)
 	{
-		context->setSampleCoverageParams(es1::clamp01(value), invert == GL_TRUE);
+		context->setSampleCoverageParams(es1::clamp01(value), invert != GL_FALSE);
 	}
 }
 

src/OpenGL/libGLESv2/libGLESv2.cpp

diff --git a/src/OpenGL/libGLESv2/libGLESv2.cpp b/src/OpenGL/libGLESv2/libGLESv2.cpp
index d8a4a8f..fed303f 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -650,7 +650,7 @@
 
 	if(context)
 	{
-		context->setColorMask(red == GL_TRUE, green == GL_TRUE, blue == GL_TRUE, alpha == GL_TRUE);
+		context->setColorMask(red != GL_FALSE, green != GL_FALSE, blue != GL_FALSE, alpha != GL_FALSE);
 	}
 }
 
@@ -4239,7 +4239,7 @@
 
 	if(context)
 	{
-		context->setSampleCoverageParams(es2::clamp01(value), invert == GL_TRUE);
+		context->setSampleCoverageParams(es2::clamp01(value), invert != GL_FALSE);
 	}
 }
 
@@ -5624,7 +5624,7 @@
 			return error(GL_INVALID_OPERATION);
 		}
 
-		context->setVertexAttribState(index, context->getArrayBuffer(), size, type, (normalized == GL_TRUE), false, stride, ptr);
+		context->setVertexAttribState(index, context->getArrayBuffer(), size, type, (normalized != GL_FALSE), false, stride, ptr);
 	}
 }
 

src/OpenGL/libGLESv2/libGLESv3.cpp

diff --git a/src/OpenGL/libGLESv2/libGLESv3.cpp b/src/OpenGL/libGLESv2/libGLESv3.cpp
index 89055d8..ce2a3c8 100644
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -3679,7 +3679,7 @@
 				}
 
 				es2::Texture2D *texture = context->getTexture2D(target);
-				if(!texture || texture->name == 0 || texture->getImmutableFormat() == GL_TRUE)
+				if(!texture || texture->name == 0 || texture->getImmutableFormat() != GL_FALSE)
 				{
 					return error(GL_INVALID_OPERATION);
 				}
@@ -3754,7 +3754,7 @@
 				}
 
 				es2::Texture3D *texture = context->getTexture3D();
-				if(!texture || texture->name == 0 || texture->getImmutableFormat() == GL_TRUE)
+				if(!texture || texture->name == 0 || texture->getImmutableFormat() != GL_FALSE)
 				{
 					return error(GL_INVALID_OPERATION);
 				}