commit 3b39646417ca060f10a06c634bf9b2f430c375ec
author Nicolas Capens <capn@google.com> Sat Jan 02 00:23:53 2016 -0500
committer Nicolas Capens <capn@google.com> Sat Jan 09 02:48:47 2016 +0000
tree bab9c7e2129f8b6cbc7cbd7723024383b6dc3192
parent b69aa273c4caf7460a81bd3205b2b92380b836b0

Fix operator precedence warnings.

Bug 15387371

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

src/OpenGL/libGLES_CM/Context.cpp

diff --git a/src/OpenGL/libGLES_CM/Context.cpp b/src/OpenGL/libGLES_CM/Context.cpp
index aee6f39..765981f 100644
--- a/src/OpenGL/libGLES_CM/Context.cpp
+++ b/src/OpenGL/libGLES_CM/Context.cpp
@@ -3256,7 +3256,7 @@
 

 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);

 }

 

src/Shader/PixelRoutine.cpp

diff --git a/src/Shader/PixelRoutine.cpp b/src/Shader/PixelRoutine.cpp
index c87f3cb..213a3df 100644
--- a/src/Shader/PixelRoutine.cpp
+++ b/src/Shader/PixelRoutine.cpp
@@ -1406,8 +1406,8 @@
 		}
 
 		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])
 		{