Merge pull request #106 from qudix/upstream-po3-dev-pr

Fixes
powerof3 · Feb 28, 2024 · 9a95e69 · 9a95e69
2 parents 6510df4 + 1b66eaa
commit 9a95e69
Show file tree

Hide file tree

Showing 21 changed files with 550 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,6 +96,7 @@ target_link_libraries(
 		spdlog::spdlog
  		Advapi32.lib
 		D3D11.lib
+		d3dcompiler.lib
 		Dbghelp.lib
 		DXGI.lib
 		Ole32.lib

diff --git a/include/REX/W32/BASE.h b/include/REX/W32/BASE.h
@@ -25,6 +25,7 @@ namespace REX::W32
 	using HMONITOR = struct HMONITOR__*;
 	using HPALETTE = struct HPALETTE__*;
 	using HPEN = struct HPEN__*;
+	using HRESULT = std::int32_t;
 	using HSTRING = struct HSTRING__*;
 	using HWND = struct HWND__*;
 
@@ -86,31 +87,6 @@ namespace REX::W32
 	using IID = GUID;
 }
 
-namespace REX::W32
-{
-	struct HRESULT
-	{
-		constexpr HRESULT() noexcept = default;
-
-		constexpr HRESULT(const std::int32_t a_hr) noexcept :
-			value(a_hr)
-		{}
-
-		constexpr operator bool() const noexcept
-		{
-			return value >= 0;
-		}
-
-		constexpr operator std::int32_t() const noexcept
-		{
-			return value;
-		}
-
-		std::int32_t value;
-	};
-	static_assert(sizeof(HRESULT) == 0x4);
-}
-
 namespace REX::W32
 {
 	struct POINT

diff --git a/include/REX/W32/COM.h b/include/REX/W32/COM.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BASE.h"
+#include "REX/W32/BASE.h"
 
 namespace REX::W32
 {
@@ -14,7 +14,7 @@ namespace REX::W32
 		template <class T>
 		HRESULT QueryInterface(T** a_object)
 		{
-			return QueryInterface(__uuidof(T), static_cast<void**>(a_object));
+			return QueryInterface(*reinterpret_cast<const IID*>(&__uuidof(T)), static_cast<void**>(a_object));
 		}
 	};
 }

diff --git a/include/REX/W32/COMPTR.h b/include/REX/W32/COMPTR.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BASE.h"
+#include "REX/W32/BASE.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/D3D.h b/include/REX/W32/D3D.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DXGI.h"
+#include "REX/W32/DXGI.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/D3D11.h b/include/REX/W32/D3D11.h
diff --git a/include/REX/W32/D3D11_1.h b/include/REX/W32/D3D11_1.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "D3D11.h"
+#include "REX/W32/D3D11.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/D3D11_2.h b/include/REX/W32/D3D11_2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "D3D11_1.h"
+#include "REX/W32/D3D11_1.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/D3D11_3.h b/include/REX/W32/D3D11_3.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "D3D11_2.h"
+#include "REX/W32/D3D11_2.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/D3D11_4.h b/include/REX/W32/D3D11_4.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "D3D11_3.h"
-#include "DXGI_5.h"
+#include "REX/W32/D3D11_3.h"
+#include "REX/W32/DXGI_5.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/D3DCOMPILER.h b/include/REX/W32/D3DCOMPILER.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "D3D.h"
+#include "REX/W32/D3D.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DINPUT.h b/include/REX/W32/DINPUT.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "COM.h"
-#include "D3D.h"
+#include "REX/W32/COM.h"
+#include "REX/W32/D3D.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DXGI.h b/include/REX/W32/DXGI.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "COM.h"
+#include "REX/W32/COM.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DXGI_2.h b/include/REX/W32/DXGI_2.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DXGI.h"
+#include "REX/W32/DXGI.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DXGI_3.h b/include/REX/W32/DXGI_3.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DXGI_2.h"
+#include "REX/W32/DXGI_2.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DXGI_4.h b/include/REX/W32/DXGI_4.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DXGI_3.h"
+#include "REX/W32/DXGI_3.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DXGI_5.h b/include/REX/W32/DXGI_5.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DXGI_4.h"
+#include "REX/W32/DXGI_4.h"
 
 namespace REX::W32
 {

diff --git a/include/REX/W32/DXGI_6.h b/include/REX/W32/DXGI_6.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "DXGI_5.h"
+#include "REX/W32/DXGI_5.h"
 
 namespace REX::W32
 {

diff --git a/src/REX/W32/D3D11.cpp b/src/REX/W32/D3D11.cpp
@@ -1,4 +1,4 @@
-#include "D3D11.h"
+#include "REX/W32/D3D11.h"
 
 REX_W32_IMPORT(std::int32_t, D3D11CreateDevice, REX::W32::IDXGIAdapter*, REX::W32::D3D_DRIVER_TYPE, REX::W32::HMODULE, std::uint32_t, const REX::W32::D3D_FEATURE_LEVEL*, std::uint32_t, std::uint32_t, REX::W32::ID3D11Device**, REX::W32::D3D_FEATURE_LEVEL*, REX::W32::ID3D11DeviceContext**);
 REX_W32_IMPORT(std::int32_t, D3D11CreateDeviceAndSwapChain, REX::W32::IDXGIAdapter*, REX::W32::D3D_DRIVER_TYPE, REX::W32::HMODULE, std::uint32_t, const REX::W32::D3D_FEATURE_LEVEL*, std::uint32_t, std::uint32_t, const REX::W32::DXGI_SWAP_CHAIN_DESC*, REX::W32::IDXGISwapChain**, REX::W32::ID3D11Device**, REX::W32::D3D_FEATURE_LEVEL*, REX::W32::ID3D11DeviceContext**);

diff --git a/src/REX/W32/D3DCOMPILER.cpp b/src/REX/W32/D3DCOMPILER.cpp
@@ -1,4 +1,4 @@
-#include "D3DCOMPILER.h"
+#include "REX/W32/D3DCOMPILER.h"
 
 REX_W32_IMPORT(std::int32_t, D3DCompile, const void*, std::size_t, const char*, const REX::W32::D3D_SHADER_MACRO*, REX::W32::ID3DInclude*, const char*, const char*, std::uint32_t, std::uint32_t, REX::W32::ID3DBlob**, REX::W32::ID3DBlob**);
 REX_W32_IMPORT(std::int32_t, D3DCompile2, const void*, std::size_t, const char*, const REX::W32::D3D_SHADER_MACRO*, REX::W32::ID3DInclude*, const char*, const char*, std::uint32_t, std::uint32_t, std::uint32_t, const void*, std::size_t, REX::W32::ID3DBlob**, REX::W32::ID3DBlob**);

diff --git a/src/REX/W32/DXGI.cpp b/src/REX/W32/DXGI.cpp
@@ -1,4 +1,4 @@
-#include "DXGI.h"
+#include "REX/W32/DXGI.h"
 
 REX_W32_IMPORT(std::int32_t, CreateDXGIFactory, const IID&, void**);
 REX_W32_IMPORT(std::int32_t, CreateDXGIFactory1, const IID&, void**);