Skip to content

Commit c2e5d24

Browse files
jsmall-zzzjsmall-zzz
authored
Refactor render-test to make cross platform (shader-slang#1053)
* First pass of render-test refactor. * Make window construction a function that can choose an implementation. * Remove OpenGL as currently has windows dependency. * Disable Vulkan as Renderer impl has dependency on windows. * Pass Window in as parameter of 'update'. * Add win-window.cpp as was missing. * Fix warning on windows about signs during comparison.
1 parent 0b6321b commit c2e5d24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+534
-688
lines changed

‎examples/hello-world/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// design choices in their abstraction layer.
3434
//
3535
#include "gfx/render.h"
36-
#include "gfx/render-d3d11.h"
36+
#include "gfx/d3d11/render-d3d11.h"
3737
#include "gfx/window.h"
3838
using namespace gfx;
3939

‎examples/model-viewer/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
//
1919
#include "gfx/model.h"
2020
#include "gfx/render.h"
21-
#include "gfx/render-d3d11.h"
21+
#include "gfx/d3d11/render-d3d11.h"
2222
#include "gfx/vector-math.h"
2323
#include "gfx/window.h"
2424
#include "gfx/gui.h"

‎premake5.lua

+29-35
Original file line numberDiff line numberDiff line change
@@ -501,42 +501,26 @@ toolSharedLibrary "slang-reflection-test"
501501
-- TODO: Fix that requirement.
502502
--
503503

504-
if isTargetWindows then
505-
toolSharedLibrary "render-test"
506-
uuid "61F7EB00-7281-4BF3-9470-7C2EA92620C3"
507-
508-
includedirs { ".", "external", "source", "tools/gfx" }
509-
links { "core", "slang", "gfx" }
510-
511-
systemversion "10.0.14393.0"
512-
513-
removefiles { "tools/render-test/cpu-render-test-main.cpp" }
514-
515-
-- For Windows targets, we want to copy
516-
-- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable
517-
-- directory into the output directory.
518-
-- d3dcompiler_47.dll is copied from the external/slang-binaries submodule.
519-
postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/" "windows-%{cfg.platform:lower()}"'}
520-
521-
end
522-
523-
toolSharedLibrary "cpu-render-test"
524-
uuid "5701695E-7324-4B4D-977A-8D56C2A041B1"
504+
toolSharedLibrary "render-test"
505+
uuid "61F7EB00-7281-4BF3-9470-7C2EA92620C3"
525506

526507
includedirs { ".", "external", "source", "tools/gfx" }
527508
links { "core", "slang", "gfx" }
509+
510+
removefiles { "tools/render-test/cpu-render-test-main.cpp" }
528511

529-
addSourceDir("tools/render-test")
530-
531-
removefiles { "tools/render-test/render-test-main.cpp" }
532-
533-
if isTargetWindows then
512+
if isTargetWindows then
513+
addSourceDir "tools/render-test/windows"
514+
515+
systemversion "10.0.14393.0"
516+
534517
-- For Windows targets, we want to copy
535518
-- dxcompiler.dll, and dxil.dll from the Windows SDK redistributable
536519
-- directory into the output directory.
537520
-- d3dcompiler_47.dll is copied from the external/slang-binaries submodule.
538-
postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/"'}
539-
end
521+
postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/" "windows-%{cfg.platform:lower()}"'}
522+
end
523+
540524
--
541525
-- `gfx` is a utility library for doing GPU rendering
542526
-- and compute, which is used by both our testing and exmaples.
@@ -561,15 +545,25 @@ tool "gfx"
561545
-- directory into the output directory.
562546
-- d3dcompiler_47.dll is copied from the external/slang-binaries submodule.
563547
postbuildcommands { '"$(SolutionDir)tools\\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/%{cfg.platform:lower()}/" "%{cfg.targetdir}/"'}
548+
549+
addSourceDir "tools/gfx/vulkan"
550+
addSourceDir "tools/gfx/open-gl"
551+
addSourceDir "tools/gfx/d3d"
552+
addSourceDir "tools/gfx/d3d11"
553+
addSourceDir "tools/gfx/d3d12"
554+
555+
addSourceDir "tools/gfx/windows"
556+
557+
elseif targetDetail == "mingw" or targetDetail == "cygwin" then
558+
-- Don't support any render techs...
559+
elseif os.target() == "macosx" then
560+
--addSourceDir "tools/gfx/open-gl"
564561
else
565-
removefiles { "tools/gfx/circular-resource-heap-d3d12.cpp", "tools/gfx/d3d-util.cpp", "tools/gfx/descriptor-heap-d3d12.cpp", "tools/gfx/render-d3d11.cpp", "tools/gfx/render-d3d12.cpp", "tools/gfx/render-gl.cpp", "tools/gfx/resource-d3d12.cpp", "tools/gfx/render-vk.cpp", "tools/gfx/vk-swap-chain.cpp", "tools/gfx/window.cpp" }
562+
-- Linux like
563+
--addSourceDir "tools/gfx/vulkan"
564+
--addSourceDir "tools/gfx/open-gl"
566565
end
567-
568-
-- Remove VK from OSX gfx build
569-
if os.target() == "macosx" then
570-
removefiles { "tools/gfx/render-vk.cpp", "tools/gfx/vk-device-queue.cpp", "tools/gfx/vk-api.cpp", "tools/gfx/vk-module.cpp", "tools/gfx/vk-swap-chain.cpp", "tools/gfx/vk-util.cpp" }
571-
end
572-
566+
573567
filter { "system:linux" }
574568
-- might be able to do pic(true)
575569
buildoptions{"-fPIC"}

‎slang.sln

-11
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang-reflection-test-tool"
2323
EndProject
2424
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "render-test-tool", "tools\render-test\render-test-tool.vcxproj", "{61F7EB00-7281-4BF3-9470-7C2EA92620C3}"
2525
EndProject
26-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpu-render-test-tool", "tools\cpu-render-test\cpu-render-test-tool.vcxproj", "{5701695E-7324-4B4D-977A-8D56C2A041B1}"
27-
EndProject
2826
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slangc", "source\slangc\slangc.vcxproj", "{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}"
2927
EndProject
3028
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "slang", "source\slang\slang.vcxproj", "{DB00DA62-0533-4AFD-B59F-A67D5B3A0808}"
@@ -106,14 +104,6 @@ Global
106104
{61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|Win32.Build.0 = Release|Win32
107105
{61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|x64.ActiveCfg = Release|x64
108106
{61F7EB00-7281-4BF3-9470-7C2EA92620C3}.Release|x64.Build.0 = Release|x64
109-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Debug|Win32.ActiveCfg = Debug|Win32
110-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Debug|Win32.Build.0 = Debug|Win32
111-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Debug|x64.ActiveCfg = Debug|x64
112-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Debug|x64.Build.0 = Debug|x64
113-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Release|Win32.ActiveCfg = Release|Win32
114-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Release|Win32.Build.0 = Release|Win32
115-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Release|x64.ActiveCfg = Release|x64
116-
{5701695E-7324-4B4D-977A-8D56C2A041B1}.Release|x64.Build.0 = Release|x64
117107
{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.ActiveCfg = Debug|Win32
118108
{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|Win32.Build.0 = Debug|Win32
119109
{D56CBCEB-1EB5-4CA8-AEC4-48EA35ED61C7}.Debug|x64.ActiveCfg = Debug|x64
@@ -150,6 +140,5 @@ Global
150140
{222F7498-B40C-4F3F-A704-DDEB91A4484A} = {FD47AE19-69FD-260F-F2F1-20E65EA61D13}
151141
{C5ACCA6E-C04D-4B36-8516-3752B3C13C2F} = {57B5AA5E-C340-1823-CC51-9B17385C7423}
152142
{61F7EB00-7281-4BF3-9470-7C2EA92620C3} = {57B5AA5E-C340-1823-CC51-9B17385C7423}
153-
{5701695E-7324-4B4D-977A-8D56C2A041B1} = {57B5AA5E-C340-1823-CC51-9B17385C7423}
154143
EndGlobalSection
155144
EndGlobal

‎tools/cpu-render-test/cpu-render-test-tool.vcxproj

-213
This file was deleted.

0 commit comments

Comments
 (0)