Fix warnings treated as errors.
Change-Id: I0c186ddd43c28a3f2c49321da23d5db44abe9dbf
Reviewed-on: https://swiftshader-review.googlesource.com/17148
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/OpenGL/compiler/Compiler.vcxproj b/src/OpenGL/compiler/Compiler.vcxproj
index bda6c82..1360d93 100644
--- a/src/OpenGL/compiler/Compiler.vcxproj
+++ b/src/OpenGL/compiler/Compiler.vcxproj
@@ -127,6 +127,8 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;4005;</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
+ <ErrorReporting>Queue</ErrorReporting>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -144,6 +146,8 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
+ <ErrorReporting>Queue</ErrorReporting>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -160,6 +164,8 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;4005;</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
+ <ErrorReporting>Queue</ErrorReporting>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -176,6 +182,8 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
+ <ErrorReporting>Queue</ErrorReporting>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
@@ -192,6 +200,8 @@
<OmitFramePointers>false</OmitFramePointers>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;4005;</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
+ <ErrorReporting>Queue</ErrorReporting>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
@@ -208,6 +218,8 @@
<OmitFramePointers>false</OmitFramePointers>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
+ <ErrorReporting>Queue</ErrorReporting>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
index 3c7a19c..0060904 100644
--- a/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
+++ b/src/OpenGL/compiler/preprocessor/preprocessor.vcxproj
@@ -90,6 +90,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4005;</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -103,6 +104,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -118,6 +120,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4005;</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -135,6 +138,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>4005;4267;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/src/OpenGL/libEGL/libEGL.vcxproj b/src/OpenGL/libEGL/libEGL.vcxproj
index 1f64868..172d6b8 100644
--- a/src/OpenGL/libEGL/libEGL.vcxproj
+++ b/src/OpenGL/libEGL/libEGL.vcxproj
@@ -132,6 +132,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>5030</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -163,6 +164,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>5030</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -195,6 +197,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>5030</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -227,6 +230,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<DisableSpecificWarnings>5030</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -261,6 +265,7 @@
<OmitFramePointers>false</OmitFramePointers>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -293,6 +298,7 @@
<OmitFramePointers>false</OmitFramePointers>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/OpenGL/libGL/Image.cpp b/src/OpenGL/libGL/Image.cpp
index 23b85ab..b86b689 100644
--- a/src/OpenGL/libGL/Image.cpp
+++ b/src/OpenGL/libGL/Image.cpp
@@ -37,16 +37,16 @@
}
Image::Image(Texture *parentTexture, GLsizei width, GLsizei height, GLenum format, GLenum type)
- : parentTexture(parentTexture), width(width), height(height), format(format), type(type)
+ : sw::Surface(getParentResource(parentTexture), width, height, 1, 0, 1, selectInternalFormat(format, type), true, true)
+ , parentTexture(parentTexture), width(width), height(height), format(format), type(type)
, internalFormat(selectInternalFormat(format, type)), multiSampleDepth(1)
- , sw::Surface(getParentResource(parentTexture), width, height, 1, 0, 1, selectInternalFormat(format, type), true, true)
{
referenceCount = 1;
}
Image::Image(Texture *parentTexture, GLsizei width, GLsizei height, sw::Format internalFormat, int multiSampleDepth, bool lockable, bool renderTarget)
- : parentTexture(parentTexture), width(width), height(height), internalFormat(internalFormat), format(0 /*GL_NONE*/), type(0 /*GL_NONE*/), multiSampleDepth(multiSampleDepth)
- , sw::Surface(getParentResource(parentTexture), width, height, 1, 0, multiSampleDepth, internalFormat, lockable, renderTarget)
+ : sw::Surface(getParentResource(parentTexture), width, height, 1, 0, multiSampleDepth, internalFormat, lockable, renderTarget)
+ , parentTexture(parentTexture), width(width), height(height), format(0 /*GL_NONE*/), type(0 /*GL_NONE*/), internalFormat(internalFormat), multiSampleDepth(multiSampleDepth)
{
referenceCount = 1;
}
diff --git a/src/OpenGL/libGL/Program.cpp b/src/OpenGL/libGL/Program.cpp
index 82b0173..1a55bce 100644
--- a/src/OpenGL/libGL/Program.cpp
+++ b/src/OpenGL/libGL/Program.cpp
@@ -73,7 +73,7 @@
{
}
- Program::Program(ResourceManager *manager, GLuint handle) : resourceManager(manager), handle(handle), serial(issueSerial())
+ Program::Program(ResourceManager *manager, GLuint handle) : serial(issueSerial()), resourceManager(manager), handle(handle)
{
device = getDevice();
diff --git a/src/OpenGL/libGL/Surface.h b/src/OpenGL/libGL/Surface.h
index 20ab599..70f910f 100644
--- a/src/OpenGL/libGL/Surface.h
+++ b/src/OpenGL/libGL/Surface.h
@@ -74,8 +74,8 @@
const NativeWindowType mWindow; // Window that the surface is created for.
bool mWindowSubclassed; // Indicates whether we successfully subclassed mWindow for WM_RESIZE hooking
- GLint mHeight; // Height of surface
GLint mWidth; // Width of surface
+ GLint mHeight; // Height of surface
GLenum mTextureFormat; // Format of texture: RGB, RGBA, or no texture
GLenum mTextureTarget; // Type of texture: 2D or no texture
GLint mSwapInterval;
diff --git a/src/OpenGL/libGL/libGL.vcxproj b/src/OpenGL/libGL/libGL.vcxproj
index 6116629..ea8f5b5 100644
--- a/src/OpenGL/libGL/libGL.vcxproj
+++ b/src/OpenGL/libGL/libGL.vcxproj
@@ -154,6 +154,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -180,6 +181,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -213,6 +215,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -247,6 +250,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -281,6 +285,7 @@
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -313,6 +318,7 @@
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
index 298d740..fec59e6 100644
--- a/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
+++ b/src/OpenGL/libGLES_CM/libGLES_CM.vcxproj
@@ -136,6 +136,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -164,6 +165,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<BrowseInformation>true</BrowseInformation>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -199,6 +201,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -235,6 +238,7 @@
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -271,6 +275,7 @@
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -305,6 +310,7 @@
<EnableFiberSafeOptimizations>true</EnableFiberSafeOptimizations>
<WholeProgramOptimization>true</WholeProgramOptimization>
<IntrinsicFunctions>false</IntrinsicFunctions>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/OpenGL/libGLESv2/libGLESv2.vcxproj b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
index 8968f0b..fcd5093 100644
--- a/src/OpenGL/libGLESv2/libGLESv2.vcxproj
+++ b/src/OpenGL/libGLESv2/libGLESv2.vcxproj
@@ -138,6 +138,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -168,6 +169,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -205,6 +207,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -243,6 +246,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -281,6 +285,7 @@
<IntrinsicFunctions>false</IntrinsicFunctions>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -317,6 +322,7 @@
<IntrinsicFunctions>false</IntrinsicFunctions>
<TreatWarningAsError>true</TreatWarningAsError>
<DisableSpecificWarnings>5030;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<AdditionalDependencies>dxguid.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/src/Reactor/Main.cpp b/src/Reactor/Main.cpp
index e497883..449c481 100644
--- a/src/Reactor/Main.cpp
+++ b/src/Reactor/Main.cpp
@@ -573,57 +573,57 @@
if(routine)
{
- int out[10][4];
+ unsigned int out[10][4];
memset(&out, 0, sizeof(out));
int(*callable)(void*) = (int(*)(void*))routine->getEntry();
callable(&out);
- EXPECT_EQ(out[0][0], 0xAAAAAAAA);
- EXPECT_EQ(out[0][1], 0x00000000);
- EXPECT_EQ(out[0][2], 0x00000000);
- EXPECT_EQ(out[0][3], 0x00000000);
+ EXPECT_EQ(out[0][0], 0xAAAAAAAAu);
+ EXPECT_EQ(out[0][1], 0x00000000u);
+ EXPECT_EQ(out[0][2], 0x00000000u);
+ EXPECT_EQ(out[0][3], 0x00000000u);
- EXPECT_EQ(out[1][0], 0x0000AAAA);
- EXPECT_EQ(out[1][1], 0x00000000);
- EXPECT_EQ(out[1][2], 0x00000000);
- EXPECT_EQ(out[1][3], 0x00000000);
+ EXPECT_EQ(out[1][0], 0x0000AAAAu);
+ EXPECT_EQ(out[1][1], 0x00000000u);
+ EXPECT_EQ(out[1][2], 0x00000000u);
+ EXPECT_EQ(out[1][3], 0x00000000u);
- EXPECT_EQ(out[2][0], 0xAAAAAAAA);
- EXPECT_EQ(out[2][1], 0x55555555);
- EXPECT_EQ(out[2][2], 0xFFFFFFFF);
- EXPECT_EQ(out[2][3], 0x00000000);
+ EXPECT_EQ(out[2][0], 0xAAAAAAAAu);
+ EXPECT_EQ(out[2][1], 0x55555555u);
+ EXPECT_EQ(out[2][2], 0xFFFFFFFFu);
+ EXPECT_EQ(out[2][3], 0x00000000u);
- EXPECT_EQ(out[3][0], 0x5555AAAA);
- EXPECT_EQ(out[3][1], 0x0000FFFF);
- EXPECT_EQ(out[3][2], 0x00000000);
- EXPECT_EQ(out[3][3], 0x00000000);
+ EXPECT_EQ(out[3][0], 0x5555AAAAu);
+ EXPECT_EQ(out[3][1], 0x0000FFFFu);
+ EXPECT_EQ(out[3][2], 0x00000000u);
+ EXPECT_EQ(out[3][3], 0x00000000u);
- EXPECT_EQ(out[4][0], 0xAAAAAAAB);
- EXPECT_EQ(out[4][1], 0x00000000);
- EXPECT_EQ(out[4][2], 0x00000000);
- EXPECT_EQ(out[4][3], 0x00000000);
+ EXPECT_EQ(out[4][0], 0xAAAAAAABu);
+ EXPECT_EQ(out[4][1], 0x00000000u);
+ EXPECT_EQ(out[4][2], 0x00000000u);
+ EXPECT_EQ(out[4][3], 0x00000000u);
- EXPECT_EQ(out[5][0], 0x0000AAAB);
- EXPECT_EQ(out[5][1], 0x00000000);
- EXPECT_EQ(out[5][2], 0x00000000);
- EXPECT_EQ(out[5][3], 0x00000000);
+ EXPECT_EQ(out[5][0], 0x0000AAABu);
+ EXPECT_EQ(out[5][1], 0x00000000u);
+ EXPECT_EQ(out[5][2], 0x00000000u);
+ EXPECT_EQ(out[5][3], 0x00000000u);
- EXPECT_EQ(out[6][0], 0xAAAAAAAB);
- EXPECT_EQ(out[6][1], 0x55555556);
- EXPECT_EQ(out[6][2], 0x00000000);
- EXPECT_EQ(out[6][3], 0x00000001);
+ EXPECT_EQ(out[6][0], 0xAAAAAAABu);
+ EXPECT_EQ(out[6][1], 0x55555556u);
+ EXPECT_EQ(out[6][2], 0x00000000u);
+ EXPECT_EQ(out[6][3], 0x00000001u);
- EXPECT_EQ(out[7][0], 0x5556AAAB);
- EXPECT_EQ(out[7][1], 0x00010000);
- EXPECT_EQ(out[7][2], 0x00000000);
- EXPECT_EQ(out[7][3], 0x00000000);
+ EXPECT_EQ(out[7][0], 0x5556AAABu);
+ EXPECT_EQ(out[7][1], 0x00010000u);
+ EXPECT_EQ(out[7][2], 0x00000000u);
+ EXPECT_EQ(out[7][3], 0x00000000u);
- EXPECT_EQ(out[8][0], 0xBF800000);
- EXPECT_EQ(out[8][1], 0x3F800000);
- EXPECT_EQ(out[8][2], 0x80000000);
- EXPECT_EQ(out[8][3], 0x00000000);
+ EXPECT_EQ(out[8][0], 0xBF800000u);
+ EXPECT_EQ(out[8][1], 0x3F800000u);
+ EXPECT_EQ(out[8][2], 0x80000000u);
+ EXPECT_EQ(out[8][3], 0x00000000u);
}
}
diff --git a/src/Reactor/Reactor.vcxproj b/src/Reactor/Reactor.vcxproj
index c126c35..6bd1813 100644
--- a/src/Reactor/Reactor.vcxproj
+++ b/src/Reactor/Reactor.vcxproj
@@ -123,6 +123,7 @@
<TreatWarningAsError>true</TreatWarningAsError>
<ExceptionHandling>false</ExceptionHandling>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -148,6 +149,7 @@
<OmitFramePointers>false</OmitFramePointers>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -177,6 +179,7 @@
<FloatingPointExceptions>false</FloatingPointExceptions>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -204,6 +207,7 @@
<StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions>
<TreatWarningAsError>true</TreatWarningAsError>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -235,6 +239,7 @@
<FloatingPointExceptions>false</FloatingPointExceptions>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
@@ -265,6 +270,7 @@
<StringPooling>true</StringPooling>
<FloatingPointExceptions>false</FloatingPointExceptions>
<TreatWarningAsError>true</TreatWarningAsError>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<ProjectReference>
<LinkLibraryDependencies>false</LinkLibraryDependencies>
diff --git a/src/Reactor/Subzero.vcxproj b/src/Reactor/Subzero.vcxproj
index 10e5fb8..1662e0f 100644
--- a/src/Reactor/Subzero.vcxproj
+++ b/src/Reactor/Subzero.vcxproj
@@ -91,6 +91,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -109,6 +110,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -129,6 +131,7 @@
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -155,6 +158,7 @@
<ForcedIncludeFiles>src/IceTypes.h</ForcedIncludeFiles>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
diff --git a/src/Reactor/SubzeroLLVMDependencies.vcxproj b/src/Reactor/SubzeroLLVMDependencies.vcxproj
index 8698d30..87502e9 100644
--- a/src/Reactor/SubzeroLLVMDependencies.vcxproj
+++ b/src/Reactor/SubzeroLLVMDependencies.vcxproj
@@ -78,6 +78,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -89,6 +90,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -102,6 +104,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -119,6 +122,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)third_party\llvm-subzero\include;$(SolutionDir)third_party\llvm-subzero\build\Windows\include</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/src/Reactor/SubzeroTest.vcxproj b/src/Reactor/SubzeroTest.vcxproj
index 9ff42dd..febe352 100644
--- a/src/Reactor/SubzeroTest.vcxproj
+++ b/src/Reactor/SubzeroTest.vcxproj
@@ -95,6 +95,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -111,6 +112,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -129,6 +131,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -149,6 +152,7 @@
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\subzero\src\;$(SolutionDir)third_party\subzero\unittest\;$(SolutionDir)third_party\llvm-subzero\include\;$(SolutionDir)third_party\llvm-subzero\build\Windows\include;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>gtest/gtest.h</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
diff --git a/src/SwiftShader/SwiftShader.vcxproj b/src/SwiftShader/SwiftShader.vcxproj
index 513fb5b..ee9521e 100644
--- a/src/SwiftShader/SwiftShader.vcxproj
+++ b/src/SwiftShader/SwiftShader.vcxproj
@@ -135,6 +135,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -170,6 +171,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -205,6 +207,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -238,6 +241,7 @@
<FloatingPointExceptions>false</FloatingPointExceptions>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -276,6 +280,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
@@ -312,6 +317,7 @@
<FloatingPointExceptions>false</FloatingPointExceptions>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Lib>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
diff --git a/tests/unittests/unittests.vcxproj b/tests/unittests/unittests.vcxproj
index ff3dc2a..b92398f 100644
--- a/tests/unittests/unittests.vcxproj
+++ b/tests/unittests/unittests.vcxproj
@@ -96,6 +96,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -113,6 +114,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -132,6 +134,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
@@ -153,6 +156,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)include\;$(SolutionDir)third_party\googletest\googletest\include\;$(SolutionDir)third_party\googletest\googletest\;$(SolutionDir)third_party\googletest\googlemock\include\;SubmoduleCheck;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ForcedIncludeFiles>
</ForcedIncludeFiles>
+ <TreatSpecificWarningsAsErrors>4018;5038</TreatSpecificWarningsAsErrors>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
