Skip to content

Commit d6d6f99

Browse files
aleksis-karastiealeksis-karastie
authored
Merge pull request #39 from Unity-Technologies/update-dx12-plugin
Update dx12 plugin
2 parents 58c639a + 9bfd3e2 commit d6d6f99

27 files changed

+2613
-942
lines changed

‎PluginSource/projects/UWPVisualStudio2015/RenderingPlugin.sln‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎PluginSource/projects/UWPVisualStudio2015/RenderingPlugin.vcxproj‎

Lines changed: 0 additions & 367 deletions
This file was deleted.

‎PluginSource/projects/VisualStudio2015/RenderingPlugin.sln‎ renamed to ‎PluginSource/projects/UWPVisualStudio2022/RenderingPlugin.sln‎

File renamed without changes.

‎PluginSource/projects/UWPVisualStudio2022/RenderingPlugin.vcxproj‎

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,251 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClInclude Include="..\..\source\gl3w\gl3w.h" />
23+
<ClInclude Include="..\..\source\gl3w\glcorearb.h" />
24+
<ClInclude Include="..\..\source\PlatformBase.h" />
25+
<ClInclude Include="..\..\source\RenderAPI.h" />
26+
<ClInclude Include="..\..\source\Unity\IUnityGraphics.h" />
27+
<ClInclude Include="..\..\source\Unity\IUnityGraphicsD3D11.h" />
28+
<ClInclude Include="..\..\source\Unity\IUnityGraphicsD3D12.h" />
29+
<ClInclude Include="..\..\source\Unity\IUnityGraphicsD3D9.h" />
30+
<ClInclude Include="..\..\source\Unity\IUnityGraphicsMetal.h" />
31+
<ClInclude Include="..\..\source\Unity\IUnityInterface.h" />
32+
</ItemGroup>
33+
<ItemGroup>
34+
<ClCompile Include="..\..\source\gl3w\gl3w.c" />
35+
<ClCompile Include="..\..\source\RenderAPI.cpp" />
36+
<ClCompile Include="..\..\source\RenderAPI_D3D11.cpp" />
37+
<ClCompile Include="..\..\source\RenderAPI_D3D12.cpp" />
38+
<ClCompile Include="..\..\source\RenderAPI_OpenGLCoreES.cpp" />
39+
<ClCompile Include="..\..\source\RenderAPI_Vulkan.cpp">
40+
<AdditionalIncludeDirectories>$(VULKAN_SDK)\Include</AdditionalIncludeDirectories>
41+
<AdditionalIncludeDirectories>$(VULKAN_SDK)\Include</AdditionalIncludeDirectories>
42+
</ClCompile>
43+
<ClCompile Include="..\..\source\RenderingPlugin.cpp" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<None Include="..\..\source\RenderingPlugin.def" />
47+
<None Include="packages.config" />
48+
</ItemGroup>
49+
<ItemGroup>
50+
<None Include="..\..\source\RenderAPI_Metal.mm">
51+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
52+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
53+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
54+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
55+
</None>
56+
</ItemGroup>
57+
<PropertyGroup Label="Globals">
58+
<ProjectGuid>{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}</ProjectGuid>
59+
<RootNamespace>RenderingPlugin</RootNamespace>
60+
<Keyword>Win32Proj</Keyword>
61+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
62+
</PropertyGroup>
63+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
64+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
65+
<ConfigurationType>DynamicLibrary</ConfigurationType>
66+
<PlatformToolset>v143</PlatformToolset>
67+
<CharacterSet>Unicode</CharacterSet>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
70+
<ConfigurationType>DynamicLibrary</ConfigurationType>
71+
<PlatformToolset>v143</PlatformToolset>
72+
<CharacterSet>Unicode</CharacterSet>
73+
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
75+
<ConfigurationType>DynamicLibrary</ConfigurationType>
76+
<PlatformToolset>v143</PlatformToolset>
77+
<CharacterSet>Unicode</CharacterSet>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
80+
<ConfigurationType>DynamicLibrary</ConfigurationType>
81+
<CharacterSet>Unicode</CharacterSet>
82+
<PlatformToolset>v143</PlatformToolset>
83+
</PropertyGroup>
84+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
85+
<ImportGroup Label="ExtensionSettings">
86+
</ImportGroup>
87+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
88+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
89+
</ImportGroup>
90+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
91+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
92+
</ImportGroup>
93+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
94+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
95+
</ImportGroup>
96+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
97+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
98+
</ImportGroup>
99+
<PropertyGroup Label="UserMacros" />
100+
<PropertyGroup>
101+
<_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
102+
</PropertyGroup>
103+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
104+
<OutDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</OutDir>
105+
<IntDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</IntDir>
106+
<IncludePath>$(IncludePath)</IncludePath>
107+
</PropertyGroup>
108+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
109+
<OutDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</OutDir>
110+
<IntDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</IntDir>
111+
<IncludePath>$(IncludePath)</IncludePath>
112+
</PropertyGroup>
113+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
114+
<OutDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</OutDir>
115+
<IntDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</IntDir>
116+
<IncludePath>$(IncludePath)</IncludePath>
117+
</PropertyGroup>
118+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
119+
<OutDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</OutDir>
120+
<IntDir>$(SolutionDir)..\..\build\uwp\$(Platform)\$(Configuration)\</IntDir>
121+
<IncludePath>$(IncludePath)</IncludePath>
122+
</PropertyGroup>
123+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
124+
<ClCompile>
125+
<PreprocessorDefinitions>GLEW_STATIC;WIN32</PreprocessorDefinitions>
126+
<PrecompiledHeader />
127+
<WarningLevel>Level3</WarningLevel>
128+
<LanguageStandard>stdcpp17</LanguageStandard>
129+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
130+
<OmitFramePointers>true</OmitFramePointers>
131+
</ClCompile>
132+
<Link>
133+
<AdditionalDependencies>opengl32.lib;d3d12.lib</AdditionalDependencies>
134+
<GenerateDebugInformation>true</GenerateDebugInformation>
135+
<SubSystem>Windows</SubSystem>
136+
<ModuleDefinitionFile>../../source/RenderingPlugin.def</ModuleDefinitionFile>
137+
</Link>
138+
<PostBuildEvent>
139+
<Command>SETLOCAL
140+
141+
if "$(PlatformShortName)" == "x86" (
142+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x86
143+
) else (
144+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x64
145+
)
146+
echo Target Plugin Path is %TARGET_PLUGIN_PATH%
147+
copy /Y "$(TargetPath)" "%TARGET_PLUGIN_PATH%\$(TargetFileName)"
148+
149+
ENDLOCAL
150+
</Command>
151+
</PostBuildEvent>
152+
</ItemDefinitionGroup>
153+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
154+
<ClCompile>
155+
<PreprocessorDefinitions>GLEW_STATIC;WIN32</PreprocessorDefinitions>
156+
<PrecompiledHeader>
157+
</PrecompiledHeader>
158+
<WarningLevel>Level3</WarningLevel>
159+
<LanguageStandard>stdcpp17</LanguageStandard>
160+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
161+
<OmitFramePointers>true</OmitFramePointers>
162+
</ClCompile>
163+
<Link>
164+
<AdditionalDependencies>opengl32.lib;d3d12.lib</AdditionalDependencies>
165+
<GenerateDebugInformation>true</GenerateDebugInformation>
166+
<SubSystem>Windows</SubSystem>
167+
<ModuleDefinitionFile>../../source/RenderingPlugin.def</ModuleDefinitionFile>
168+
</Link>
169+
<PostBuildEvent>
170+
<Command>SETLOCAL
171+
172+
if "$(PlatformShortName)" == "x86" (
173+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x86
174+
) else (
175+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x64
176+
)
177+
echo Target Plugin Path is %TARGET_PLUGIN_PATH%
178+
copy /Y "$(TargetPath)" "%TARGET_PLUGIN_PATH%\$(TargetFileName)"
179+
180+
ENDLOCAL
181+
</Command>
182+
</PostBuildEvent>
183+
</ItemDefinitionGroup>
184+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
185+
<ClCompile>
186+
<PreprocessorDefinitions>GLEW_STATIC;WIN32</PreprocessorDefinitions>
187+
<PrecompiledHeader />
188+
<WarningLevel>Level3</WarningLevel>
189+
<LanguageStandard>stdcpp17</LanguageStandard>
190+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
191+
<OmitFramePointers>true</OmitFramePointers>
192+
</ClCompile>
193+
<Link>
194+
<AdditionalDependencies>opengl32.lib;d3d12.lib</AdditionalDependencies>
195+
<GenerateDebugInformation>true</GenerateDebugInformation>
196+
<SubSystem>Windows</SubSystem>
197+
<ModuleDefinitionFile>../../source/RenderingPlugin.def</ModuleDefinitionFile>
198+
</Link>
199+
<PostBuildEvent>
200+
<Command>SETLOCAL
201+
202+
if "$(PlatformShortName)" == "x86" (
203+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x86
204+
) else (
205+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x64
206+
)
207+
echo Target Plugin Path is %TARGET_PLUGIN_PATH%
208+
copy /Y "$(TargetPath)" "%TARGET_PLUGIN_PATH%\$(TargetFileName)"
209+
210+
ENDLOCAL
211+
</Command>
212+
</PostBuildEvent>
213+
</ItemDefinitionGroup>
214+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
215+
<ClCompile>
216+
<PreprocessorDefinitions>GLEW_STATIC;WIN32</PreprocessorDefinitions>
217+
<PrecompiledHeader>
218+
</PrecompiledHeader>
219+
<WarningLevel>Level3</WarningLevel>
220+
<LanguageStandard>stdcpp17</LanguageStandard>
221+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
222+
<OmitFramePointers>true</OmitFramePointers>
223+
</ClCompile>
224+
<Link>
225+
<AdditionalDependencies>opengl32.lib;d3d12.lib</AdditionalDependencies>
226+
<GenerateDebugInformation>true</GenerateDebugInformation>
227+
<SubSystem>Windows</SubSystem>
228+
<ModuleDefinitionFile>../../source/RenderingPlugin.def</ModuleDefinitionFile>
229+
</Link>
230+
<PostBuildEvent>
231+
<Command>SETLOCAL
232+
233+
if "$(PlatformShortName)" == "x86" (
234+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x86
235+
) else (
236+
set TARGET_PLUGIN_PATH=$(SolutionDir)..\..\..\UnityProject\Assets\Plugins\Metro\UWP\x64
237+
)
238+
echo Target Plugin Path is %TARGET_PLUGIN_PATH%
239+
copy /Y "$(TargetPath)" "%TARGET_PLUGIN_PATH%\$(TargetFileName)"
240+
241+
ENDLOCAL
242+
</Command>
243+
</PostBuildEvent>
244+
</ItemDefinitionGroup>
245+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
246+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
247+
<PropertyGroup>
248+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
249+
</PropertyGroup>
250+
</Target>
251+
</Project>

