Update to v2.83

dgVoodooAPI/Inc/Addon/ID3D12Root.hpp

@@ -194,9 +194,10 @@ class ID3D12ResourceDescRingBuffer
 	virtual void	Release () = 0;
 };
 
-// --- ID3D12Buffer ------------------------------------------------------------
 
-class ID3D12Buffer
+// --- ID3D12LockableResource --------------------------------------------------
+
+class ID3D12LockableResource
 {
 public:
 	enum LockType
@@ -206,23 +207,53 @@ class ID3D12Buffer
 		LT_Discard						// Discard - No wait for GPU (dynamic buffer)
 	};
 
+	virtual bool						HasAddressChanged () const = 0;
+	virtual void						ClearAddressChangedFlag () = 0;
+	virtual bool						GetAndClearAddressChangedBit (UInt32 idx) = 0;
+
+	virtual void						Release () = 0;
+};
+
+
+// --- ID3D12Buffer ------------------------------------------------------------
+
+class ID3D12Buffer : public ID3D12LockableResource
+{
+public:
 	struct LockData
 	{
 		UInt64				gpuAddress;
 		void*				ptr;
 		ID3D12Resource*		pBuffer;
 	};
 
-	virtual bool						HasAddressChanged () const = 0;
-	virtual void						ClearAddressChangedFlag () = 0;
-	virtual bool						GetAndClearAddressChangedBit (UInt32 idx) = 0;
-
+public:
 	virtual LockData					Lock (LockType lockType, ID3D12Fence* pFence = NULL, UInt64 fenceValue = 0) = 0;
 	virtual void						Unlock () = 0;
+};
 
-	virtual void						Release () = 0;
+
+// --- ID3D12DynamicTexture ----------------------------------------------------
+
+class ID3D12DynamicTexture : public ID3D12LockableResource
+{
+public:
+	struct LockData
+	{
+		UInt64				gpuAddress;
+		void*				ptr;
+		ID3D12Resource*		pBuffer;
+		UInt32				rowPitch;
+		UInt32				depthPitch;
+	};
+
+public:
+	virtual LockData					Lock (LockType lockType, UInt32 faceIdx, UInt32 mipmapLevelIdx,
+											  ID3D12Fence* pFence = NULL, UInt64 fenceValue = 0) = 0;
+	virtual void						Unlock () = 0;
 };
 
+
 // --- ID3D12GraphicsCommandListAuto -------------------------------------------
 
 class ID3D12GraphicsCommandListAuto
@@ -251,6 +282,7 @@ class ID3D12GraphicsCommandListAuto
 																bool forceAsync = false) = 0;
 };
 
+
 // --- Helpers -----------------------------------------------------------------
 
 struct D3D12RSPARAMETER:	public D3D12_ROOT_PARAMETER

dgVoodooAPI/Inc/Addon/ID3D12RootObserver.hpp

@@ -14,6 +14,13 @@
 
 #include "ID3D12Root.hpp"
 
+// --- Predeclarations ---------------------------------------------------------
+
+struct DXGI_SWAP_CHAIN_DESC;
+struct IDXGIFactory1;
+struct IDXGIOutput;
+struct IDXGISwapChain;
+
 namespace dgVoodoo {
 
 // --- ID3D12RootObserver ------------------------------------------------------
@@ -68,6 +75,8 @@ class ID3D12RootObserver
 	virtual bool	D3D12BeginUsingAdapter (UInt32 adapterID) = 0;
 	virtual void	D3D12EndUsingAdapter (UInt32 adapterID) = 0;
 
+	virtual bool	D3D12CreateSwapchainHook (UInt32 adapterID, IDXGIFactory1* pDxgiFactory, IUnknown* pCommandQueue, const DXGI_SWAP_CHAIN_DESC& desc, IDXGISwapChain** ppSwapChain) = 0;
+
 	virtual void	D3D12SwapchainCreated (UInt32 adapterID, ID3D12Swapchain* pSwapchain, const ID3D12Root::SwapchainData& swapchainData) = 0;
 	virtual void	D3D12SwapchainChanged (UInt32 adapterID, ID3D12Swapchain* pSwapchain, const ID3D12Root::SwapchainData& swapchainData) = 0;
 	virtual void	D3D12SwapchainReleased (UInt32 adapterID, ID3D12Swapchain* pSwapchain) = 0;

dgVoodooAPI/Inc/dgVoodooConfig.hpp

@@ -590,6 +590,7 @@ struct ConfigDirectXExt
 	bool					deferredScreenModeSwitch;
 	bool					primarySurfaceBatchedUpdate;
 	bool					suppressAMDBlacklist;
+	bool					d3d12BoundsChecking;
 
 	ConfigDirectXExt () :
 		adapterIDType					(AIDT_Default),
@@ -612,7 +613,8 @@ struct ConfigDirectXExt
 		smoothedDepthSampling			(true),
 		deferredScreenModeSwitch		(false),
 		primarySurfaceBatchedUpdate		(false),
-		suppressAMDBlacklist			(false)
+		suppressAMDBlacklist			(false),
+		d3d12BoundsChecking				(false)
 	{
 		memset (extraResolutions, 0, sizeof (extraResolutions));
 	}

dgVoodooAPI/Samples/D3D12 Addon/AddonMain.hpp

@@ -9,11 +9,11 @@
 
 // --- Includes ----------------------------------------------------------------
 
-#include "..\Inc\IIniParser.hpp"
-#include "..\Inc\APIDebugObj.hpp"
+#include "IIniParser.hpp"
+#include "APIDebugObj.hpp"
 
-#include "..\Inc\Addon\AddonDefs.hpp"
-#include "..\Inc\Addon\IAddonMainCallback.hpp"
+#include "Addon\AddonDefs.hpp"
+#include "Addon\IAddonMainCallback.hpp"
 
 #include "Presenter.hpp"
 #include "Texturer.hpp"

dgVoodooAPI/Samples/D3D12 Addon/Main.cpp

@@ -12,8 +12,8 @@
 #include <tchar.h>
 #include <Windows.h>
 
-#include "..\Inc\Addon\AddonDefs.hpp"
-#include "..\Inc\Addon\IAddonMainCallback.hpp"
+#include "Addon\AddonDefs.hpp"
+#include "Addon\IAddonMainCallback.hpp"
 
 // --- Defines -----------------------------------------------------------------
 

dgVoodooAPI/Samples/D3D12 Addon/Presenter.cpp

@@ -202,6 +202,15 @@ bool	Presenter::ILoadShaders ()
 }
 
 
