commit 92d7706da9e49c2fac5e9f860a242043e944ce5c
author Corentin Wallez <cwallez@chromium.org> Mon May 04 12:41:54 2015 -0400
committer Corentin Wallez <cwallez@chromium.org> Mon May 04 17:25:15 2015 +0000
tree f5f0daa27336b65327e14f5e51bf7e32840d3e24
parent 9946a61e3cc7e9fc8e2f6d2b7930dc97bdd4f261

Fix tautological compare and && in || warnings in FunctionsGL.cpp

Change-Id: Icfbd79e3cbb116da9981daeb42d3657146bf673e
Reviewed-on: https://chromium-review.googlesource.com/268968
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/renderer/gl/FunctionsGL.cpp

diff --git a/src/libANGLE/renderer/gl/FunctionsGL.cpp b/src/libANGLE/renderer/gl/FunctionsGL.cpp
index 153ece4..423678c 100644
--- a/src/libANGLE/renderer/gl/FunctionsGL.cpp
+++ b/src/libANGLE/renderer/gl/FunctionsGL.cpp
@@ -783,7 +783,7 @@
     GetGLVersion(getString, &majorVersion, &minorVersion, &openGLES);
 
     // Grab the GL extensions
-    if (majorVersion > 3 || majorVersion == 3 && minorVersion >= 0)
+    if (majorVersion >= 3)
     {
         AssignGLEntryPoint(loadProcAddress("glGetIntegerv"), &getIntegerv);
         AssignGLEntryPoint(loadProcAddress("glGetStringi"), &getStringi);
@@ -795,7 +795,7 @@
     }
 
     // 1.0
-    if (majorVersion > 1 || majorVersion == 1 && minorVersion >= 0)
+    if (majorVersion >= 1)
     {
         AssignGLEntryPoint(loadProcAddress("glBlendFunc"), &blendFunc);
         AssignGLEntryPoint(loadProcAddress("glClear"), &clear);
@@ -848,7 +848,7 @@
     }
 
     // 1.1
-    if (majorVersion > 1 || majorVersion == 1 && minorVersion >= 1)
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glBindTexture"), &bindTexture);
         AssignGLEntryPoint(loadProcAddress("glCopyTexImage1D"), &copyTexImage1D);
@@ -866,7 +866,7 @@
     }
 
     // 1.2
-    if (majorVersion > 1 || majorVersion == 1 && minorVersion >= 2)
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 2))
     {
         AssignGLEntryPoint(loadProcAddress("glBlendColor"), &blendColor);
         AssignGLEntryPoint(loadProcAddress("glBlendEquation"), &blendEquation);
@@ -886,7 +886,7 @@
     }
 
     // 1.3
-    if (majorVersion > 1 || majorVersion == 1 && minorVersion >= 3)
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 3))
     {
         AssignGLEntryPoint(loadProcAddress("glActiveTexture"), &activeTexture);
         AssignGLEntryPoint(loadProcAddress("glCompressedTexImage1D"), &compressedTexImage1D);
@@ -900,7 +900,7 @@
     }
 
     // 1.4
-    if (majorVersion > 1 || majorVersion == 1 && minorVersion >= 4)
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 4))
     {
         AssignGLEntryPoint(loadProcAddress("glBlendFuncSeparate"), &blendFuncSeparate);
         AssignGLEntryPoint(loadProcAddress("glMultiDrawArrays"), &multiDrawArrays);
@@ -912,7 +912,7 @@
     }
 
     // 1.5
-    if (majorVersion > 1 || majorVersion == 1 && minorVersion >= 5)
+    if (majorVersion > 1 || (majorVersion == 1 && minorVersion >= 5))
     {
         AssignGLEntryPoint(loadProcAddress("glBeginQuery"), &beginQuery);
         AssignGLEntryPoint(loadProcAddress("glBindBuffer"), &bindBuffer);
@@ -936,7 +936,7 @@
     }
 
     // 2.0
-    if (majorVersion > 2 || majorVersion == 2 && minorVersion >= 0)
+    if (majorVersion >= 2)
     {
         AssignGLEntryPoint(loadProcAddress("glAttachShader"), &attachShader);
         AssignGLEntryPoint(loadProcAddress("glBindAttribLocation"), &bindAttribLocation);
@@ -1034,7 +1034,7 @@
     }
 
     // 2.1
