Fix operator precedence warnings.

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

Fix operator precedence warnings.
3b396464 · Nicolas Capens · b69aa273 · 3b396464 · 3b396464
Commit 3b396464 authored Jan 02, 2016 by Nicolas Capens
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Context.cpp src/OpenGL/libGLES_CM/Context.cpp +1 -1

PixelRoutine.cpp src/Shader/PixelRoutine.cpp +2 -2

No files found.
--- a/src/OpenGL/libGLES_CM/Context.cpp
+++ b/src/OpenGL/libGLES_CM/Context.cpp
@@ -3256,7 +3256,7 @@ void Context::setClipPlane(int index, const float plane[4])

 void Context::setClipPlaneEnabled(int index, bool enable)
 {
-	clipFlags = clipFlags & ~((int)!enable << index) | ((int)enable << index);
+	clipFlags = (clipFlags & ~((int)!enable << index)) | ((int)enable << index);
 	device->setClipFlags(clipFlags);
 }


--- a/src/Shader/PixelRoutine.cpp
+++ b/src/Shader/PixelRoutine.cpp
@@ -1406,8 +1406,8 @@ namespace sw
 		}

 		int rgbaWriteMask = state.colorWriteActive(index);
-		int bgraWriteMask = rgbaWriteMask & 0x0000000A | (rgbaWriteMask & 0x00000001) << 2 | (rgbaWriteMask & 0x00000004) >> 2;
-		int brgaWriteMask = rgbaWriteMask & 0x00000008 | (rgbaWriteMask & 0x00000001) << 1 | (rgbaWriteMask & 0x00000002) << 1 | (rgbaWriteMask & 0x00000004) >> 2;
+		int bgraWriteMask = (rgbaWriteMask & 0x0000000A) | (rgbaWriteMask & 0x00000001) << 2 | (rgbaWriteMask & 0x00000004) >> 2;
+		int brgaWriteMask = (rgbaWriteMask & 0x00000008) | (rgbaWriteMask & 0x00000001) << 1 | (rgbaWriteMask & 0x00000002) << 1 | (rgbaWriteMask & 0x00000004) >> 2;

 		switch(state.targetFormat[index])
 		{