summaryrefslogtreecommitdiffstats
path: root/build/visual-studio
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-04-29 11:32:53 +0800
committerGitHub <noreply@github.com>2023-04-29 11:32:53 +0800
commit5adecbe837d27cf4e0a554ae13a0338743a8cb4b (patch)
treec1e791427a2b57165f950f5df264bbaca551ccaf /build/visual-studio
parent5df7ada451a993efff2b80bb1af2d8c7579ba00b (diff)
vkd3d and dxvk integration (#2823)
* Add d3d sources for linux builds * Return NOT_IMPLEMENTED for shared handle support on Linux * Enable DirectX api on Linux * Do not report DX11 support without FXC * Initial version of SynchAPI emulation * Neaten dx library name handling * Neaten and use posix-synchapi * Add premake option for DirectX on Vulkan * s/SLANG_ENABLE_VKD3D_PROTON/SLANG_ENABLE_VKD3D * Skip failing tests on vkd3d * Regenerate vs projects * Silence unused var warning
Diffstat (limited to 'build/visual-studio')
-rw-r--r--build/visual-studio/gfx/gfx.vcxproj2
-rw-r--r--build/visual-studio/gfx/gfx.vcxproj.filters6
2 files changed, 8 insertions, 0 deletions
diff --git a/build/visual-studio/gfx/gfx.vcxproj b/build/visual-studio/gfx/gfx.vcxproj
index 583d78e25..3198cd6e1 100644
--- a/build/visual-studio/gfx/gfx.vcxproj
+++ b/build/visual-studio/gfx/gfx.vcxproj
@@ -372,6 +372,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-framebuffer.h" />
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-helper-functions.h" />
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.h" />
+ <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-posix-synchapi.h" />
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-query.h" />
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-render-pass.h" />
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-resource-views.h" />
@@ -490,6 +491,7 @@ IF EXIST "$(SolutionDir)tools\gfx\slang.slang"\ (xcopy /Q /E /Y /I "$(SolutionDi
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-fence.cpp" />
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-helper-functions.cpp" />
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.cpp" />
+ <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-posix-synchapi.cpp" />
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-query.cpp" />
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-render-pass.cpp" />
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-resource-views.cpp" />
diff --git a/build/visual-studio/gfx/gfx.vcxproj.filters b/build/visual-studio/gfx/gfx.vcxproj.filters
index 1a7ed3d03..c4fcd6046 100644
--- a/build/visual-studio/gfx/gfx.vcxproj.filters
+++ b/build/visual-studio/gfx/gfx.vcxproj.filters
@@ -183,6 +183,9 @@
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-posix-synchapi.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="..\..\..\tools\gfx\d3d12\d3d12-query.h">
<Filter>Header Files</Filter>
</ClInclude>
@@ -533,6 +536,9 @@
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-pipeline-state.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-posix-synchapi.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
<ClCompile Include="..\..\..\tools\gfx\d3d12\d3d12-query.cpp">
<Filter>Source Files</Filter>
</ClCompile>