Disable DirectDrawSurface render MultiSampling

Only uses the Direct3D9 surface emulation when AntiAliasing is enabled from the config file

Author: elishacloud

Dllmain/BuildNo.rc

@@ -1 +1 @@
-#define BUILD_NUMBER 8064 
+#define BUILD_NUMBER 8065 

d3d9/IDirect3DDevice9Ex.cpp

@@ -1561,7 +1561,7 @@ HRESULT m_IDirect3DDevice9Ex::SetSamplerState(THIS_ DWORD Sampler, D3DSAMPLERSTA
 	Logging::LogDebug() << __FUNCTION__ << " (" << this << ")";
 
 	// Disable AntiAliasing when using point filtering
-	if (SHARED.DeviceMultiSampleType)
+	if (SHARED.DeviceMultiSampleFlag)
 	{
 		if (Type == D3DSAMP_MINFILTER || Type == D3DSAMP_MAGFILTER)
 		{

d3d9/IDirect3DDevice9Ex.h

@@ -349,6 +349,7 @@ class m_IDirect3DDevice9Ex : public IDirect3DDevice9Ex, public AddressLookupTabl
 	AddressLookupTableD3d9* GetLookupTable() const { return &SHARED.ProxyAddressLookupTable9; }
 	StateBlockCache* GetStateBlockTable() const { return &SHARED.StateBlockTable; }
 	StateBlockCache* GetDeletedStateBlock() const { return &SHARED.DeletedStateBlocks; }
+	bool GetDeviceMultiSampleFlag() const { return SHARED.DeviceMultiSampleFlag; }
 	DWORD GetClientDXVersion() const { return SHARED.ClientDirectXVersion; }
 	REFIID GetIID() { return WrapperID; }
 

d3d9/IDirect3DSurface9.cpp

@@ -262,6 +262,7 @@ void m_IDirect3DSurface9::InitInterface(m_IDirect3DDevice9Ex* Device, REFIID, vo
 	{
 		LOG_LIMIT(3, __FUNCTION__ << " Failed to GetDesc()!" << this << ")");
 	}
+	DeviceMultiSampleFlag = m_pDeviceEx->GetDeviceMultiSampleFlag();
 
 	if (Emu.pSurface)
 	{

d3d9/IDirect3DSurface9.h

@@ -8,6 +8,7 @@ class m_IDirect3DSurface9 : public IDirect3DSurface9, public AddressLookupTableD
 	const IID WrapperID = IID_IDirect3DSurface9;
 
 	// For fake emulated locking
+	bool DeviceMultiSampleFlag = false;
 	D3DSURFACE_DESC Desc = {};
 	struct {
 		bool ReadOnly = false;
@@ -65,7 +66,7 @@ class m_IDirect3DSurface9 : public IDirect3DSurface9, public AddressLookupTableD
 
 	// Information functions
 	LPDIRECT3DSURFACE9 GetProxyInterface() const { return ProxyInterface; }
-	bool IsEmulatedSurface() const { return (Desc.MultiSampleType && !(Desc.Usage & D3DUSAGE_DEPTHSTENCIL)); };
+	bool IsEmulatedSurface() const { return (Desc.MultiSampleType && DeviceMultiSampleFlag && !(Desc.Usage & D3DUSAGE_DEPTHSTENCIL)); };
 
 	// Helper functions
 	void InitInterface(m_IDirect3DDevice9Ex* Device, REFIID, void*);

ddraw/IDirectDrawSurfaceX.cpp

@@ -4375,8 +4375,8 @@ HRESULT m_IDirectDrawSurfaceX::CreateD9Surface()
 	// Set lockable
 	surface.IsLockable = true;
 
-	// Anti-aliasing
-	if (IsRenderTarget())
+	// Anti-aliasing (enabling this causes Lock to fail on some games with the Primary/Backbuffer surfaces)
+	/*if (IsRenderTarget())
 	{
 		bool AntiAliasing = (surfaceDesc2.ddsCaps.dwCaps2 & DDSCAPS2_HINTANTIALIASING) || (surfaceDesc2.ddsCaps.dwCaps3 & DDSCAPS3_MULTISAMPLE_MASK);
 		if (AntiAliasing && !surface.MultiSampleType)
@@ -4397,7 +4397,7 @@ HRESULT m_IDirectDrawSurfaceX::CreateD9Surface()
 			// Default to 8 samples as some games have issues with more samples
 			surface.MultiSampleType = ddrawParent->GetMultiSampleTypeQuality(Format, MaxSamples ? MaxSamples : D3DMULTISAMPLE_8_SAMPLES, surface.MultiSampleQuality);
 		}
-	}
+	}*/
 
 	// Set created by
 	ShouldEmulate = (ShouldEmulate == SC_NOT_CREATED) ? SC_DONT_FORCE : ShouldEmulate;