diff options
| author | Yong He <yonghe@outlook.com> | 2017-11-07 21:43:39 -0500 |
|---|---|---|
| committer | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-11-07 18:43:39 -0800 |
| commit | e1710807292544775dc6a0eb338af081fb94493e (patch) | |
| tree | d1982bbf9d6e3ae2275298a2dbed26dea0b62174 | |
| parent | a5dfa5cd2bfa11fb3d9e84877f8dead1815e9077 (diff) | |
turn on 'treat warnings as errors' (#266)
| -rw-r--r-- | external/stb/stb_image.h | 26 | ||||
| -rw-r--r-- | source/core/core.vcxproj | 4 | ||||
| -rw-r--r-- | source/slang/slang.vcxproj | 6 | ||||
| -rw-r--r-- | source/slangc/slangc.vcxproj | 4 | ||||
| -rw-r--r-- | tools/render-test/render-test.vcxproj | 4 | ||||
| -rw-r--r-- | tools/slang-test/main.cpp | 15 | ||||
| -rw-r--r-- | tools/slang-test/os.cpp | 2 | ||||
| -rw-r--r-- | tools/slang-test/slang-test.vcxproj | 12 |
8 files changed, 46 insertions, 27 deletions
diff --git a/external/stb/stb_image.h b/external/stb/stb_image.h index ae2ada6a6..651b984eb 100644 --- a/external/stb/stb_image.h +++ b/external/stb/stb_image.h @@ -2806,7 +2806,7 @@ static int stbi__process_marker(stbi__jpeg *z, int m) if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG"); for (i=0; i < 64; ++i) - z->dequant[t][stbi__jpeg_dezigzag[i]] = sixteen ? stbi__get16be(z->s) : stbi__get8(z->s); + z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s)); L -= (sixteen ? 129 : 65); } return L==0; @@ -3611,20 +3611,20 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp } else if (z->s->img_n == 4) { if (z->app14_color_transform == 0) { // CMYK for (i=0; i < z->s->img_x; ++i) { - stbi_uc k = coutput[3][i]; - out[0] = stbi__blinn_8x8(coutput[0][i], k); - out[1] = stbi__blinn_8x8(coutput[1][i], k); - out[2] = stbi__blinn_8x8(coutput[2][i], k); + stbi_uc tk = coutput[3][i]; + out[0] = stbi__blinn_8x8(coutput[0][i], tk); + out[1] = stbi__blinn_8x8(coutput[1][i], tk); + out[2] = stbi__blinn_8x8(coutput[2][i], tk); out[3] = 255; out += n; } } else if (z->app14_color_transform == 2) { // YCCK z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n); for (i=0; i < z->s->img_x; ++i) { - stbi_uc k = coutput[3][i]; - out[0] = stbi__blinn_8x8(255 - out[0], k); - out[1] = stbi__blinn_8x8(255 - out[1], k); - out[2] = stbi__blinn_8x8(255 - out[2], k); + stbi_uc tk = coutput[3][i]; + out[0] = stbi__blinn_8x8(255 - out[0], tk); + out[1] = stbi__blinn_8x8(255 - out[1], tk); + out[2] = stbi__blinn_8x8(255 - out[2], tk); out += n; } } else { // YCbCr + alpha? Ignore the fourth channel for now @@ -3649,10 +3649,10 @@ static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp } } else if (z->s->img_n == 4 && z->app14_color_transform == 0) { for (i=0; i < z->s->img_x; ++i) { - stbi_uc k = coutput[3][i]; - stbi_uc r = stbi__blinn_8x8(coutput[0][i], k); - stbi_uc g = stbi__blinn_8x8(coutput[1][i], k); - stbi_uc b = stbi__blinn_8x8(coutput[2][i], k); + stbi_uc tk = coutput[3][i]; + stbi_uc r = stbi__blinn_8x8(coutput[0][i], tk); + stbi_uc g = stbi__blinn_8x8(coutput[1][i], tk); + stbi_uc b = stbi__blinn_8x8(coutput[2][i], tk); out[0] = stbi__compute_y(r, g, b); out[1] = 255; out += n; diff --git a/source/core/core.vcxproj b/source/core/core.vcxproj index 350482686..c37f2fad2 100644 --- a/source/core/core.vcxproj +++ b/source/core/core.vcxproj @@ -121,6 +121,7 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>false</MultiProcessorCompilation> <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -141,6 +142,7 @@ <BrowseInformation>true</BrowseInformation> <MultiProcessorCompilation>false</MultiProcessorCompilation> <BasicRuntimeChecks>Default</BasicRuntimeChecks> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -164,6 +166,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> @@ -186,6 +189,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;WINDOWS_PLATFORM;%(PreprocessorDefinitions);GLEW_STATIC</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Windows</SubSystem> diff --git a/source/slang/slang.vcxproj b/source/slang/slang.vcxproj index c50eaaae4..984ec7011 100644 --- a/source/slang/slang.vcxproj +++ b/source/slang/slang.vcxproj @@ -94,6 +94,7 @@ <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -111,6 +112,7 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <BrowseInformation>true</BrowseInformation> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -122,7 +124,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader> </PrecompiledHeader> <Optimization>MaxSpeed</Optimization> @@ -132,6 +134,7 @@ <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -152,6 +155,7 @@ <AdditionalIncludeDirectories>../</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/source/slangc/slangc.vcxproj b/source/slangc/slangc.vcxproj index 10974a853..b39afbe45 100644 --- a/source/slangc/slangc.vcxproj +++ b/source/slangc/slangc.vcxproj @@ -94,6 +94,7 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <AdditionalIncludeDirectories>../;../SpireLib</AdditionalIncludeDirectories> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -110,6 +111,7 @@ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <AdditionalIncludeDirectories>../;../SpireLib</AdditionalIncludeDirectories> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -128,6 +130,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <AdditionalIncludeDirectories>../;../SpireLib</AdditionalIncludeDirectories> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -148,6 +151,7 @@ <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <AdditionalIncludeDirectories>../;../SpireLib</AdditionalIncludeDirectories> <MultiProcessorCompilation>false</MultiProcessorCompilation> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/tools/render-test/render-test.vcxproj b/tools/render-test/render-test.vcxproj index 0b0f6b05e..a175d3973 100644 --- a/tools/render-test/render-test.vcxproj +++ b/tools/render-test/render-test.vcxproj @@ -98,6 +98,7 @@ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -113,6 +114,7 @@ <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -130,6 +132,7 @@ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -149,6 +152,7 @@ <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>../../source/</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> diff --git a/tools/slang-test/main.cpp b/tools/slang-test/main.cpp index cb1730c6e..292b98137 100644 --- a/tools/slang-test/main.cpp +++ b/tools/slang-test/main.cpp @@ -95,8 +95,8 @@ void parseOptions(int* argc, char** argv) { while(argCursor != argEnd) { - char const* arg = *argCursor++; - *writeCursor++ = arg; + char const* nxtArg = *argCursor++; + *writeCursor++ = nxtArg; } break; } @@ -1387,7 +1387,7 @@ TestResult runHLSLAndGLSLComparisonTest(TestInput& input) return runHLSLRenderComparisonTestImpl(input, "-hlsl-rewrite", "-glsl-rewrite"); } -TestResult skipTest(TestInput& input) +TestResult skipTest(TestInput& /*input*/) { return kTestResult_Ignored; } @@ -1579,7 +1579,7 @@ bool testCategoryMatches( } bool testPassesCategoryMask( - TestContext* context, + TestContext* /*context*/, TestOptions const& test) { // Don't include a test we should filter out @@ -1650,7 +1650,7 @@ void runTestsOnFile( static bool endsWithAllowedExtension( - TestContext* context, + TestContext* /*context*/, String filePath) { char const* allowedExtensions[] = { @@ -1723,12 +1723,11 @@ int main( auto quickTestCategory = addTestCategory("quick", fullTestCategory); - auto smokeTestCategory = addTestCategory("smoke", quickTestCategory); + /*auto smokeTestCategory = */addTestCategory("smoke", quickTestCategory); auto renderTestCategory = addTestCategory("render", fullTestCategory); - auto computeTestCategory = addTestCategory("compute", fullTestCategory); - + /*auto computeTestCategory = */addTestCategory("compute", fullTestCategory); // An un-categorized test will always belong to the `full` category defaultTestCategory = fullTestCategory; diff --git a/tools/slang-test/os.cpp b/tools/slang-test/os.cpp index 4d5a49a9f..8cb49248c 100644 --- a/tools/slang-test/os.cpp +++ b/tools/slang-test/os.cpp @@ -185,7 +185,7 @@ static DWORD WINAPI osReaderThreadProc(LPVOID threadParam) break; } - *writeCursor++ = c; + *writeCursor++ = (char)c; } bytesRead = (DWORD)(writeCursor - buffer); diff --git a/tools/slang-test/slang-test.vcxproj b/tools/slang-test/slang-test.vcxproj index 27453391c..70b35e93b 100644 --- a/tools/slang-test/slang-test.vcxproj +++ b/tools/slang-test/slang-test.vcxproj @@ -93,10 +93,11 @@ <ClCompile> <PrecompiledHeader> </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -107,10 +108,11 @@ <ClCompile> <PrecompiledHeader> </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -119,7 +121,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader> </PrecompiledHeader> <Optimization>MaxSpeed</Optimization> @@ -127,6 +129,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> @@ -137,7 +140,7 @@ </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <PrecompiledHeader> </PrecompiledHeader> <Optimization>MaxSpeed</Optimization> @@ -145,6 +148,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <TreatWarningAsError>true</TreatWarningAsError> </ClCompile> <Link> <SubSystem>Console</SubSystem> |
