From ea7e7e7d15aa6bbd70bdb2ef6191e1730834ca91 Mon Sep 17 00:00:00 2001
From: Turanszki Janos <turanszkij@gmail.com>
Date: Sun, 5 Jul 2020 18:51:22 +0100
Subject: [PATCH] dx12 fix

---
 WickedEngine/wiGraphicsDevice_DX12.cpp | 7 +++++--
 WickedEngine/wiVersion.cpp             | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/WickedEngine/wiGraphicsDevice_DX12.cpp b/WickedEngine/wiGraphicsDevice_DX12.cpp
index 091d6f1bf..8f553b3e5 100644
--- a/WickedEngine/wiGraphicsDevice_DX12.cpp
+++ b/WickedEngine/wiGraphicsDevice_DX12.cpp
@@ -18,7 +18,7 @@
 #pragma comment(lib,"Dxgi.lib")
 #pragma comment(lib,"dxguid.lib")
 
-#ifdef _X64
+#ifdef _WIN64
 #ifndef PLATFORM_UWP
 #pragma comment(lib,"dxcompiler.lib")
 #endif // PLATFORM_UWP
@@ -2236,7 +2236,7 @@ using namespace DX12_Internal;
 		assert(SUCCEEDED(hr));
 
 
-#ifdef _X64 // TODO: Can't use dxcompiler.dll in 32-bit, so can't use shader reflection
+#ifdef _WIN64 // TODO: Can't use dxcompiler.dll in 32-bit, so can't use shader reflection
 #ifndef PLATFORM_UWP // TODO: Can't use dxcompiler.dll in UWP, so can't use shader reflection
 		struct ShaderBlob : public IDxcBlob
 		{
@@ -2547,6 +2547,9 @@ using namespace DX12_Internal;
 
 			auto internal_state = to_internal(shader);
 
+			if (internal_state->tables.empty())
+				return;
+
 			if (!internal_state->tables.back().resources.empty())
 			{
 				params.emplace_back();
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index cb0611bbc..19813aacc 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates, breaking API changes
 	const int minor = 45;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 1;
+	const int revision = 2;
 
 	const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);