Update to v2.81

dgVoodooAPI/Inc/Addon/ID3D12Root.hpp

@@ -242,11 +242,13 @@ public:
 	virtual ID3D12Fence*					AGetFence () const = 0;
 
 	virtual	bool							HIUpdateSubBuffer (ID3D12Resource* pMADBuffer, ID3D12HeapPageAllocator* pAllocator,
-															   UInt32 begin, UInt32 end, const void* pSrcData, bool setToUnmappedState = false) = 0;
+															   UInt32 begin, UInt32 end, const void* pSrcData,
+															   bool setToUnmappedState = false, bool forceAsync = false) = 0;
 
 	virtual bool							HIUpdateSubTexture (ID3D12Resource* pMADTexture, UInt32 dstSubResIdx,
 																ID3D12HeapPageAllocator* pAllocator, const D3D12_BOX& dstBox,
-															    const void* pSrcData, UInt32 srcPitch, UInt32 srcDepth) = 0;
+															    const void* pSrcData, UInt32 srcPitch, UInt32 srcDepth,
+																bool forceAsync = false) = 0;
 };
 
 // --- Helpers -----------------------------------------------------------------

dgVoodooAPI/Inc/dgVoodooConfig.hpp

@@ -204,6 +204,16 @@ struct ConfigGeneralExt
 	};
 
 
+	enum ColorSpace
+	{
+		CS_AppDriven			=	0,
+		CS_ARGB8888_SDR,
+		CS_ARGB2101010_SDR,
+		CS_ARGB2101010_SDR_WCG,
+		CS_ARGB16161616_HDR
+	};
+
+
 	enum SystemHookFlags
 	{
 		SHF_None				=	0x0,
@@ -232,6 +242,7 @@ struct ConfigGeneralExt
 	UInt32				fullscreenAttributes;
 	Resampling			resampling;
 	PresentationModel	presentationModel;
+	ColorSpace			colorSpace;
 	UInt32				fpsLimitNumerator;
 	UInt32				fpsLimitDenominator;
 	UInt32				systemHookFlags;
@@ -256,6 +267,7 @@ struct ConfigGeneralExt
 		fullscreenAttributes		(FSA_DefaultAttributes),
 		resampling					(RS_Bilinear),
 		presentationModel			(PM_Automatic),
+		colorSpace					(CS_AppDriven),
 		fpsLimitNumerator			(0),
 		fpsLimitDenominator			(0),
 		systemHookFlags				(SHF_None),
@@ -352,14 +364,27 @@ struct ConfigGlideExt
 		NumOfDitheringBehaviors
 	};
 
-	DitheringEffect		ditheringEffect;
+	enum Default3DRenderFormat
-	Dithering			dithering;
+	{
-	UInt32				ditherOrderedMatrixSizeScale;
+		D3DRF_Auto = 0,
+
+		D3DRF_ARGB8888,
+		D3DRF_ARGB2101010,
+		D3DRF_ARGB16161616,
+
+		NumOfDefault3DRenderFormats
+	};
+
+	DitheringEffect			ditheringEffect;
+	Dithering				dithering;
+	UInt32					ditherOrderedMatrixSizeScale;
+	Default3DRenderFormat	default3DRenderFormat;			// Currently unimplemented
 
 	ConfigGlideExt ():
 		ditheringEffect					(DE_Pure32Bit),
 		dithering						(DT_ForceAlways),
-		ditherOrderedMatrixSizeScale	(0)
+		ditherOrderedMatrixSizeScale	(0),
+		default3DRenderFormat			(D3DRF_Auto)
 	{
 	}
 };
@@ -466,7 +491,8 @@ struct ConfigDirectXExt
 
 	enum DitheringEffect
 	{
-		DE_Pure32Bit	=	0,
+		DE_HighQuality	=	0,
+		DE_Pure32Bit	=	DE_HighQuality,		// For compatibility only
 		DE_Ordered2x2,
 		DE_Ordered4x4,
 
@@ -497,8 +523,11 @@ struct ConfigDirectXExt
 
 	enum Default3DRenderFormat
 	{
+		D3DRF_Auto		=	0,
+
 		D3DRF_ARGB8888,
 		D3DRF_ARGB2101010,
+		D3DRF_ARGB16161616,
 
 		NumOfDefault3DRenderFormats
 	};
@@ -552,6 +581,7 @@ struct ConfigDirectXExt
 	bool					smoothedDepthSampling;
 	bool					deferredScreenModeSwitch;
 	bool					primarySurfaceBatchedUpdate;
+	bool					suppressAMDBlacklist;
 
 	ConfigDirectXExt () :
 		adapterIDType					(AIDT_Default),
@@ -559,11 +589,11 @@ struct ConfigDirectXExt
 		deviceID						(0xFFFFFFFF),
 		subSysID						(0xFFFFFFFF),
 		revisionID						(0xFFFFFFFF),
-		ditheringEffect					(DE_Pure32Bit),
+		ditheringEffect					(DE_HighQuality),
 		dithering						(DT_ForceAlways),
 		ditherOrderedMatrixSizeScale	(0),
 		depthBuffersBitDepth			(DBD_AppDriven),
-		default3DRenderFormat			(D3DRF_ARGB8888),
+		default3DRenderFormat			(D3DRF_Auto),
 		defaultEnumeratedResolutions	(DER_All),
 		enumeratedResolutionBitDepths	(ERBD_All),
 		maxVSConstRegisters				(256),
@@ -573,7 +603,8 @@ struct ConfigDirectXExt
 		rtTexturesForceScaleAndMSAA		(true),
 		smoothedDepthSampling			(true),
 		deferredScreenModeSwitch		(false),
-		primarySurfaceBatchedUpdate		(false)
+		primarySurfaceBatchedUpdate		(false),
+		suppressAMDBlacklist			(false)
 	{
 		memset (extraResolutions, 0, sizeof (extraResolutions));
 	}

dgVoodooAPI/Samples/D3D12 Addon/AddonMain.hpp

@@ -9,11 +9,11 @@
 
 // --- Includes ----------------------------------------------------------------
 
-#include "Public\IIniParser.hpp"
+#include "..\Inc\IIniParser.hpp"
-#include "Public\APIDebugObj.hpp"
+#include "..\Inc\APIDebugObj.hpp"
 
-#include "Public\Addon\AddonDefs.hpp"
+#include "..\Inc\Addon\AddonDefs.hpp"
-#include "Public\Addon\IAddonMainCallback.hpp"
+#include "..\Inc\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 "Public\Addon\AddonDefs.hpp"
+#include "..\Inc\Addon\AddonDefs.hpp"
-#include "Public\Addon\IAddonMainCallback.hpp"
+#include "..\Inc\Addon\IAddonMainCallback.hpp"
 
 // --- Defines -----------------------------------------------------------------
 

dgVoodooAPI/Samples/D3D12 Addon/Presenter.hpp

@@ -9,7 +9,7 @@
 
 // --- Includes ----------------------------------------------------------------
 
-#include "Public\Addon\ID3D12RootObserver.hpp"
+#include "..\Inc\Addon\ID3D12RootObserver.hpp"
 #include "ImageLoader.hpp"
 #include <unordered_map>
 

dgVoodooAPI/Samples/D3D12 Addon/Texturer.hpp

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