‎PluginSource/projects/VisualStudio2015/RenderingPlugin.vcxproj.filters‎ renamed to ‎PluginSource/projects/UWPVisualStudio2022/RenderingPlugin.vcxproj.filters‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
</ItemGroup>
5050
<ItemGroup>
5151
<None Include="..\..\source\RenderingPlugin.def" />
52+
<None Include="packages.config" />
5253
</ItemGroup>
5354
<ItemGroup>
5455
<None Include="..\..\source\RenderAPI_Metal.mm" />

‎PluginSource/projects/VisualStudio2022/RenderingPlugin.sln‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.40418.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RenderingPlugin", "RenderingPlugin.vcxproj", "{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Win32 = Debug|Win32
11+
Debug|x64 = Debug|x64
12+
Release|Win32 = Release|Win32
13+
Release|x64 = Release|x64
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Debug|Win32.ActiveCfg = Debug|Win32
17+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Debug|Win32.Build.0 = Debug|Win32
18+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Debug|x64.ActiveCfg = Debug|x64
19+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Debug|x64.Build.0 = Debug|x64
20+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Release|Win32.ActiveCfg = Release|Win32
21+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Release|Win32.Build.0 = Release|Win32
22+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Release|x64.ActiveCfg = Release|x64
23+
{F7CFEF5A-54BD-42E8-A59E-54ABAEB4EA9C}.Release|x64.Build.0 = Release|x64
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

0 commit comments

Comments
 (0)