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. --- .../slang-reflection-test-shared-library.vcxproj | 182 --------------------- ...-reflection-test-shared-library.vcxproj.filters | 13 -- .../slang-reflection-test-tool.vcxproj | 182 +++++++++++++++++++++ .../slang-reflection-test-tool.vcxproj.filters | 13 ++ .../slang-reflection-test.vcxproj | 178 -------------------- .../slang-reflection-test.vcxproj.filters | 13 -- 6 files changed, 195 insertions(+), 386 deletions(-) delete mode 100644 tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj delete mode 100644 tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters create mode 100644 tools/slang-reflection-test/slang-reflection-test-tool.vcxproj create mode 100644 tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters delete mode 100644 tools/slang-reflection-test/slang-reflection-test.vcxproj delete mode 100644 tools/slang-reflection-test/slang-reflection-test.vcxproj.filters (limited to 'tools/slang-reflection-test') diff --git a/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj b/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj deleted file mode 100644 index 48d08b94e..000000000 --- a/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj +++ /dev/null @@ -1,182 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} - true - Win32Proj - slang-reflection-test-shared-library - - - - 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\slang-reflection-test-shared-library\ - slang-reflection-test-shared-library - .dll - - - true - ..\..\bin\windows-x64\debug\ - ..\..\intermediate\windows-x64\debug\slang-reflection-test-shared-library\ - slang-reflection-test-shared-library - .dll - - - false - ..\..\bin\windows-x86\release\ - ..\..\intermediate\windows-x86\release\slang-reflection-test-shared-library\ - slang-reflection-test-shared-library - .dll - - - false - ..\..\bin\windows-x64\release\ - ..\..\intermediate\windows-x64\release\slang-reflection-test-shared-library\ - slang-reflection-test-shared-library - .dll - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\bin\windows-x86\debug\slang-reflection-test-shared-library.lib - - - - - NotUsing - Level3 - _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Windows - true - ..\..\bin\windows-x64\debug\slang-reflection-test-shared-library.lib - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\bin\windows-x86\release\slang-reflection-test-shared-library.lib - - - - - NotUsing - Level3 - NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Windows - true - true - ..\..\bin\windows-x64\release\slang-reflection-test-shared-library.lib - - - - - - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - - - - \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters b/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters deleted file mode 100644 index e9ae1c092..000000000 --- a/tools/slang-reflection-test/slang-reflection-test-shared-library.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj new file mode 100644 index 000000000..77efa33f0 --- /dev/null +++ b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj @@ -0,0 +1,182 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} + true + Win32Proj + slang-reflection-test-tool + + + + 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\slang-reflection-test-tool\ + slang-reflection-test-tool + .dll + + + true + ..\..\bin\windows-x64\debug\ + ..\..\intermediate\windows-x64\debug\slang-reflection-test-tool\ + slang-reflection-test-tool + .dll + + + false + ..\..\bin\windows-x86\release\ + ..\..\intermediate\windows-x86\release\slang-reflection-test-tool\ + slang-reflection-test-tool + .dll + + + false + ..\..\bin\windows-x64\release\ + ..\..\intermediate\windows-x64\release\slang-reflection-test-tool\ + slang-reflection-test-tool + .dll + + + + NotUsing + Level3 + _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\bin\windows-x86\debug\slang-reflection-test-tool.lib + + + + + NotUsing + Level3 + _DEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + EditAndContinue + Disabled + MultiThreadedDebug + + + Windows + true + ..\..\bin\windows-x64\debug\slang-reflection-test-tool.lib + + + + + NotUsing + Level3 + NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\bin\windows-x86\release\slang-reflection-test-tool.lib + + + + + NotUsing + Level3 + NDEBUG;SLANG_SHARED_LIBRARY_TOOL;%(PreprocessorDefinitions) + ..\..;%(AdditionalIncludeDirectories) + Full + true + true + false + true + MultiThreaded + + + Windows + true + true + ..\..\bin\windows-x64\release\slang-reflection-test-tool.lib + + + + + + + + {F9BE7957-8399-899E-0C49-E714FDDD4B65} + + + {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} + + + + + + \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters new file mode 100644 index 000000000..e9ae1c092 --- /dev/null +++ b/tools/slang-reflection-test/slang-reflection-test-tool.vcxproj.filters @@ -0,0 +1,13 @@ + + + + + {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} + + + + + Source Files + + + \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test.vcxproj b/tools/slang-reflection-test/slang-reflection-test.vcxproj deleted file mode 100644 index 8a40290e6..000000000 --- a/tools/slang-reflection-test/slang-reflection-test.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {22C45F4F-FB6B-4535-BED1-D3F5D0C71047} - true - Win32Proj - slang-reflection-test - - - - 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\slang-reflection-test\ - slang-reflection-test - .exe - - - true - ..\..\bin\windows-x64\debug\ - ..\..\intermediate\windows-x64\debug\slang-reflection-test\ - slang-reflection-test - .exe - - - false - ..\..\bin\windows-x86\release\ - ..\..\intermediate\windows-x86\release\slang-reflection-test\ - slang-reflection-test - .exe - - - false - ..\..\bin\windows-x64\release\ - ..\..\intermediate\windows-x64\release\slang-reflection-test\ - slang-reflection-test - .exe - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Console - true - - - - - NotUsing - Level3 - _DEBUG;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - EditAndContinue - Disabled - MultiThreadedDebug - - - Console - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - - - NotUsing - Level3 - NDEBUG;%(PreprocessorDefinitions) - ..\..;%(AdditionalIncludeDirectories) - Full - true - true - false - true - MultiThreaded - - - Console - true - true - - - - - - - - {DB00DA62-0533-4AFD-B59F-A67D5B3A0808} - - - {F9BE7957-8399-899E-0C49-E714FDDD4B65} - - - - - - \ No newline at end of file diff --git a/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters b/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters deleted file mode 100644 index e9ae1c092..000000000 --- a/tools/slang-reflection-test/slang-reflection-test.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6} - - - - - Source Files - - - \ No newline at end of file -- cgit v1.2.3