Fix tautological expressions.

Bug 15387371 Change-Id: I01bf5327f205bf646c51c1bb06560448a09f6c4a Reviewed-on: https://swiftshader-review.googlesource.com/4526Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Fix tautological expressions.
e5284ac9 · Nicolas Capens · f6e849c9 · e5284ac9 · e5284ac9 · e5284ac9
Commit e5284ac9 authored Jan 08, 2016 by Nicolas Capens
5 changed files
--- a/src/OpenGL/libGL/Context.cpp
+++ b/src/OpenGL/libGL/Context.cpp
@@ -1508,7 +1508,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
        break;
    case GL_TEXTURE_BINDING_2D:
        {
-            if(mState.activeSampler < 0 || mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
+            if(mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
            {
                error(GL_INVALID_OPERATION);
                return false;
@@ -1519,7 +1519,7 @@ bool Context::getIntegerv(GLenum pname, GLint *params)
        break;
    case GL_TEXTURE_BINDING_CUBE_MAP:
        {
-            if(mState.activeSampler < 0 || mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
+            if(mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
            {
                error(GL_INVALID_OPERATION);
                return false;

--- a/src/OpenGL/libGL/Program.cpp
+++ b/src/OpenGL/libGL/Program.cpp
@@ -234,7 +234,7 @@ namespace gl
 		default: UNREACHABLE(type);
 		}
-		if(logicalTextureUnit >= 0 && logicalTextureUnit < MAX_COMBINED_TEXTURE_IMAGE_UNITS)
+		if(logicalTextureUnit < MAX_COMBINED_TEXTURE_IMAGE_UNITS)
 		{
 			return logicalTextureUnit;
 		}

--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -2105,7 +2105,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
        break;
    case GL_TEXTURE_BINDING_2D:
        {
-            if(mState.activeSampler < 0 || mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
+            if(mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
            {
                error(GL_INVALID_OPERATION);
                return false;
@@ -2116,7 +2116,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
        break;
    case GL_TEXTURE_BINDING_CUBE_MAP:
        {
-            if(mState.activeSampler < 0 || mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
+            if(mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
            {
                error(GL_INVALID_OPERATION);
                return false;
@@ -2127,7 +2127,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
        break;
    case GL_TEXTURE_BINDING_EXTERNAL_OES:
        {
-            if(mState.activeSampler < 0 || mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
+            if(mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
            {
                error(GL_INVALID_OPERATION);
                return false;
@@ -2139,7 +2139,7 @@ template<typename T> bool Context::getIntegerv(GLenum pname, T *params) const
 	case GL_TEXTURE_BINDING_3D_OES:
 	case GL_TEXTURE_BINDING_2D_ARRAY: // GLES 3.0
 	    {
-			if(mState.activeSampler < 0 || mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
+			if(mState.activeSampler > MAX_COMBINED_TEXTURE_IMAGE_UNITS - 1)
 			{
 				error(GL_INVALID_OPERATION);
 				return false;

--- a/src/OpenGL/libGLESv2/Program.cpp
+++ b/src/OpenGL/libGLESv2/Program.cpp
@@ -320,7 +320,7 @@ namespace es2
 		default: UNREACHABLE(type);
 		}
-		if(logicalTextureUnit >= 0 && logicalTextureUnit < MAX_COMBINED_TEXTURE_IMAGE_UNITS)
+		if(logicalTextureUnit < MAX_COMBINED_TEXTURE_IMAGE_UNITS)
 		{
 			return logicalTextureUnit;
 		}

--- a/src/Renderer/Renderer.cpp
+++ b/src/Renderer/Renderer.cpp
@@ -1388,6 +1388,7 @@ namespace sw
 			break;
 		default:
 			ASSERT(false);
+			return;
 		}
 		task->vertexCount = triangleCount * 3;