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>

diff --git a/src/OpenGL/libGLES_CM/Context.cpp b/src/OpenGL/libGLES_CM/Context.cpp
index aee6f39..765981f 100644 (file)
--- 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])
 \r
 void Context::setClipPlaneEnabled(int index, bool enable)\r
 {\r
-       clipFlags = clipFlags & ~((int)!enable << index) | ((int)enable << index);\r
+       clipFlags = (clipFlags & ~((int)!enable << index)) | ((int)enable << index);\r
        device->setClipFlags(clipFlags);\r
 }\r
 \r

diff --git a/src/Shader/PixelRoutine.cpp b/src/Shader/PixelRoutine.cpp
index c87f3cb..213a3df 100644 (file)
--- 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])
                {