From d2ddc590601778f309c81f7d19d5e7fed34210de Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 17 Dec 2018 09:22:14 -0500 Subject: Feature/test tool shared libraries (#758) * Remove circular reference to renderer on Vk & D3D12 DescriptorSetImpl * Refactor Stbi image loading such that memory is correctly freed when goes out of scope. Added Crt memory dump at termination. Reduced erroneous reporting by scoping TestContext. * Used capitalized acronym for STBImage to keep Tim happy. * Split out TestReporter - to just handle reporting test results Split out Options Made TestContext hold options, and the reporter Removed remaining memory leaks. * Small optimization for rawWrite, such that it directly writes over print.. * Improve comments on TestCategorySet * Fix typos in TestCategorySet * Made slangc a cpp file as part of slang-test (removing need for separate project/shared library). * * Made all test tools only available as dlls. * Made possible to invoke test tool dll from command line slang-test slangc [--bindir xxx] options to slangc * Fix Visual Studio projects that are no longer needed. --- .../render-test/render-test-shared-library.vcxproj | 210 --------------------- .../render-test-shared-library.vcxproj.filters | 48 ----- tools/render-test/render-test-tool.vcxproj | 210 +++++++++++++++++++++ tools/render-test/render-test-tool.vcxproj.filters | 48 +++++ tools/render-test/render-test.vcxproj | 206 -------------------- tools/render-test/render-test.vcxproj.filters | 48 ----- 6 files changed, 258 insertions(+), 512 deletions(-) delete mode 100644 tools/render-test/render-test-shared-library.vcxproj delete mode 100644 tools/render-test/render-test-shared-library.vcxproj.filters create mode 100644 tools/render-test/render-test-tool.vcxproj create mode 100644 tools/render-test/render-test-tool.vcxproj.filters delete mode 100644 tools/render-test/render-test.vcxproj delete mode 100644 tools/render-test/render-test.vcxproj.filters (limited to 'tools/render-test') diff --git a/tools/render-test/render-test-shared-library.vcxproj b/tools/render-test/render-test-shared-library.vcxproj deleted file mode 100644 index 359a35b80..000000000 --- a/tools/render-test/render-test-shared-library.vcxproj +++ /dev/null @@ -1,210 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {61F7EB00-7281-4BF3-9470-7C2EA92620C3} - true - Win32Proj - render-test-shared-library - 10.0.14393.0 - - - - DynamicLibrary - true - Unicode - v140 - - - DynamicLibrary - true - Unicode - v140 - - - DynamicLibrary - false - Unicode - v140 - - - DynamicLibrary - false - Unicode - v140 - - - - - - - - - - - - - - - - - - - true - ..\..\bin\windows-x86\debug\ - ..\..\intermediate\windows-x86\debug\render-test-shared-library\ - render-test-shared-library - .dll - - - true - ..\..\bin\windows-x64\debug\ - ..\..\intermediate\windows-x64\debug\render-test-shared-library\ - render-test-shared-library - .dll - - - false - ..\..\bin\windows-x86\release\ - ..\..\intermediate\windows-x86\release\render-test-shared-library\ - render-test-shared-library - .dll - - - false - ..\..\bin\windows-x64\release\ - ..\..\intermediate\windows-x64\release\render-test-shared-library\ - render-test-shared-library - .dll - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\bin\windows-x86\debug\render-test-shared-library.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/" - - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\bin\windows-x64\debug\render-test-shared-library.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/" - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\bin\windows-x86\release\render-test-shared-library.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/" - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\bin\windows-x64\release\render-test-shared-library.lib - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/" - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - - - - \ No newline at end of file diff --git a/tools/render-test/render-test-shared-library.vcxproj.filters b/tools/render-test/render-test-shared-library.vcxproj.filters deleted file mode 100644 index ff3d52a7e..000000000 --- a/tools/render-test/render-test-shared-library.vcxproj.filters +++ /dev/null @@ -1,48 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/tools/render-test/render-test-tool.vcxproj b/tools/render-test/render-test-tool.vcxproj new file mode 100644 index 000000000..811ffa56d --- /dev/null +++ b/tools/render-test/render-test-tool.vcxproj @@ -0,0 +1,210 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {61F7EB00-7281-4BF3-9470-7C2EA92620C3} + true + Win32Proj + render-test-tool + 10.0.14393.0 + + + + DynamicLibrary + true + Unicode + v140 + + + DynamicLibrary + true + Unicode + v140 + + + DynamicLibrary + false + Unicode + v140 + + + DynamicLibrary + false + Unicode + v140 + + + + + + + + + + + + + + + + + + + true + ..\..\bin\windows-x86\debug\ + ..\..\intermediate\windows-x86\debug\render-test-tool\ + render-test-tool + .dll + + + true + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\render-test-tool\ + render-test-tool + .dll + + + false + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\render-test-tool\ + render-test-tool + .dll + + + false + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\render-test-tool\ + render-test-tool + .dll + + + + NotUsing + Level3 + _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\bin\windows-x86\debug\render-test-tool.lib + + + "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/" + + + + + NotUsing + Level3 + _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\bin\windows-x64\debug\render-test-tool.lib + + + "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/" + + + + + NotUsing + Level3 + NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\bin\windows-x86\release\render-test-tool.lib + + + "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/" + + + + + NotUsing + Level3 + NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\bin\windows-x64\release\render-test-tool.lib + + + "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/" + + + + + + + + + + + + + + + + + + + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + + + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + + {222F7498-B40C-4F3F-A704-DDEB91A4484A} + + + + + + \ No newline at end of file diff --git a/tools/render-test/render-test-tool.vcxproj.filters b/tools/render-test/render-test-tool.vcxproj.filters new file mode 100644 index 000000000..ff3d52a7e --- /dev/null +++ b/tools/render-test/render-test-tool.vcxproj.filters @@ -0,0 +1,48 @@ + + + + + {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/tools/render-test/render-test.vcxproj b/tools/render-test/render-test.vcxproj deleted file mode 100644 index 91c8bd997..000000000 --- a/tools/render-test/render-test.vcxproj +++ /dev/null @@ -1,206 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {96610759-07B9-4EEB-A974-5C634A2E742B} - true - Win32Proj - render-test - 10.0.14393.0 - - - - Application - true - Unicode - v140 - - - Application - true - Unicode - v140 - - - Application - false - Unicode - v140 - - - Application - false - Unicode - v140 - - - - - - - - - - - - - - - - - - - true - ..\..\bin\windows-x86\debug\ - ..\..\intermediate\windows-x86\debug\render-test\ - render-test - .exe - - - true - ..\..\bin\windows-x64\debug\ - ..\..\intermediate\windows-x64\debug\render-test\ - render-test - .exe - - - false - ..\..\bin\windows-x86\release\ - ..\..\intermediate\windows-x86\release\render-test\ - render-test - .exe - - - false - ..\..\bin\windows-x64\release\ - ..\..\intermediate\windows-x64\release\render-test\ - render-test - .exe - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Console - true - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/" - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Console - true - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/" - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/" - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..;..\..\external;..\..\source;..\gfx;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - "$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/" - - - - - - - - - - - - - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {222F7498-B40C-4F3F-A704-DDEB91A4484A} - - - - - - \ No newline at end of file diff --git a/tools/render-test/render-test.vcxproj.filters b/tools/render-test/render-test.vcxproj.filters deleted file mode 100644 index ff3d52a7e..000000000 --- a/tools/render-test/render-test.vcxproj.filters +++ /dev/null @@ -1,48 +0,0 @@ - - - - - {21EB8090-0D4E-1035-B6D3-48EBA215DCB7} - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file -- cgit v1.2.3