-    if (majorVersion > 2 || majorVersion == 2 && minorVersion >= 1)
+    if (majorVersion > 2 || (majorVersion == 2 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glUniformMatrix2x3fv"), &uniformMatrix2x3fv);
         AssignGLEntryPoint(loadProcAddress("glUniformMatrix2x4fv"), &uniformMatrix2x4fv);
@@ -1045,7 +1045,7 @@
     }
 
     // 3.0
-    if (majorVersion > 3 || majorVersion == 3 && minorVersion >= 0)
+    if (majorVersion >= 3)
     {
         AssignGLEntryPoint(loadProcAddress("glBeginConditionalRender"), &beginConditionalRender);
         AssignGLEntryPoint(loadProcAddress("glBeginTransformFeedback"), &beginTransformFeedback);
@@ -1137,7 +1137,7 @@
     }
 
     // 3.1
-    if (majorVersion > 3 || majorVersion == 3 && minorVersion >= 1)
+    if (majorVersion > 3 || (majorVersion == 3 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glCopyBufferSubData"), &copyBufferSubData);
         AssignGLEntryPoint(loadProcAddress("glDrawArraysInstanced"), &drawArraysInstanced);
@@ -1164,7 +1164,7 @@
     }
 
     // 3.2
-    if (majorVersion > 3 || majorVersion == 3 && minorVersion >= 2)
+    if (majorVersion > 3 || (majorVersion == 3 && minorVersion >= 2))
     {
         AssignGLEntryPoint(loadProcAddress("glClientWaitSync"), &clientWaitSync);
         AssignGLEntryPoint(loadProcAddress("glDeleteSync"), &deleteSync);
@@ -1188,7 +1188,7 @@
     }
 
     // 3.3
-    if (majorVersion > 3 || majorVersion == 3 && minorVersion >= 3)
+    if (majorVersion > 3 || (majorVersion == 3 && minorVersion >= 3))
     {
         AssignGLEntryPoint(loadProcAddress("glBindFragDataLocationIndexed"), &bindFragDataLocationIndexed);
         AssignGLEntryPoint(loadProcAddress("glBindSampler"), &bindSampler);
@@ -1221,7 +1221,7 @@
     }
 
     // 4.0
-    if (majorVersion > 4 || majorVersion == 4 && minorVersion >= 0)
+    if (majorVersion >= 4)
     {
         AssignGLEntryPoint(loadProcAddress("glBeginQueryIndexed"), &beginQueryIndexed);
         AssignGLEntryPoint(loadProcAddress("glBindTransformFeedback"), &bindTransformFeedback);
@@ -1271,8 +1271,8 @@
         AssignGLEntryPoint(loadProcAddress("glUniformSubroutinesuiv"), &uniformSubroutinesuiv);
     }
 
-    // 4.0
-    if (majorVersion > 4 || majorVersion == 4 && minorVersion >= 1)
+    // 4.1
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 1))
     {
         AssignGLEntryPoint(loadProcAddress("glActiveShaderProgram"), &activeShaderProgram);
         AssignGLEntryPoint(loadProcAddress("glBindProgramPipeline"), &bindProgramPipeline);
@@ -1365,7 +1365,7 @@
     }
 
     // 4.2
-    if (majorVersion > 4 || majorVersion == 4 && minorVersion >= 2)
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 2))
     {
         AssignGLEntryPoint(loadProcAddress("glBindImageTexture"), &bindImageTexture);
         AssignGLEntryPoint(loadProcAddress("glDrawArraysInstancedBaseInstance"), &drawArraysInstancedBaseInstance);
@@ -1382,7 +1382,7 @@
     }
 
     // 4.3
-    if (majorVersion > 4 || majorVersion == 4 && minorVersion >= 3)
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 3))
     {
         AssignGLEntryPoint(loadProcAddress("glBindVertexBuffer"), &bindVertexBuffer);
         AssignGLEntryPoint(loadProcAddress("glClearBufferData"), &clearBufferData);
@@ -1430,7 +1430,7 @@
     }
 
     // 4.4
-    if (majorVersion > 4 || majorVersion == 4 && minorVersion >= 4)
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 4))
     {
         AssignGLEntryPoint(loadProcAddress("glBindBuffersBase"), &bindBuffersBase);
         AssignGLEntryPoint(loadProcAddress("glBindBuffersRange"), &bindBuffersRange);
@@ -1444,7 +1444,7 @@
     }
 
     // 4.5
-    if (majorVersion > 4 || majorVersion == 4 && minorVersion >= 5)
+    if (majorVersion > 4 || (majorVersion == 4 && minorVersion >= 5))
     {
         AssignGLEntryPoint(loadProcAddress("glBindTextureUnit"), &bindTextureUnit);
         AssignGLEntryPoint(loadProcAddress("glBlitNamedFramebuffer"), &blitNamedFramebuffer);