Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pch on the project. Removed all include that are now not necessary

Browse Source
This commit is contained in:
Patedam
2026-08-04 19:31:31 -04:00
parent aabe585696
commit 5eb8fb7e9d
56 changed files with 131 additions and 1825 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/Entity/Entity.h
-3
View File
@@ -1,14 +1,11 @@
#pragma once
#include <concepts>
#include <Core/Common/CoreUtils.h>
#include <Core/Memory/Allocator.h>
#include <Core/Memory/MemoryArena.h>
#include <Engine/Class.h>
#include <Entity/EntityManager.h>
#include <type_traits>
// Add any new fields into the concept below
#define DECLARE_ENTITY() \
Entity* Base; \
static const Juliet::Class* Kind;
Game/Game.vcxproj
+3
View File
@@ -44,6 +44,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Debug\Game.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -58,6 +59,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Profile\Game.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -72,6 +74,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Release\Game.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
Game/game.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <cstdio>
#include <Windows.h> // TODO: remove because our dll should not be platform dependant
#undef min
#undef max
Juliet/Juliet.vcxproj
+5
View File
@@ -44,6 +44,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Debug\Juliet.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -58,6 +59,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Profile\Juliet.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -72,6 +74,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Release\Juliet.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;JULIET_EXPORT;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -117,6 +120,7 @@
<ClCompile Include="src\Core\Networking\TcpListener.cpp" />
<ClCompile Include="src\Core\Networking\TcpSocket.cpp" />
<ClCompile Include="src\Core\Networking\Win32\Win32SocketPlatformImpl.cpp" />
<ClCompile Include="src\Core\PCH.cpp" />
<ClCompile Include="src\Engine\Debug\MemoryDebugger.cpp" />
<ClCompile Include="src\Engine\Engine.cpp" />
<ClCompile Include="src\Graphics\D3D12\AgilitySDK\d3dx12\d3dx12_property_format_table.cpp" />
@@ -182,6 +186,7 @@
<ClInclude Include="include\Core\Networking\SocketHandle.h" />
<ClInclude Include="include\Core\Networking\TcpListener.h" />
<ClInclude Include="include\Core\Networking\TcpSocket.h" />
<ClInclude Include="include\Core\PCH.h" />
<ClInclude Include="include\Core\Thread\Mutex.h" />
<ClInclude Include="include\Core\Thread\Thread.h" />
<ClInclude Include="include\Engine\Class.h" />
Juliet/Juliet.vcxproj.filters
+6
View File
@@ -228,6 +228,9 @@
<ClCompile Include="src\Core\Networking\Win32\Win32SocketPlatformImpl.cpp">
<Filter>src\Core\Networking\Win32</Filter>
</ClCompile>
<ClCompile Include="src\Core\PCH.cpp">
<Filter>src\Core</Filter>
</ClCompile>
<ClCompile Include="src\Engine\Debug\MemoryDebugger.cpp">
<Filter>src\Engine\Debug</Filter>
</ClCompile>
@@ -423,6 +426,9 @@
<ClInclude Include="include\Core\Networking\TcpSocket.h">
<Filter>include\Core\Networking</Filter>
</ClInclude>
<ClInclude Include="include\Core\PCH.h">
<Filter>include\Core</Filter>
</ClInclude>
<ClInclude Include="include\Core\Thread\Mutex.h">
<Filter>include\Core\Thread</Filter>
</ClInclude>
Juliet/include/Core/Common/CoreTypes.h
-4
View File
@@ -1,9 +1,5 @@
#pragma once
#include <cstddef>
#include <cstdint>
#include <limits>
using uint8 = uint8_t;
using uint16 = uint16_t;
using uint32 = uint32_t;
Juliet/include/Core/Common/CoreUtils.h
-6
View File
@@ -3,12 +3,6 @@
#include <Core/Common/CoreTypes.h>
#include <Juliet.h>
#include <algorithm>
#include <bit>
#include <cassert>
#include <concepts>
#include <source_location>
namespace Juliet
{
Juliet/include/Core/Common/EnumUtils.h
-2
View File
@@ -1,7 +1,5 @@
#pragma once
#include <type_traits>
namespace Juliet
{
template <typename T>
Juliet/include/Core/Common/NonNullPtr.h
-1
View File
@@ -1,7 +1,6 @@
#pragma once
#include <Core/Common/CoreUtils.h>
#include <type_traits>
namespace Juliet
{
Juliet/include/Core/Common/String.h
-3
View File
@@ -9,9 +9,6 @@
#define RESTORE_GLOBAL
#endif
#include <format>
#include <string>
#ifdef RESTORE_GLOBAL
#define global static
#undef RESTORE_GLOBAL
Juliet/include/Core/Memory/Allocator.h
-2
View File
@@ -3,8 +3,6 @@
#include <Juliet.h>
#include <Core/Common/CoreUtils.h>
#include <cstdlib>
namespace Juliet
{
// Uninitialized allocation
Juliet/include/Core/Memory/MemoryArenaDebug.h
-1
View File
@@ -30,7 +30,6 @@ namespace Juliet
ArenaAllocation* Next;
};
// Arena (Struct)
void DebugRegisterArena(NonNullPtr<Arena> arena);
void DebugUnregisterArena(NonNullPtr<Arena> arena);
Juliet/include/Core/PCH.h
+32
View File
@@ -0,0 +1,32 @@
#pragma once
#include <algorithm>
#include <bit>
#include <cassert>
#include <cfloat>
#include <chrono>
#include <cinttypes>
#include <cmath>
#include <concepts>
#include <cstdarg>
#include <cstddef>
#include <cstdint>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <format>
#include <forward_list>
#include <ios>
#include <iosfwd>
#include <limits>
#include <list>
#include <memory>
#include <mutex>
#include <new>
#include <queue>
#include <source_location>
#include <stdexcept>
#include <string>
#include <thread>
#include <type_traits>
#include <vector>
Juliet/include/Core/Thread/Mutex.h
-2
View File
@@ -1,7 +1,5 @@
#pragma once
#include <mutex>
namespace Juliet
{
using Mutex = std::mutex;
Juliet/include/Core/Thread/Thread.h
-2
View File
@@ -1,7 +1,5 @@
#pragma once
#include <thread>
namespace Juliet
{
using Thread = std::thread;
Juliet/include/Graphics/Graphics.h
-2
View File
@@ -11,8 +11,6 @@
#include <Graphics/Shader.h>
#include <Juliet.h>
// Graphics Interface
namespace Juliet
{
Juliet/include/Graphics/MeshRenderer.h
-1
View File
@@ -8,7 +8,6 @@
#include <Graphics/VertexData.h>
#include <Juliet.h>
namespace Juliet
{
struct GraphicsTransferBuffer;
Juliet/src/Core/HAL/Event/SystemEvent.cpp
+1 -3
View File
@@ -3,10 +3,8 @@
#pragma push_macro("global")
#undef global
#include <chrono>
#pragma pop_macro("global")
#include <queue>
#pragma pop_macro("global")
namespace Juliet
{
Juliet/src/Core/HAL/Filesystem/Filesystem.cpp
-2
View File
@@ -9,8 +9,6 @@
#include <Core/Logging/LogTypes.h>
#include <Core/Memory/Allocator.h>
#include <cstdio>
namespace Juliet
{
namespace
Juliet/src/Core/HAL/IO/IOStream.cpp
-1
View File
@@ -6,7 +6,6 @@
#include <Core/Logging/LogTypes.h>
#include <Core/Memory/Allocator.h>
#include <Core/Thread/Thread.h>
#include <cstdarg>
namespace Juliet
{
Juliet/src/Core/ImGui/ImGuiService.cpp
-3
View File
@@ -10,9 +10,6 @@
#include <backends/imgui_impl_win32.h>
#include <imgui.h>
#include <cstdio>
// Forward declare implementation functions from backends
extern IMGUI_IMPL_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
namespace Juliet::ImGuiService
Juliet/src/Core/ImGui/ImGuiTests.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
#include <Core/HAL/Display/Display.h>
#include <Core/ImGui/ImGuiService.h>
#include <Core/Memory/MemoryArena.h>
#include <cstdio>
#include <Graphics/Graphics.h>
#include <imgui.h>
#include <Juliet.h>
Juliet/src/Core/Logging/LogManager.cpp
+1 -3
View File
@@ -6,15 +6,13 @@
#define RESTORE_GLOBAL
#endif
#include <chrono>
#ifdef RESTORE_GLOBAL
#define global static
#undef RESTORE_GLOBAL
#endif
// Begin Todo JULIET debug output
#include <cinttypes>
#include <Core/Memory/MemoryArena.h>
#ifdef JULIET_WIN32
Juliet/src/Core/Math/MathRound.cpp
-2
View File
@@ -1,8 +1,6 @@
#include <Core/Common/CoreTypes.h>
#include <Core/Math/Math_Private.h>
#include <cfloat>
namespace Juliet
{
// From MUSL lib https://github.com/rofl0r/musl
Juliet/src/Core/Memory/MemoryArena.cpp
-2
View File
@@ -4,11 +4,9 @@
#include <Core/Memory/MemoryArenaDebug.h>
#include <Core/Memory/Utils.h>
#include <algorithm> // For std::max
#include <Core/Common/NonNullPtr.h>
#include <Core/HAL/OS/OS.h>
#include <Core/Logging/LogTypes.h>
#include <cstring>
namespace Juliet
{
Juliet/src/Core/PCH.cpp
+1
View File
@@ -0,0 +1 @@
#include "Core/PCH.h"
Juliet/src/Engine/Debug/MemoryDebugger.cpp
-1
View File
@@ -1,6 +1,5 @@
#include <Engine/Debug/MemoryDebugger.h>
#include <cmath>
#include <Core/Common/String.h>
#include <Core/Container/Vector.h>
#include <Core/Memory/MemoryArena.h>
Juliet/src/Graphics/D3D12/AgilitySDK/D3D12TokenizedProgramFormat.hpp
-4
View File
@@ -1125,7 +1125,6 @@ typedef enum D3D11_SB_OPERAND_MIN_PRECISION
// into the extended operand token, OperandToken1
#define ENCODE_D3D11_SB_OPERAND_MIN_PRECISION(MinPrecision) (((MinPrecision)<< D3D11_SB_OPERAND_MIN_PRECISION_SHIFT)& D3D11_SB_OPERAND_MIN_PRECISION_MASK)
// Non-uniform extended operand modifier.
#define D3D12_SB_OPERAND_NON_UNIFORM_MASK 0x00020000
#define D3D12_SB_OPERAND_NON_UNIFORM_SHIFT 17
@@ -1136,7 +1135,6 @@ typedef enum D3D11_SB_OPERAND_MIN_PRECISION
// ENCODER MACRO: Encode non-uniform state into the extended operand token, OperandToken1
#define ENCODE_D3D12_SB_OPERAND_NON_UNIFORM(NonUniform) (((NonUniform)<< D3D12_SB_OPERAND_NON_UNIFORM_SHIFT)& D3D12_SB_OPERAND_NON_UNIFORM_MASK)
#define D3D10_SB_OPERAND_DOUBLE_EXTENDED_MASK 0x80000000
#define D3D10_SB_OPERAND_DOUBLE_EXTENDED_SHIFT 31
// DECODER MACRO: Determine if an extended operand token
@@ -1579,7 +1577,6 @@ typedef enum D3D10_SB_SAMPLER_MODE
//
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// Input or Output Register Indexing Range Declaration
//
@@ -2025,7 +2022,6 @@ typedef enum D3D11_SB_TESSELLATOR_OUTPUT_PRIMITIVE
// a tessellator output primitive declaration token (OpcodeToken0)
#define ENCODE_D3D11_SB_TESS_OUTPUT_PRIMITIVE(OutputPrimitive) (((OutputPrimitive)<<D3D11_SB_TESS_OUTPUT_PRIMITIVE_SHIFT)&D3D11_SB_TESS_OUTPUT_PRIMITIVE_MASK)
// ----------------------------------------------------------------------------
// Hull Shader Declaration Phase: Hull Shader Max Tessfactor
//
Juliet/src/Graphics/D3D12/AgilitySDK/d3d12.h
-1031
View File
File diff suppressed because it is too large Load Diff
Juliet/src/Graphics/D3D12/AgilitySDK/d3d12compatibility.h
-90
View File
@@ -5,14 +5,10 @@
*
*-------------------------------------------------------------------------------------*/
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
/* File created by MIDL compiler version 8.01.0628 */
/* verify that the <rpcndr.h> version is high enough to compile this file*/
#ifndef __REQUIRED_RPCNDR_H_VERSION__
#define __REQUIRED_RPCNDR_H_VERSION__ 500
@@ -58,63 +54,54 @@ typedef interface ID3D12CompatibilityDevice ID3D12CompatibilityDevice;
#endif /* __ID3D12CompatibilityDevice_FWD_DEFINED__ */
#ifndef __D3D11On12CreatorID_FWD_DEFINED__
#define __D3D11On12CreatorID_FWD_DEFINED__
typedef interface D3D11On12CreatorID D3D11On12CreatorID;
#endif /* __D3D11On12CreatorID_FWD_DEFINED__ */
#ifndef __D3D9On12CreatorID_FWD_DEFINED__
#define __D3D9On12CreatorID_FWD_DEFINED__
typedef interface D3D9On12CreatorID D3D9On12CreatorID;
#endif /* __D3D9On12CreatorID_FWD_DEFINED__ */
#ifndef __OpenGLOn12CreatorID_FWD_DEFINED__
#define __OpenGLOn12CreatorID_FWD_DEFINED__
typedef interface OpenGLOn12CreatorID OpenGLOn12CreatorID;
#endif /* __OpenGLOn12CreatorID_FWD_DEFINED__ */
#ifndef __OpenCLOn12CreatorID_FWD_DEFINED__
#define __OpenCLOn12CreatorID_FWD_DEFINED__
typedef interface OpenCLOn12CreatorID OpenCLOn12CreatorID;
#endif /* __OpenCLOn12CreatorID_FWD_DEFINED__ */
#ifndef __VulkanOn12CreatorID_FWD_DEFINED__
#define __VulkanOn12CreatorID_FWD_DEFINED__
typedef interface VulkanOn12CreatorID VulkanOn12CreatorID;
#endif /* __VulkanOn12CreatorID_FWD_DEFINED__ */
#ifndef __DirectMLTensorFlowCreatorID_FWD_DEFINED__
#define __DirectMLTensorFlowCreatorID_FWD_DEFINED__
typedef interface DirectMLTensorFlowCreatorID DirectMLTensorFlowCreatorID;
#endif /* __DirectMLTensorFlowCreatorID_FWD_DEFINED__ */
#ifndef __DirectMLPyTorchCreatorID_FWD_DEFINED__
#define __DirectMLPyTorchCreatorID_FWD_DEFINED__
typedef interface DirectMLPyTorchCreatorID DirectMLPyTorchCreatorID;
#endif /* __DirectMLPyTorchCreatorID_FWD_DEFINED__ */
#ifndef __DirectMLWebNNCreatorID_FWD_DEFINED__
#define __DirectMLWebNNCreatorID_FWD_DEFINED__
typedef interface DirectMLWebNNCreatorID DirectMLWebNNCreatorID;
#endif /* __DirectMLWebNNCreatorID_FWD_DEFINED__ */
/* header files for imported files */
#include "oaidl.h"
#include "ocidl.h"
@@ -124,7 +111,6 @@ typedef interface DirectMLWebNNCreatorID DirectMLWebNNCreatorID;
extern "C"{
#endif
/* interface __MIDL_itf_d3d12compatibility_0000_0000 */
/* [local] */
@@ -149,8 +135,6 @@ enum D3D12_REFLECT_SHARED_PROPERTY
D3D12_REFLECT_SHARED_PROPERTY_NON_NT_SHARED_HANDLE = ( D3D12_REFELCT_SHARED_PROPERTY_COMPATIBILITY_SHARED_FLAGS + 1 )
} D3D12_REFLECT_SHARED_PROPERTY;
extern RPC_IF_HANDLE __MIDL_itf_d3d12compatibility_0000_0000_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_d3d12compatibility_0000_0000_v0_0_s_ifspec;
@@ -160,7 +144,6 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12compatibility_0000_0000_v0_0_s_ifspec;
/* interface ID3D12CompatibilityDevice */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_ID3D12CompatibilityDevice;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -260,7 +243,6 @@ EXTERN_C const IID IID_ID3D12CompatibilityDevice;
#ifdef COBJMACROS
#define ID3D12CompatibilityDevice_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -270,7 +252,6 @@ EXTERN_C const IID IID_ID3D12CompatibilityDevice;
#define ID3D12CompatibilityDevice_Release(This) \
( (This)->lpVtbl -> Release(This) )
#define ID3D12CompatibilityDevice_CreateSharedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,pFlags11,CompatibilityFlags,pLifetimeTracker,pOwningSwapchain,riid,ppResource) \
( (This)->lpVtbl -> CreateSharedResource(This,pHeapProperties,HeapFlags,pDesc,InitialResourceState,pOptimizedClearValue,pFlags11,CompatibilityFlags,pLifetimeTracker,pOwningSwapchain,riid,ppResource) )
@@ -282,22 +263,16 @@ EXTERN_C const IID IID_ID3D12CompatibilityDevice;
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __ID3D12CompatibilityDevice_INTERFACE_DEFINED__ */
#ifndef __D3D11On12CreatorID_INTERFACE_DEFINED__
#define __D3D11On12CreatorID_INTERFACE_DEFINED__
/* interface D3D11On12CreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_D3D11On12CreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -341,7 +316,6 @@ EXTERN_C const IID IID_D3D11On12CreatorID;
#ifdef COBJMACROS
#define D3D11On12CreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -351,25 +325,18 @@ EXTERN_C const IID IID_D3D11On12CreatorID;
#define D3D11On12CreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __D3D11On12CreatorID_INTERFACE_DEFINED__ */
#ifndef __D3D9On12CreatorID_INTERFACE_DEFINED__
#define __D3D9On12CreatorID_INTERFACE_DEFINED__
/* interface D3D9On12CreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_D3D9On12CreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -413,7 +380,6 @@ EXTERN_C const IID IID_D3D9On12CreatorID;
#ifdef COBJMACROS
#define D3D9On12CreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -423,25 +389,18 @@ EXTERN_C const IID IID_D3D9On12CreatorID;
#define D3D9On12CreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __D3D9On12CreatorID_INTERFACE_DEFINED__ */
#ifndef __OpenGLOn12CreatorID_INTERFACE_DEFINED__
#define __OpenGLOn12CreatorID_INTERFACE_DEFINED__
/* interface OpenGLOn12CreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_OpenGLOn12CreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -485,7 +444,6 @@ EXTERN_C const IID IID_OpenGLOn12CreatorID;
#ifdef COBJMACROS
#define OpenGLOn12CreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -495,25 +453,18 @@ EXTERN_C const IID IID_OpenGLOn12CreatorID;
#define OpenGLOn12CreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __OpenGLOn12CreatorID_INTERFACE_DEFINED__ */
#ifndef __OpenCLOn12CreatorID_INTERFACE_DEFINED__
#define __OpenCLOn12CreatorID_INTERFACE_DEFINED__
/* interface OpenCLOn12CreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_OpenCLOn12CreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -557,7 +508,6 @@ EXTERN_C const IID IID_OpenCLOn12CreatorID;
#ifdef COBJMACROS
#define OpenCLOn12CreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -567,25 +517,18 @@ EXTERN_C const IID IID_OpenCLOn12CreatorID;
#define OpenCLOn12CreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __OpenCLOn12CreatorID_INTERFACE_DEFINED__ */
#ifndef __VulkanOn12CreatorID_INTERFACE_DEFINED__
#define __VulkanOn12CreatorID_INTERFACE_DEFINED__
/* interface VulkanOn12CreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_VulkanOn12CreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -629,7 +572,6 @@ EXTERN_C const IID IID_VulkanOn12CreatorID;
#ifdef COBJMACROS
#define VulkanOn12CreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -639,25 +581,18 @@ EXTERN_C const IID IID_VulkanOn12CreatorID;
#define VulkanOn12CreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __VulkanOn12CreatorID_INTERFACE_DEFINED__ */
#ifndef __DirectMLTensorFlowCreatorID_INTERFACE_DEFINED__
#define __DirectMLTensorFlowCreatorID_INTERFACE_DEFINED__
/* interface DirectMLTensorFlowCreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_DirectMLTensorFlowCreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -701,7 +636,6 @@ EXTERN_C const IID IID_DirectMLTensorFlowCreatorID;
#ifdef COBJMACROS
#define DirectMLTensorFlowCreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -711,25 +645,18 @@ EXTERN_C const IID IID_DirectMLTensorFlowCreatorID;
#define DirectMLTensorFlowCreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __DirectMLTensorFlowCreatorID_INTERFACE_DEFINED__ */
#ifndef __DirectMLPyTorchCreatorID_INTERFACE_DEFINED__
#define __DirectMLPyTorchCreatorID_INTERFACE_DEFINED__
/* interface DirectMLPyTorchCreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_DirectMLPyTorchCreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -773,7 +700,6 @@ EXTERN_C const IID IID_DirectMLPyTorchCreatorID;
#ifdef COBJMACROS
#define DirectMLPyTorchCreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -783,25 +709,18 @@ EXTERN_C const IID IID_DirectMLPyTorchCreatorID;
#define DirectMLPyTorchCreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __DirectMLPyTorchCreatorID_INTERFACE_DEFINED__ */
#ifndef __DirectMLWebNNCreatorID_INTERFACE_DEFINED__
#define __DirectMLWebNNCreatorID_INTERFACE_DEFINED__
/* interface DirectMLWebNNCreatorID */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_DirectMLWebNNCreatorID;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -845,7 +764,6 @@ EXTERN_C const IID IID_DirectMLWebNNCreatorID;
#ifdef COBJMACROS
#define DirectMLWebNNCreatorID_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -855,18 +773,12 @@ EXTERN_C const IID IID_DirectMLWebNNCreatorID;
#define DirectMLWebNNCreatorID_Release(This) \
( (This)->lpVtbl -> Release(This) )
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __DirectMLWebNNCreatorID_INTERFACE_DEFINED__ */
/* interface __MIDL_itf_d3d12compatibility_0000_0009 */
/* [local] */
@@ -882,7 +794,6 @@ DEFINE_GUID(IID_DirectMLTensorFlowCreatorID,0xcb7490ac,0x8a0f,0x44ec,0x9b,0x7b,0
DEFINE_GUID(IID_DirectMLPyTorchCreatorID,0xaf029192,0xfba1,0x4b05,0x91,0x16,0x23,0x5e,0x06,0x56,0x03,0x54);
DEFINE_GUID(IID_DirectMLWebNNCreatorID,0xfdf01a76,0x1e11,0x450f,0x90,0x2b,0x74,0xf0,0x4e,0xa0,0x80,0x94);
extern RPC_IF_HANDLE __MIDL_itf_d3d12compatibility_0000_0009_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_d3d12compatibility_0000_0009_v0_0_s_ifspec;
@@ -896,4 +807,3 @@ extern RPC_IF_HANDLE __MIDL_itf_d3d12compatibility_0000_0009_v0_0_s_ifspec;
#endif
Juliet/src/Graphics/D3D12/AgilitySDK/d3d12sdklayers.h
-213
View File
File diff suppressed because it is too large Load Diff
Juliet/src/Graphics/D3D12/AgilitySDK/d3d12shader.h
-5
View File
@@ -56,7 +56,6 @@ typedef D3D_RESOURCE_RETURN_TYPE D3D12_RESOURCE_RETURN_TYPE;
typedef D3D_CBUFFER_TYPE D3D12_CBUFFER_TYPE;
typedef struct _D3D12_SIGNATURE_PARAMETER_DESC
{
LPCSTR SemanticName; // Name of the semantic
@@ -208,7 +207,6 @@ typedef struct _D3D12_SHADER_INPUT_BIND_DESC
#define D3D_SHADER_REQUIRES_SAMPLE_CMP_GRADIENT_OR_BIAS 0x80000000
#define D3D_SHADER_REQUIRES_EXTENDED_COMMAND_INFO 0x100000000ull
typedef struct _D3D12_LIBRARY_DESC
{
LPCSTR Creator; // The name of the originator of the library.
@@ -273,7 +271,6 @@ typedef struct _D3D12_PARAMETER_DESC
UINT FirstOutComponent; // The first output register component for this parameter.
} D3D12_PARAMETER_DESC;
//////////////////////////////////////////////////////////////////////////////
// Interfaces ////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
@@ -299,7 +296,6 @@ typedef interface ID3D12FunctionReflection *LPD3D12FUNCTIONREFLECTION;
typedef interface ID3D12FunctionParameterReflection ID3D12FunctionParameterReflection;
typedef interface ID3D12FunctionParameterReflection *LPD3D12FUNCTIONPARAMETERREFLECTION;
// {E913C351-783D-48CA-A1D1-4F306284AD56}
interface DECLSPEC_UUID("E913C351-783D-48CA-A1D1-4F306284AD56") ID3D12ShaderReflectionType;
DEFINE_GUID(IID_ID3D12ShaderReflectionType,
@@ -477,7 +473,6 @@ DECLARE_INTERFACE(ID3D12FunctionParameterReflection)
STDMETHOD(GetDesc)(THIS_ _Out_ D3D12_PARAMETER_DESC * pDesc) PURE;
};
//////////////////////////////////////////////////////////////////////////////
// APIs //////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
Juliet/src/Graphics/D3D12/AgilitySDK/d3d12video.h
-361
View File
File diff suppressed because it is too large Load Diff
Juliet/src/Graphics/D3D12/AgilitySDK/d3dcommon.h
-28
View File
@@ -5,15 +5,11 @@
*
*-------------------------------------------------------------------------------------*/
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
/* File created by MIDL compiler version 8.01.0628 */
/* @@MIDL_FILE_HEADING( ) */
/* verify that the <rpcndr.h> version is high enough to compile this file*/
#ifndef __REQUIRED_RPCNDR_H_VERSION__
#define __REQUIRED_RPCNDR_H_VERSION__ 500
@@ -59,14 +55,12 @@ typedef interface ID3D10Blob ID3D10Blob;
#endif /* __ID3D10Blob_FWD_DEFINED__ */
#ifndef __ID3DDestructionNotifier_FWD_DEFINED__
#define __ID3DDestructionNotifier_FWD_DEFINED__
typedef interface ID3DDestructionNotifier ID3DDestructionNotifier;
#endif /* __ID3DDestructionNotifier_FWD_DEFINED__ */
/* header files for imported files */
#include "oaidl.h"
#include "ocidl.h"
@@ -75,7 +69,6 @@ typedef interface ID3DDestructionNotifier ID3DDestructionNotifier;
extern "C"{
#endif
/* interface __MIDL_itf_d3dcommon_0000_0000 */
/* [local] */
@@ -404,7 +397,6 @@ typedef struct _D3D_SHADER_MACRO *LPD3D_SHADER_MACRO;
DEFINE_GUID(IID_ID3D10Blob, 0x8ba5fb08, 0x5195, 0x40e2, 0xac, 0x58, 0xd, 0x98, 0x9c, 0x3a, 0x1, 0x2);
extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0000_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0000_v0_0_s_ifspec;
@@ -414,7 +406,6 @@ extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0000_v0_0_s_ifspec;
/* interface ID3D10Blob */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_ID3D10Blob;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -471,7 +462,6 @@ EXTERN_C const IID IID_ID3D10Blob;
#ifdef COBJMACROS
#define ID3D10Blob_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -481,7 +471,6 @@ EXTERN_C const IID IID_ID3D10Blob;
#define ID3D10Blob_Release(This) \
( (This)->lpVtbl -> Release(This) )
#define ID3D10Blob_GetBufferPointer(This) \
( (This)->lpVtbl -> GetBufferPointer(This) )
@@ -490,15 +479,10 @@ EXTERN_C const IID IID_ID3D10Blob;
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __ID3D10Blob_INTERFACE_DEFINED__ */
/* interface __MIDL_itf_d3dcommon_0000_0001 */
/* [local] */
@@ -510,8 +494,6 @@ typedef ID3DBlob* LPD3DBLOB;
typedef void ( __stdcall *PFN_DESTRUCTION_CALLBACK )(
void *pData);
extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_s_ifspec;
@@ -521,7 +503,6 @@ extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0001_v0_0_s_ifspec;
/* interface ID3DDestructionNotifier */
/* [unique][local][object][uuid] */
EXTERN_C const IID IID_ID3DDestructionNotifier;
#if defined(__cplusplus) && !defined(CINTERFACE)
@@ -594,7 +575,6 @@ EXTERN_C const IID IID_ID3DDestructionNotifier;
#ifdef COBJMACROS
#define ID3DDestructionNotifier_QueryInterface(This,riid,ppvObject) \
( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
@@ -604,7 +584,6 @@ EXTERN_C const IID IID_ID3DDestructionNotifier;
#define ID3DDestructionNotifier_Release(This) \
( (This)->lpVtbl -> Release(This) )
#define ID3DDestructionNotifier_RegisterDestructionCallback(This,callbackFn,pData,pCallbackID) \
( (This)->lpVtbl -> RegisterDestructionCallback(This,callbackFn,pData,pCallbackID) )
@@ -613,15 +592,10 @@ EXTERN_C const IID IID_ID3DDestructionNotifier;
#endif /* COBJMACROS */
#endif /* C style interface */
#endif /* __ID3DDestructionNotifier_INTERFACE_DEFINED__ */
/* interface __MIDL_itf_d3dcommon_0000_0002 */
/* [local] */
@@ -1116,7 +1090,6 @@ DEFINE_GUID(WKPDID_D3D12UniqueObjectId, 0x1b39de15, 0xec04, 0x4bae, 0xba, 0x4d,
DEFINE_GUID(D3D_TEXTURE_LAYOUT_ROW_MAJOR,0xb5dc234f,0x72bb,0x4bec,0x97,0x05,0x8c,0xf2,0x58,0xdf,0x6b,0x6c);
DEFINE_GUID(D3D_TEXTURE_LAYOUT_64KB_STANDARD_SWIZZLE,0x4c0f29e3,0x3f5f,0x4d35,0x84,0xc9,0xbc,0x09,0x83,0xb6,0x2c,0x28);
extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0002_v0_0_c_ifspec;
extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0002_v0_0_s_ifspec;
@@ -1130,4 +1103,3 @@ extern RPC_IF_HANDLE __MIDL_itf_d3dcommon_0000_0002_v0_0_s_ifspec;
#endif
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_barriers.h
-1
View File
@@ -186,7 +186,6 @@ public:
};
#endif // D3D12_SDK_VERSION >= 608
#endif // defined( __cplusplus )
#endif // __D3DX12_BARRIERS_H__
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_check_feature_support.h
-2
View File
@@ -17,8 +17,6 @@
// D3DX12 Check Feature Support
//================================================================================================
#include <vector>
class CD3DX12FeatureSupport
{
public: // Function declaration
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_core.h
-4
View File
@@ -533,7 +533,6 @@ struct CD3DX12_RASTERIZER_DESC : public D3D12_RASTERIZER_DESC
}
};
//------------------------------------------------------------------------------------------------
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 608)
struct CD3DX12_RASTERIZER_DESC1 : public D3D12_RASTERIZER_DESC1
@@ -598,7 +597,6 @@ struct CD3DX12_RASTERIZER_DESC1 : public D3D12_RASTERIZER_DESC1
ConservativeRaster = conservativeRaster;
}
operator D3D12_RASTERIZER_DESC() const noexcept
{
D3D12_RASTERIZER_DESC o;
@@ -692,7 +690,6 @@ struct CD3DX12_RASTERIZER_DESC2 : public D3D12_RASTERIZER_DESC2
ConservativeRaster = conservativeRaster;
}
operator D3D12_RASTERIZER_DESC1() const noexcept
{
D3D12_RASTERIZER_DESC1 o;
@@ -1495,7 +1492,6 @@ inline const CD3DX12_RESOURCE_DESC1* D3DX12ConditionallyExpandAPIDesc(
}
}
//------------------------------------------------------------------------------------------------
struct CD3DX12_VIEW_INSTANCING_DESC : public D3D12_VIEW_INSTANCING_DESC
{
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_pipeline_state_stream.h
-1
View File
@@ -759,7 +759,6 @@ struct CD3DX12_PIPELINE_STATE_STREAM1
}
};
struct CD3DX12_PIPELINE_MESH_STATE_STREAM
{
CD3DX12_PIPELINE_MESH_STATE_STREAM() = default;
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_property_format_table.cpp
+2 -3
View File
@@ -25,12 +25,11 @@
#ifndef _WIN32
#include <wsl/winadapter.h>
#endif
#include <algorithm>
#include <cassert>
#include <Graphics/D3D12/AgilitySDK/D3D12TokenizedProgramFormat.hpp>
#include "d3dx12_property_format_table.h"
#if defined(__cpp_exceptions) && (!defined(_HAS_EXCEPTIONS) || _HAS_EXCEPTIONS != 0)
#include <stdexcept>
#endif
#if defined(D3D12_SDK_VERSION) && (D3D12_SDK_VERSION >= 606)
#ifndef ASSUME
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_resource_helpers.h
-1
View File
@@ -530,7 +530,6 @@ inline bool D3DX12GetCopyableFootprints(
TotalBytes = uint64_max;
}
if (pLayouts)
{
memset( pLayouts + uSubRes, -1, sizeof( *pLayouts ) * (NumSubresources - uSubRes) );
Juliet/src/Graphics/D3D12/AgilitySDK/d3dx12/d3dx12_state_object.h
+1 -6
View File
@@ -28,12 +28,7 @@
// contents.
//
//================================================================================================
#include <list>
#include <forward_list>
#include <vector>
#include <memory>
#include <string>
#include <vector>
#ifndef D3DX12_USE_ATL
#include <wrl/client.h>
#define D3DX12_COM_PTR Microsoft::WRL::ComPtr
Juliet/src/Graphics/D3D12/AgilitySDK/dxgiformat.h
-2
View File
@@ -131,13 +131,11 @@ typedef enum DXGI_FORMAT
DXGI_FORMAT_V208 = 131,
DXGI_FORMAT_V408 = 132,
DXGI_FORMAT_SAMPLER_FEEDBACK_MIN_MIP_OPAQUE = 189,
DXGI_FORMAT_SAMPLER_FEEDBACK_MIP_REGION_USED_OPAQUE = 190,
DXGI_FORMAT_A4B4G4R4_UNORM = 191,
DXGI_FORMAT_FORCE_UINT = 0xffffffff
} DXGI_FORMAT;
Juliet/src/Graphics/D3D12/D3D12CommandList.cpp
-2
View File
@@ -7,8 +7,6 @@
#include <Graphics/D3D12/D3D12Synchronization.h>
#include <Graphics/D3D12/D3D12Utils.h>
#include <string>
namespace Juliet::D3D12
{
namespace
Juliet/src/Graphics/D3D12/D3D12GraphicsDevice.h
-1
View File
@@ -112,7 +112,6 @@ namespace Juliet::D3D12
bool GPUUploadHeapSupported : 1;
};
namespace Internal
{
void DisposePendingResourcces(NonNullPtr<D3D12Driver> driver);
Juliet/src/Graphics/D3D12/D3D12SwapChain.cpp
-2
View File
@@ -10,8 +10,6 @@
#include <Graphics/D3D12/D3D12Texture.h>
#include <Graphics/D3D12/D3D12Utils.h>
#include <algorithm>
namespace Juliet::D3D12
{
namespace
Juliet/src/Graphics/D3D12/D3D12Texture.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include <algorithm>
#include <Core/Common/EnumUtils.h>
#include <Core/Logging/LogManager.h>
#include <Core/Logging/LogTypes.h>
Juliet/src/UnitTest/Container/VectorUnitTest.cpp
-1
View File
@@ -1,7 +1,6 @@
#include <Juliet.h>
#if JULIET_DEBUG
#include <algorithm>
#include <Core/Common/CoreUtils.h>
#include <Core/Container/Vector.h>
JulietApp/JulietApp.vcxproj
+3
View File
@@ -44,6 +44,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Debug\JulietApp.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -58,6 +59,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Profile\JulietApp.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -72,6 +74,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Release\JulietApp.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
JulietApp/main.cpp
+2 -4
View File
@@ -3,9 +3,7 @@
#ifdef global
#undef global
#endif
#include <algorithm>
#include <ios>
#include <iosfwd>
#define global static
#ifdef _WIN32
@@ -28,7 +26,7 @@
#include <Core/Math/Matrix.h>
#include <Core/Memory/MemoryArena.h>
#include <Core/Memory/Utils.h>
#include <cstdlib>
#include <Engine/Debug/MemoryDebugger.h>
#include <Graphics/Camera.h>
#include <Graphics/DebugDisplay.h>
JulietShaderCompiler/JulietShaderCompiler.vcxproj
+3
View File
@@ -44,6 +44,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Debug\JulietShaderCompiler.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -59,6 +60,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Profile\JulietShaderCompiler.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -74,6 +76,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Release\JulietShaderCompiler.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
Romeo/Romeo.vcxproj
+3
View File
@@ -44,6 +44,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Debug\Romeo.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;DEBUG;JULIET_DEBUG;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -58,6 +59,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Profile\Romeo.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;PROFILING_ENABLED;JULIET_ENABLE_IMGUI;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
@@ -72,6 +74,7 @@
<NMakeOutput>$(SolutionDir)bin\x64-Release\Romeo.exe</NMakeOutput>
<NMakeIncludeSearchPath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath>
<IncludePath>$(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)Game;$(SolutionDir)External\imgui;$(SolutionDir)External\imgui\backends;$(IncludePath)</IncludePath>
<NMakeForcedIncludes>Core/PCH.h;$(NMakeForcedIncludes)</NMakeForcedIncludes>
<NMakePreprocessorDefinitions>JULIET_WIN32;UNICODE;_UNICODE;WIN32_LEAN_AND_MEAN;_CRT_SECURE_NO_WARNINGS;RELEASE;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
<AdditionalOptions>/std:c++20</AdditionalOptions>
<LanguageStandard>stdcpp20</LanguageStandard>
Romeo/src/JsonParser.cpp
-1
View File
@@ -4,7 +4,6 @@
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <new>
namespace Romeo
{
Romeo/src/main.cpp
+1 -1
View File
@@ -14,7 +14,7 @@
#include <Core/JulietInit.h>
#include <Core/HAL/Filesystem/Filesystem.h>
#include <Core/Thread/Mutex.h>
#include <thread>
#include "Database.h"
#include "MarkdownGenerator.h"
misc/Generate.bat
+5
View File
@@ -19,16 +19,21 @@ if exist "%PLAN%" del /f /q "%PLAN%"
>>"%PLAN%" echo PROJECT Juliet
>>"%PLAN%" echo EXTRA_DEF JULIET_EXPORT;
>>"%PLAN%" echo PCH Core/PCH.h Juliet\src\Core\PCH.cpp
>>"%PLAN%" echo PROJECT Game
>>"%PLAN%" echo EXTRA_DEF JULIET_EXPORT;
>>"%PLAN%" echo PCH Core/PCH.h Juliet\src\Core\PCH.cpp
>>"%PLAN%" echo PROJECT JulietApp
>>"%PLAN%" echo PCH Core/PCH.h Juliet\src\Core\PCH.cpp
>>"%PLAN%" echo PROJECT Romeo
>>"%PLAN%" echo PCH Core/PCH.h Juliet\src\Core\PCH.cpp
>>"%PLAN%" echo PROJECT JulietShaderCompiler
>>"%PLAN%" echo INCLUDE_SEARCH $(SolutionDir)Juliet\include;$(SolutionDir)Juliet\src;$(SolutionDir)External\imgui;$(SolutionDir)JulietShaderCompiler;
>>"%PLAN%" echo PCH Core/PCH.h Juliet\src\Core\PCH.cpp
>>"%PLAN%" echo DEBUG_CMD ..\..\Assets\source\SolidColor.frag.hlsl -o ..\..\Assets\compiled\SolidColor.frag.dxil
>>"%PLAN%" echo PROJECT ImGui Intermediate
misc/build.bat
+40 -10
View File
@@ -183,45 +183,75 @@ set BUILD_GAME_DLL=0
if !TARGET_JULIET! equ 1 set BUILD_GAME_DLL=1
if !TARGET_GAME! equ 1 set BUILD_GAME_DLL=1
:: --- Juliet PCH ---
echo STEP Building Juliet PCH [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT Intermediate\x64-!CFG!\Juliet_PCH.obj>>"!PLAN_FILE!"
echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Juliet.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\Juliet_PCH.obj">>"!PLAN_FILE!"
:: --- Juliet.dll ---
echo STEP Building Juliet.dll [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\Juliet.dll>>"!PLAN_FILE!"
echo DEPENDS Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /LD /Fe"bin\x64-!CFG!\Juliet.dll" Intermediate\Juliet\*.cpp %IMGUI_OBJS% /link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb>>"!PLAN_FILE!"
echo DEPENDS Juliet^|External\imgui^|Intermediate\x64-!CFG!\Juliet_PCH.obj>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllexport^) /DJULIET_EXPORT /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Juliet.pch" /LD /Fe"bin\x64-!CFG!\Juliet.dll" Intermediate\Juliet\*.cpp Intermediate\x64-!CFG!\Juliet_PCH.obj %IMGUI_OBJS% /link %COMMON_LIBS% /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Juliet.ilk /PDB:Intermediate\x64-!CFG!\Juliet.pdb>>"!PLAN_FILE!"
:: --- Game.dll ---
if !BUILD_GAME_DLL! equ 1 (
set "GAME_DLL_NAME=Game"
if defined GAME_BUILD_ID set "GAME_DLL_NAME=Game-!GAME_BUILD_ID!"
:: --- Game PCH ---
echo STEP Building !GAME_DLL_NAME! PCH [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj>>"!PLAN_FILE!"
echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj">>"!PLAN_FILE!"
echo STEP Building !GAME_DLL_NAME!.dll [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\!GAME_DLL_NAME!.dll>>"!PLAN_FILE!"
echo DEPENDS Game^|Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /LD /Fe"bin\x64-!CFG!\!GAME_DLL_NAME!.dll" Intermediate\Game\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\!GAME_DLL_NAME!.ilk /PDB:Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pdb>>"!PLAN_FILE!"
echo DEPENDS Game^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /DJULIET_EXPORT /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pch" /LD /Fe"bin\x64-!CFG!\!GAME_DLL_NAME!.dll" Intermediate\Game\*.cpp Intermediate\x64-!CFG!\!GAME_DLL_NAME!_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /INCREMENTAL /ILK:Intermediate\x64-!CFG!\!GAME_DLL_NAME!.ilk /PDB:Intermediate\x64-!CFG!\!GAME_DLL_NAME!.pdb>>"!PLAN_FILE!"
)
:: --- JulietApp.exe ---
if !TARGET_JULIET! equ 1 (
:: --- JulietApp PCH ---
echo STEP Building JulietApp PCH [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT Intermediate\x64-!CFG!\JulietApp_PCH.obj>>"!PLAN_FILE!"
echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietApp.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\JulietApp_PCH.obj">>"!PLAN_FILE!"
echo STEP Building JulietApp.exe [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\JulietApp.exe>>"!PLAN_FILE!"
echo DEPENDS JulietApp^|Game^|Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\JulietApp.exe" Intermediate\JulietApp\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb>>"!PLAN_FILE!"
echo DEPENDS JulietApp^|Game^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\JulietApp_PCH.obj>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietApp.pch" /Fe"bin\x64-!CFG!\JulietApp.exe" Intermediate\JulietApp\*.cpp Intermediate\x64-!CFG!\JulietApp_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietApp.ilk /PDB:Intermediate\x64-!CFG!\JulietApp.pdb>>"!PLAN_FILE!"
)
:: --- Romeo.exe ---
if !TARGET_ROMEO! equ 1 (
:: --- Romeo PCH ---
echo STEP Building Romeo PCH [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT Intermediate\x64-!CFG!\Romeo_PCH.obj>>"!PLAN_FILE!"
echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Romeo.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\Romeo_PCH.obj">>"!PLAN_FILE!"
echo STEP Building Romeo.exe [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\Romeo.exe>>"!PLAN_FILE!"
echo DEPENDS Romeo^|Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /Fe"bin\x64-!CFG!\Romeo.exe" Intermediate\Romeo\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb>>"!PLAN_FILE!"
echo DEPENDS Romeo^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\Romeo_PCH.obj>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\Romeo.pch" /Fe"bin\x64-!CFG!\Romeo.exe" Intermediate\Romeo\*.cpp Intermediate\x64-!CFG!\Romeo_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\Romeo.ilk /PDB:Intermediate\x64-!CFG!\Romeo.pdb>>"!PLAN_FILE!"
)
:: --- JulietShaderCompiler.exe ---
if !TARGET_SHADER! equ 1 (
:: --- JulietShaderCompiler PCH ---
echo STEP Building JulietShaderCompiler PCH [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj>>"!PLAN_FILE!"
echo DEPENDS Juliet\src\Core\PCH.cpp>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /Yc"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietShaderCompiler.pch" /c Juliet\src\Core\PCH.cpp /Fo"Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj">>"!PLAN_FILE!"
echo STEP Building JulietShaderCompiler.exe [!CFG!]>>"!PLAN_FILE!"
echo OUTPUT bin\x64-!CFG!\JulietShaderCompiler.exe>>"!PLAN_FILE!"
echo DEPENDS JulietShaderCompiler^|Juliet^|External\imgui>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" Intermediate\JulietShaderCompiler\*.cpp /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!"
echo DEPENDS JulietShaderCompiler^|Juliet^|External\imgui^|Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj>>"!PLAN_FILE!"
echo COMMAND %COMPILER% %COMPILER_FLAGS% /DIMGUI_API=__declspec^(dllimport^) /IJulietShaderCompiler /FI"Core/PCH.h" /Yu"Core/PCH.h" /Fp"Intermediate\x64-!CFG!\JulietShaderCompiler.pch" /Fe"bin\x64-!CFG!\JulietShaderCompiler.exe" Intermediate\JulietShaderCompiler\*.cpp Intermediate\x64-!CFG!\JulietShaderCompiler_PCH.obj /link %COMMON_LIBS% bin\x64-!CFG!\Juliet.lib dxcompiler.lib /DELAYLOAD:dxcompiler.dll /SUBSYSTEM:CONSOLE /INCREMENTAL /ILK:Intermediate\x64-!CFG!\JulietShaderCompiler.ilk /PDB:Intermediate\x64-!CFG!\JulietShaderCompiler.pdb>>"!PLAN_FILE!"
)
exit /b 0
tools/build_system.c
+19 -2
View File
@@ -844,8 +844,9 @@ static int CommandRunPlan(int argc, char* argv[])
return 0;
}
static void GenerateProject(const char* projectName, const char* projectDir, const char* guid, const char* includeSearchPath, const char* extraDefs, const char* debuggerCommandArgs, const char Srcs[64][256], int SrcCount, const char* defCommon, const char* defDebug, const char* defProfile, const char* defRelease)
static void GenerateProject(const char* projectName, const char* projectDir, const char* guid, const char* includeSearchPath, const char* extraDefs, const char* debuggerCommandArgs, const char Srcs[64][256], int SrcCount, const char* defCommon, const char* defDebug, const char* defProfile, const char* defRelease, const char* pchHeader, const char* pchSrc)
{
(void)pchSrc; // Unused for NMake projects
FilePathList* srcFiles = CreateFilePathList();
if (SrcCount > 0) {
for (int i = 0; i < SrcCount; i++) {
@@ -912,6 +913,11 @@ static void GenerateProject(const char* projectName, const char* projectDir, con
" <IncludePath>%s$(IncludePath)</IncludePath>\n",
cfg, cfg, cfg, cfg, cfg, projectName, includeSearchPath, includeSearchPath);
if (pchHeader && pchHeader[0]) {
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <NMakeForcedIncludes>%s;$(NMakeForcedIncludes)</NMakeForcedIncludes>\n", pchHeader);
}
offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset,
" <NMakePreprocessorDefinitions>");
if (defCommon && defCommon[0]) offset += sprintf_s(buf + offset, (4 * 1024 * 1024) - offset, "%s", defCommon);
@@ -1122,6 +1128,8 @@ typedef struct {
char ExtraDef[1024];
char IncludeSearch[1024];
char DebugCmd[1024];
char PchHeader[256];
char PchSrc[256];
char Srcs[64][256];
int SrcCount;
} VSProject;
@@ -1259,6 +1267,15 @@ static int CommandGenVS(int argc, char* argv[])
memcpy(p->DebugCmd, lineStart + 10, nLen);
p->DebugCmd[nLen] = '\0';
}
else if (lineLen > 4 && memcmp(lineStart, "PCH ", 4) == 0 && projCount > 0) {
VSProject* p = &projects[projCount - 1];
char lineBuf[1024];
int nLen = lineLen - 4;
if (nLen >= 1024) nLen = 1023;
memcpy(lineBuf, lineStart + 4, nLen);
lineBuf[nLen] = '\0';
sscanf_s(lineBuf, "%s %s", p->PchHeader, (unsigned)_countof(p->PchHeader), p->PchSrc, (unsigned)_countof(p->PchSrc));
}
else if (lineLen > 9 && memcmp(lineStart, "SOLUTION ", 9) == 0) {
if (slnCount < 8) {
VSSolution* s = &solutions[slnCount++];
@@ -1286,7 +1303,7 @@ static int CommandGenVS(int argc, char* argv[])
for (int i = 0; i < projCount; i++) {
VSProject* p = &projects[i];
const char* incs = p->IncludeSearch[0] != '\0' ? p->IncludeSearch : globalInclude;
GenerateProject(p->Name, p->Dir, p->Guid, incs, p->ExtraDef, p->DebugCmd, p->Srcs, p->SrcCount, globalDefCommon, globalDefDebug, globalDefProfile, globalDefRelease);
GenerateProject(p->Name, p->Dir, p->Guid, incs, p->ExtraDef, p->DebugCmd, p->Srcs, p->SrcCount, globalDefCommon, globalDefDebug, globalDefProfile, globalDefRelease, p->PchHeader, p->PchSrc);
}
for (int i = 0; i < slnCount; i++) {