diff --git a/renderdoc.sln b/renderdoc.sln index 090748bba..b2a44e244 100644 --- a/renderdoc.sln +++ b/renderdoc.sln @@ -55,6 +55,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dxgi", "renderdoc\driver\dx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dxbc", "renderdoc\driver\shaders\dxbc\renderdoc_dxbc.vcxproj", "{C43FF27E-A155-4852-88EC-5CE9334C07A8}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dxil", "renderdoc\driver\shaders\dxil\renderdoc_dxil.vcxproj", "{8AE46EC2-EA46-441F-BEE2-94097101D6A3}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d3d11", "renderdoc\driver\d3d11\renderdoc_d3d11.vcxproj", "{F1E59A05-60D4-4927-9E57-DD191EAE90EF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "d3d8", "renderdoc\driver\d3d8\renderdoc_d3d8.vcxproj", "{9C4487E8-EEB0-4A7F-BD81-23F81CD24E22}" @@ -177,6 +179,14 @@ Global {C43FF27E-A155-4852-88EC-5CE9334C07A8}.Release|x64.Build.0 = Release|x64 {C43FF27E-A155-4852-88EC-5CE9334C07A8}.Release|x86.ActiveCfg = Release|Win32 {C43FF27E-A155-4852-88EC-5CE9334C07A8}.Release|x86.Build.0 = Release|Win32 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Development|x64.ActiveCfg = Development|x64 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Development|x64.Build.0 = Development|x64 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Development|x86.ActiveCfg = Development|Win32 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Development|x86.Build.0 = Development|Win32 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Release|x64.ActiveCfg = Release|x64 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Release|x64.Build.0 = Release|x64 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Release|x86.ActiveCfg = Release|Win32 + {8AE46EC2-EA46-441F-BEE2-94097101D6A3}.Release|x86.Build.0 = Release|Win32 {F1E59A05-60D4-4927-9E57-DD191EAE90EF}.Development|x64.ActiveCfg = Development|x64 {F1E59A05-60D4-4927-9E57-DD191EAE90EF}.Development|x64.Build.0 = Development|x64 {F1E59A05-60D4-4927-9E57-DD191EAE90EF}.Development|x86.ActiveCfg = Development|Win32 @@ -294,6 +304,7 @@ Global {0AAE0AD1-371B-4A36-9ED1-80E10E960605} = {DB2DDA74-A668-4AC7-A1D5-198C9F0BD242} {2A793574-BD3C-46D4-9788-C339D9550CE1} = {864A44B0-5612-451A-857F-41E3EF785EF6} {C43FF27E-A155-4852-88EC-5CE9334C07A8} = {DB2DDA74-A668-4AC7-A1D5-198C9F0BD242} + {8AE46EC2-EA46-441F-BEE2-94097101D6A3} = {DB2DDA74-A668-4AC7-A1D5-198C9F0BD242} {F1E59A05-60D4-4927-9E57-DD191EAE90EF} = {864A44B0-5612-451A-857F-41E3EF785EF6} {9C4487E8-EEB0-4A7F-BD81-23F81CD24E22} = {864A44B0-5612-451A-857F-41E3EF785EF6} {44044776-9469-4079-B587-ABFFF6574AA4} = {864A44B0-5612-451A-857F-41E3EF785EF6} diff --git a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj index 79e5e1f86..b6903feed 100644 --- a/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj +++ b/renderdoc/driver/d3d12/renderdoc_d3d12.vcxproj @@ -165,6 +165,14 @@ false false + + {8ae46ec2-ea46-441f-bee2-94097101d6a3} + false + true + false + false + false + diff --git a/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp b/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp new file mode 100644 index 000000000..00680aff0 --- /dev/null +++ b/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp @@ -0,0 +1,29 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2019 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#include "dxil_bytecode.h" + +namespace DXIL +{ +}; \ No newline at end of file diff --git a/renderdoc/driver/shaders/dxil/dxil_bytecode.h b/renderdoc/driver/shaders/dxil/dxil_bytecode.h new file mode 100644 index 000000000..a19bdb4ff --- /dev/null +++ b/renderdoc/driver/shaders/dxil/dxil_bytecode.h @@ -0,0 +1,31 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2019 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#pragma once + +#include + +namespace DXIL +{ +}; // namespace DXIL diff --git a/renderdoc/driver/shaders/dxil/precompiled.cpp b/renderdoc/driver/shaders/dxil/precompiled.cpp new file mode 100644 index 000000000..cefb5e25c --- /dev/null +++ b/renderdoc/driver/shaders/dxil/precompiled.cpp @@ -0,0 +1,25 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2017-2019 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#include "precompiled.h" \ No newline at end of file diff --git a/renderdoc/driver/shaders/dxil/precompiled.h b/renderdoc/driver/shaders/dxil/precompiled.h new file mode 100644 index 000000000..5558a29b4 --- /dev/null +++ b/renderdoc/driver/shaders/dxil/precompiled.h @@ -0,0 +1,29 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2017-2019 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#pragma once + +#include "api/app/renderdoc_app.h" +#include "api/replay/renderdoc_replay.h" +#include "common/common.h" diff --git a/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj b/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj new file mode 100644 index 000000000..f90fa8852 --- /dev/null +++ b/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj @@ -0,0 +1,114 @@ + + + + + Development + Win32 + + + Development + x64 + + + Release + Win32 + + + Release + x64 + + + + {8AE46EC2-EA46-441F-BEE2-94097101D6A3} + Win32Proj + renderdoc_dxil + dxil + + + + StaticLibrary + true + Unicode + v140 + + + true + + + + + + + $(SolutionDir)$(Platform)\$(Configuration)\ + $(ExecutablePath) + $(SolutionDir)\breakpad;$(IncludePath) + $(LibraryPath) + $(ExcludePath) + driver_$(ProjectName) + + + $(SolutionDir)$(Platform)\$(Configuration)\obj\$(ProjectName)\ + + + + WIN64;%(PreprocessorDefinitions) + + + + + RELEASE;%(PreprocessorDefinitions) + + + + + MultiThreadedDLL + false + true + false + ProgramDatabase + $(SolutionDir)renderdoc\;$(SolutionDir)renderdoc\3rdparty\ + RENDERDOC_EXPORTS;RENDERDOC_PLATFORM_WIN32;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + Level4 + true + 4100 + Use + precompiled.h + precompiled.h + + + Windows + true + + + + + Disabled + + + + + MaxSpeed + Default + true + true + false + + + true + true + + + + + + Create + + + + + + + + + + \ No newline at end of file diff --git a/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj.filters b/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj.filters new file mode 100644 index 000000000..63ebfbc6d --- /dev/null +++ b/renderdoc/driver/shaders/dxil/renderdoc_dxil.vcxproj.filters @@ -0,0 +1,20 @@ + + + + + + PCH + + + + + + PCH + + + + + {e2e9c81c-f38d-4945-92e1-40f778c527c2} + + + \ No newline at end of file