commit 24f454e25c47452bbeaeab4175865b706e9ab03a
author Alexis Hetu <sugoi@google.com> Wed Aug 31 17:22:13 2016 -0400
committer Alexis Hétu <sugoi@google.com> Thu Sep 01 14:19:14 2016 +0000
tree 98221a21a1171da247abde80b12c9a08f3a02e76
parent 03b67af45753d2011c006016b91cb21ca1d8a106

Renaming functions named after operator names

Windows clang has no option to do anything similar to
"-fno-operator-names", so it generates errors without
any way to silence them. Renaming these functions is
easy enough, so it was done here. Also removed the
now useless flag from the code blocks project files.

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

src/Shader/PixelProgram.cpp

diff --git a/src/Shader/PixelProgram.cpp b/src/Shader/PixelProgram.cpp
index 1f50547..0f7d0ed 100644
--- a/src/Shader/PixelProgram.cpp
+++ b/src/Shader/PixelProgram.cpp
@@ -320,10 +320,10 @@
 			case Shader::OPCODE_CMP:        cmp(d, s0, s1, control);                       break;
 			case Shader::OPCODE_ALL:        all(d.x, s0);                                  break;
 			case Shader::OPCODE_ANY:        any(d.x, s0);                                  break;
-			case Shader::OPCODE_NOT:        not(d, s0);                                    break;
-			case Shader::OPCODE_OR:         or(d, s0, s1);                                 break;
-			case Shader::OPCODE_XOR:        xor(d, s0, s1);                                break;
-			case Shader::OPCODE_AND:        and(d, s0, s1);                                break;
+			case Shader::OPCODE_NOT:        bitwise_not(d, s0);                            break;
+			case Shader::OPCODE_OR:         bitwise_or(d, s0, s1);                         break;
+			case Shader::OPCODE_XOR:        bitwise_xor(d, s0, s1);                        break;
+			case Shader::OPCODE_AND:        bitwise_and(d, s0, s1);                        break;
 			case Shader::OPCODE_EQ:         equal(d, s0, s1);                              break;
 			case Shader::OPCODE_NE:         notEqual(d, s0, s1);                           break;
 			case Shader::OPCODE_END:                                                       break;