+void	Presenter::IReleaseShaders ()
+{
+	pVSQuad->Release ();
+	pPSGlass->Release ();
+	pVSQuad = NULL;
+	pPSGlass = NULL;
+}
+
+
 bool	Presenter::ICreateRootSignature (AdapterData& adapter)
 {
 	// SRV array descriptor - just for demonstration purposes: SRV range[3..4] in space 1
@@ -431,6 +440,8 @@ void	Presenter::D3D12RootReleased (const ID3D12Root* _pD3D12Root)
 
 	delete[] glassImage.pBitmap;
 	memset (&glassImage, 0, sizeof (glassImage));
+
+	IReleaseShaders ();
 
 	pD3D12Root = NULL;
 }
@@ -503,6 +514,13 @@ void	Presenter::D3D12EndUsingAdapter (UInt32 adapterID)
 }
 
 
+bool	Presenter::D3D12CreateSwapchainHook (UInt32 /*adapterID*/, IDXGIFactory1* /*pDxgiFactory*/, IUnknown* /*pCommandQueue*/, const DXGI_SWAP_CHAIN_DESC& /*desc*/, IDXGISwapChain** /*ppSwapChain*/)
+{
+	// We do not want to create a swapchain, leave it to dgVoodoo
+	return false;
+}
+
+
 void	Presenter::D3D12SwapchainCreated (UInt32 adapterID, ID3D12Swapchain* pSwapchain, const ID3D12Root::SwapchainData& swapchainData)
 {
 	// Just put it into our entries and don't do anything else

dgVoodooAPI/Samples/D3D12 Addon/Presenter.hpp

@@ -9,7 +9,7 @@
 
 // --- Includes ----------------------------------------------------------------
 
-#include "..\Inc\Addon\ID3D12RootObserver.hpp"
+#include "Addon\ID3D12RootObserver.hpp"
 #include "ImageLoader.hpp"
 #include <unordered_map>
 
@@ -101,6 +101,7 @@ class Presenter:	public ID3D12RootObserver
 	bool			IParsePresenterINISection ();
 
 	bool			ILoadShaders ();
+	void			IReleaseShaders ();
 	bool			ICreateRootSignature (AdapterData& adapter);
 	void			IReleaseRootSignature (AdapterData& adapter);
 	bool			ICreateGlassTexture (AdapterData& adapter);
@@ -120,6 +121,8 @@ class Presenter:	public ID3D12RootObserver
 	virtual bool	D3D12BeginUsingAdapter (UInt32 adapterID) override;
 	virtual void	D3D12EndUsingAdapter (UInt32 adapterID) override;
 
+	virtual bool	D3D12CreateSwapchainHook (UInt32 adapterID, IDXGIFactory1* pDxgiFactory, IUnknown* pCommandQueue, const DXGI_SWAP_CHAIN_DESC& desc, IDXGISwapChain** ppSwapChain)  override;
+
 	virtual void	D3D12SwapchainCreated (UInt32 adapterID, ID3D12Swapchain* pSwapchain, const ID3D12Root::SwapchainData& swapchainData) override;
 	virtual void	D3D12SwapchainChanged (UInt32 adapterID, ID3D12Swapchain* pSwapchain, const ID3D12Root::SwapchainData& swapchainData) override;
 	virtual void	D3D12SwapchainReleased (UInt32 adapterID, ID3D12Swapchain* pSwapchain) override;

dgVoodooAPI/Samples/D3D12 Addon/Texturer.hpp

@@ -9,9 +9,9 @@
 
 // --- Includes ----------------------------------------------------------------
 
-#include "..\Inc\Addon\ID3DObserver.hpp"
-#include "..\Inc\Addon\ID3DDeviceObserver.hpp"
-#include "..\Inc\Addon\ID3DResourceObserver.hpp"
+#include "Addon\ID3DObserver.hpp"
+#include "Addon\ID3DDeviceObserver.hpp"
+#include "Addon\ID3DResourceObserver.hpp"
 
 // --- Namespaces --------------------------------------------------------------