summaryrefslogtreecommitdiff
path: root/tools/gfx
diff options
context:
space:
mode:
authorjsmall-nvidia <jsmall@nvidia.com>2020-12-04 13:03:29 -0500
committerGitHub <noreply@github.com>2020-12-04 10:03:29 -0800
commit47ed0f68602a8ed0c425d2a4666969ad0db04ca6 (patch)
treec104f182dbf1a2b9e12e8d383215749e11ab35dc /tools/gfx
parent277780ab7770453ed12e82df10d2a9d79ebf47dd (diff)
Projects in 'build' and Slang API separation (#1624)
* #include an absolute path didn't work - because paths were taken to always be relative. * Move reflection to reflection-api. * Slight reorg to pull out potentially Slang internal functions from the reflection API impls. * Remove visual studio projects * Fix for slang-binaries copy. * Add the visual studio projects in build/visual-studio * Remove miniz project. * Differentiate the linePath from the filePath. * Improve comment in premake5.lua + to kick of CI. * Kick CI.
Diffstat (limited to 'tools/gfx')
-rw-r--r--tools/gfx/gfx.vcxproj222
-rw-r--r--tools/gfx/gfx.vcxproj.filters141
2 files changed, 0 insertions, 363 deletions
diff --git a/tools/gfx/gfx.vcxproj b/tools/gfx/gfx.vcxproj
deleted file mode 100644
index 327f6d629..000000000
--- a/tools/gfx/gfx.vcxproj
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{222F7498-B40C-4F3F-A704-DDEB91A4484A}</ProjectGuid>
- <IgnoreWarnCompileDuplicatedFilename>true</IgnoreWarnCompileDuplicatedFilename>
- <Keyword>Win32Proj</Keyword>
- <RootNamespace>gfx</RootNamespace>
- <WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>true</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>StaticLibrary</ConfigurationType>
- <UseDebugLibraries>false</UseDebugLibraries>
- <CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v140</PlatformToolset>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>..\..\bin\windows-x86\debug\</OutDir>
- <IntDir>..\..\intermediate\windows-x86\debug\gfx\</IntDir>
- <TargetName>gfx</TargetName>
- <TargetExt>.lib</TargetExt>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <OutDir>..\..\bin\windows-x64\debug\</OutDir>
- <IntDir>..\..\intermediate\windows-x64\debug\gfx\</IntDir>
- <TargetName>gfx</TargetName>
- <TargetExt>.lib</TargetExt>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>..\..\bin\windows-x86\release\</OutDir>
- <IntDir>..\..\intermediate\windows-x86\release\gfx\</IntDir>
- <TargetName>gfx</TargetName>
- <TargetExt>.lib</TargetExt>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <OutDir>..\..\bin\windows-x64\release\</OutDir>
- <IntDir>..\..\intermediate\windows-x64\release\gfx\</IntDir>
- <TargetName>gfx</TargetName>
- <TargetExt>.lib</TargetExt>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <Optimization>Disabled</Optimization>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <PostBuildEvent>
- <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/debug/"</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <Optimization>Disabled</Optimization>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- </Link>
- <PostBuildEvent>
- <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/debug/"</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <MinimalRebuild>false</MinimalRebuild>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- <PostBuildEvent>
- <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x86/" "../../bin/windows-x86/release/"</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <PrecompiledHeader>NotUsing</PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <AdditionalIncludeDirectories>..\..;..\..\external;..\..\source;..\..\external\imgui;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <Optimization>Full</Optimization>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <MinimalRebuild>false</MinimalRebuild>
- <StringPooling>true</StringPooling>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- </ClCompile>
- <Link>
- <SubSystem>Windows</SubSystem>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <OptimizeReferences>true</OptimizeReferences>
- </Link>
- <PostBuildEvent>
- <Command>"$(SolutionDir)tools\copy-hlsl-libs.bat" "$(WindowsSdkDir)Redist/D3D/x64/" "../../bin/windows-x64/release/"</Command>
- </PostBuildEvent>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClInclude Include="d3d\d3d-util.h" />
- <ClInclude Include="d3d11\render-d3d11.h" />
- <ClInclude Include="d3d12\circular-resource-heap-d3d12.h" />
- <ClInclude Include="d3d12\descriptor-heap-d3d12.h" />
- <ClInclude Include="d3d12\render-d3d12.h" />
- <ClInclude Include="d3d12\resource-d3d12.h" />
- <ClInclude Include="flag-combiner.h" />
- <ClInclude Include="gui.h" />
- <ClInclude Include="model.h" />
- <ClInclude Include="nvapi\nvapi-include.h" />
- <ClInclude Include="nvapi\nvapi-util.h" />
- <ClInclude Include="open-gl\render-gl.h" />
- <ClInclude Include="render.h" />
- <ClInclude Include="surface.h" />
- <ClInclude Include="vector-math.h" />
- <ClInclude Include="vulkan\render-vk.h" />
- <ClInclude Include="vulkan\vk-api.h" />
- <ClInclude Include="vulkan\vk-device-queue.h" />
- <ClInclude Include="vulkan\vk-module.h" />
- <ClInclude Include="vulkan\vk-swap-chain.h" />
- <ClInclude Include="vulkan\vk-util.h" />
- <ClInclude Include="window.h" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="d3d\d3d-util.cpp" />
- <ClCompile Include="d3d11\render-d3d11.cpp" />
- <ClCompile Include="d3d12\circular-resource-heap-d3d12.cpp" />
- <ClCompile Include="d3d12\descriptor-heap-d3d12.cpp" />
- <ClCompile Include="d3d12\render-d3d12.cpp" />
- <ClCompile Include="d3d12\resource-d3d12.cpp" />
- <ClCompile Include="flag-combiner.cpp" />
- <ClCompile Include="gui.cpp" />
- <ClCompile Include="model.cpp" />
- <ClCompile Include="nvapi\nvapi-util.cpp" />
- <ClCompile Include="open-gl\render-gl.cpp" />
- <ClCompile Include="render.cpp" />
- <ClCompile Include="surface.cpp" />
- <ClCompile Include="vulkan\render-vk.cpp" />
- <ClCompile Include="vulkan\vk-api.cpp" />
- <ClCompile Include="vulkan\vk-device-queue.cpp" />
- <ClCompile Include="vulkan\vk-module.cpp" />
- <ClCompile Include="vulkan\vk-swap-chain.cpp" />
- <ClCompile Include="vulkan\vk-util.cpp" />
- <ClCompile Include="windows\win-window.cpp" />
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/tools/gfx/gfx.vcxproj.filters b/tools/gfx/gfx.vcxproj.filters
deleted file mode 100644
index f5fba2295..000000000
--- a/tools/gfx/gfx.vcxproj.filters
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Header Files">
- <UniqueIdentifier>{21EB8090-0D4E-1035-B6D3-48EBA215DCB7}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files">
- <UniqueIdentifier>{E9C7FDCE-D52A-8D73-7EB0-C5296AF258F6}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="d3d\d3d-util.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="d3d11\render-d3d11.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="d3d12\circular-resource-heap-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="d3d12\descriptor-heap-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="d3d12\render-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="d3d12\resource-d3d12.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="flag-combiner.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="gui.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="model.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="nvapi\nvapi-include.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="nvapi\nvapi-util.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="open-gl\render-gl.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="render.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="surface.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vector-math.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vulkan\render-vk.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vulkan\vk-api.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vulkan\vk-device-queue.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vulkan\vk-module.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vulkan\vk-swap-chain.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="vulkan\vk-util.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="window.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="d3d\d3d-util.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="d3d11\render-d3d11.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="d3d12\circular-resource-heap-d3d12.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="d3d12\descriptor-heap-d3d12.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="d3d12\render-d3d12.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="d3d12\resource-d3d12.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="flag-combiner.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="gui.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="model.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="nvapi\nvapi-util.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="open-gl\render-gl.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="render.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="surface.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="vulkan\render-vk.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="vulkan\vk-api.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="vulkan\vk-device-queue.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="vulkan\vk-module.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="vulkan\vk-swap-chain.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="vulkan\vk-util.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="windows\win-window.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project> \ No newline at end of file