Fixed flashing screen in Glover

See issue #295.

DDrawCompat/D3dDdi/Resource.cpp

@@ -1274,8 +1274,7 @@ namespace D3dDdi
 		m_device.flushPrimitives();
 		if (srcResource->m_lockResource)
 		{
-			if (srcResource->m_lockData[data.SrcSubResourceIndex].isSysMemUpToDate &&
+			if (srcResource->m_lockData[data.SrcSubResourceIndex].isSysMemUpToDate)
-				!srcResource->m_origData.Flags.RenderTarget)
 			{
 				srcResource->m_lockData[data.SrcSubResourceIndex].isVidMemUpToDate = false;
 				srcResource->m_lockData[data.SrcSubResourceIndex].isMsaaResolvedUpToDate = false;
@@ -1488,11 +1487,9 @@ namespace D3dDdi
 	void Resource::setAsPrimary()
 	{
 		D3dDdi::ScopedCriticalSection lock;
-		if (!m_isPrimary)
+		m_isPrimary = true;
-		{
+		m_origData.Flags.RenderTarget = DDraw::PrimarySurface::getOrigCaps() & DDSCAPS_3DDEVICE ? 1 : 0;
-			m_isPrimary = true;
+		updateConfig();
-			updateConfig();
-		}
 	}
 
 	void Resource::setFormatOverride(D3DDDIFORMAT format)

DDrawCompat/DDraw/DirectDrawSurface.cpp

@@ -59,6 +59,7 @@ namespace
 	constexpr void setCompatVtable(Vtable& vtable)
 	{
 		typedef GetSurfaceType<Vtable>::Type TSurface;
+		SET_COMPAT_METHOD(AddAttachedSurface);
 		SET_COMPAT_METHOD(Blt);
 		SET_COMPAT_METHOD(BltFast);
 		SET_COMPAT_METHOD(Flip);

DDrawCompat/DDraw/Surfaces/PrimarySurface.cpp

@@ -84,6 +84,11 @@ namespace DDraw
 		desc.ddsCaps.dwCaps |= DDSCAPS_OFFSCREENPLAIN;
 		desc.ddpfPixelFormat = DirectDraw::getRgbPixelFormat(g_monitorInfo.bpp);
 
+		if (!(desc.dwFlags & DDSD_BACKBUFFERCOUNT))
+		{
+			desc.ddsCaps.dwCaps |= DDSCAPS_3DDEVICE;
+		}
+
 		result = Surface::create(dd, desc, surface, std::move(privateData));
 		if (FAILED(result))
 		{
@@ -277,6 +282,16 @@ namespace DDraw
 		Surface::restore();
 	}
 
+	void PrimarySurface::setAsRenderTarget()
+	{
+		g_origCaps |= DDSCAPS_3DDEVICE;
+		auto resource = D3dDdi::Device::findResource(DDraw::DirectDrawSurface::getDriverResourceHandle(*g_primarySurface));
+		if (resource)
+		{
+			resource->setAsPrimary();
+		}
+	}
+
 	void PrimarySurface::updateFrontResource()
 	{
 		g_frontResource = DirectDrawSurface::getDriverResourceHandle(*g_primarySurface);

DDrawCompat/DDraw/Surfaces/PrimarySurface.h

@@ -28,6 +28,7 @@ namespace DDraw
 		static HANDLE getGdiResource();
 		static DWORD getOrigCaps();
 		static void onLost();
+		static void setAsRenderTarget();
 		static void updatePalette();
 
 		template <typename TSurface>

DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.cpp

@@ -84,6 +84,22 @@ namespace DDraw
 	{
 	}
 
+	template <typename TSurface>
+	HRESULT PrimarySurfaceImpl<TSurface>::AddAttachedSurface(TSurface* This, TSurface* lpDDSAttachedSurface)
+	{
+		HRESULT result = getOrigVtable(This).AddAttachedSurface(This, lpDDSAttachedSurface);
+		if (SUCCEEDED(result) && !(PrimarySurface::getOrigCaps() & DDSCAPS_3DDEVICE))
+		{
+			TDdsCaps caps = {};
+			getOrigVtable(This).GetCaps(lpDDSAttachedSurface, &caps);
+			if (caps.dwCaps & DDSCAPS_3DDEVICE)
+			{
+				PrimarySurface::setAsRenderTarget();
+			}
+		}
+		return result;
+	}
+
 	template <typename TSurface>
 	HRESULT PrimarySurfaceImpl<TSurface>::Blt(
 		TSurface* This, LPRECT lpDestRect, TSurface* lpDDSrcSurface, LPRECT lpSrcRect,

DDrawCompat/DDraw/Surfaces/PrimarySurfaceImpl.h

@@ -15,6 +15,7 @@ namespace DDraw
 	public:
 		PrimarySurfaceImpl(Surface* data);
 
+		virtual HRESULT AddAttachedSurface(TSurface* This, TSurface* lpDDSAttachedSurface) override;
 		virtual HRESULT Blt(TSurface* This, LPRECT lpDestRect, TSurface* lpDDSrcSurface, LPRECT lpSrcRect,
 			DWORD dwFlags, LPDDBLTFX lpDDBltFx) override;
 		virtual HRESULT BltFast(TSurface* This, DWORD dwX, DWORD dwY,

DDrawCompat/DDraw/Surfaces/SurfaceImpl.cpp

@@ -122,6 +122,12 @@ namespace DDraw
 	{
 	}
 
+	template <typename TSurface>
+	HRESULT SurfaceImpl<TSurface>::AddAttachedSurface(TSurface* This, TSurface* lpDDSAttachedSurface)
+	{
+		return getOrigVtable(This).AddAttachedSurface(This, lpDDSAttachedSurface);
+	}
+
 	template <typename TSurface>
 	HRESULT SurfaceImpl<TSurface>::Blt(
 		TSurface* This, LPRECT lpDestRect, TSurface* lpDDSrcSurface, LPRECT lpSrcRect,

DDrawCompat/DDraw/Surfaces/SurfaceImpl.h

@@ -24,6 +24,7 @@ namespace DDraw
 		SurfaceImpl(Surface* data);
 		virtual ~SurfaceImpl();
 
+		virtual HRESULT AddAttachedSurface(TSurface* This, TSurface* lpDDSAttachedSurface);
 		virtual HRESULT Blt(TSurface* This, LPRECT lpDestRect, TSurface* lpDDSrcSurface, LPRECT lpSrcRect,
 			DWORD dwFlags, LPDDBLTFX lpDDBltFx);
 		virtual HRESULT BltFast(TSurface* This, DWORD dwX, DWORD dwY,