Simplify function W3DSmudgeManager::testHardwareSupport to what chat has suggested trying

Author: xezon

Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DSmudge.cpp

@@ -57,6 +57,7 @@ void W3DSmudgeManager::init(void)
 {
 	SmudgeManager::init();
 	ReAcquireResources();
+	testHardwareSupport();
 }
 
 void W3DSmudgeManager::reset (void)
@@ -133,210 +134,73 @@ void W3DSmudgeManager::ReAcquireResources(void)
 	}
 }
 
-/*Copies a portion of the current render target into a specified buffer*/
-Int copyRect(unsigned char *buf, Int bufSize, Int oX, Int oY, Int width, Int height)
+Bool W3DSmudgeManager::testHardwareSupport(void)
 {
-	IDirect3DSurface8 *surface=NULL;	///<previous render target
-	IDirect3DSurface8 *tempSurface=NULL;
-	Int result = 0;
-
-	LPDIRECT3DDEVICE8 m_pDev=DX8Wrapper::_Get_D3D_Device8();
-
-	if (!m_pDev)
-		goto error;
-
-	m_pDev->GetRenderTarget(&surface);
-
-	if (!surface)
-		goto error;
-
-	D3DSURFACE_DESC desc;
-	surface->GetDesc(&desc);
-
-	RECT srcRect;
-	srcRect.left=oX;
-	srcRect.top=oY;
-	srcRect.right=oX+width;
-	srcRect.bottom=oY+height;
-	DEBUG_ASSERTCRASH(srcRect.left >= 0, ("copyRect - Invalid size"));
-	DEBUG_ASSERTCRASH(srcRect.top >= 0, ("copyRect - Invalid size"));
-	DEBUG_ASSERTCRASH(srcRect.right < (LONG)desc.Width, ("copyRect - Invalid size"));
-	DEBUG_ASSERTCRASH(srcRect.bottom < (LONG)desc.Height, ("copyRect - Invalid size"));
-
-	POINT dstPoint;
-	dstPoint.x=0;
-	dstPoint.y=0;
-
-	HRESULT hr;
-	hr=m_pDev->CreateImageSurface(width, height, desc.Format, &tempSurface);
-
-	if (hr != S_OK)
-		goto error;
-
-	hr=m_pDev->CopyRects(surface,&srcRect,1,tempSurface,&dstPoint);
-
-	if (hr != S_OK)
-		goto error;
-
-	D3DLOCKED_RECT lrect;
-
-	hr=tempSurface->LockRect(&lrect,NULL,D3DLOCK_READONLY);
-
-	if (hr != S_OK)
-		goto error;
-
-	tempSurface->GetDesc(&desc);
-	UnsignedInt bytesPerPixel;
-	bytesPerPixel = DX8Wrapper::Bytes_Per_Pixel(desc.Format);
-
-	if (bytesPerPixel == 0)
-		goto error;
-
-	Int rowSize;
-	Int totalSize;
-	rowSize = width * bytesPerPixel;
-	totalSize = height * rowSize;
-
-	if (totalSize > bufSize)
-		totalSize = bufSize;
-
-	UnsignedByte* dst;
-	UnsignedByte* src;
-	Int rowCount;
-	Int row;
-	dst = buf;
-	src = (UnsignedByte*)lrect.pBits;
-	rowCount = totalSize / rowSize;
-
-	for (row = 0; row < rowCount; ++row)
+	// Return cached result if already checked
+	if (m_hardwareSupportStatus != SMUDGE_SUPPORT_UNKNOWN)
 	{
-		memcpy(dst, src, rowSize);
-		dst += rowSize;
-		src += lrect.Pitch;
+		return m_hardwareSupportStatus == SMUDGE_SUPPORT_YES;
 	}
 
-	result = totalSize;
-	tempSurface->UnlockRect();
-
-error:
-	if (surface)
-		surface->Release();
-	if (tempSurface)
-		tempSurface->Release();
-
-	return result;
-}
-
-#define UNIQUE_COLOR	(0x12345678)
-#define BLOCK_SIZE	(8)
-
-Bool W3DSmudgeManager::testHardwareSupport(void)
-{
-	if (m_hardwareSupportStatus == SMUDGE_SUPPORT_UNKNOWN)
-	{	//we have not done the test yet.
-
-		IDirect3DTexture8 *backTexture=W3DShaderManager::getRenderTexture();
-		if (!backTexture)
-		{	//do trivial test first to see if render target exists.
-			m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
-			return FALSE;
-		}
-
-		if (!W3DShaderManager::isRenderingToTexture())
-			return FALSE;	//can't do the test unless we're rendering to texture.
-
-		VertexMaterialClass *vmat=VertexMaterialClass::Get_Preset(VertexMaterialClass::PRELIT_DIFFUSE);
-		DX8Wrapper::Set_Material(vmat);
-		REF_PTR_RELEASE(vmat);	//no need to keep a reference since it's a preset.
-
-		ShaderClass shader=ShaderClass::_PresetOpaqueShader;
-		shader.Set_Depth_Compare(ShaderClass::PASS_ALWAYS);
-		shader.Set_Depth_Mask(ShaderClass::DEPTH_WRITE_DISABLE);
-		DX8Wrapper::Set_Shader(shader);
-		DX8Wrapper::Set_Texture(0,NULL);
-		DX8Wrapper::Apply_Render_State_Changes();	//force update of view and projection matrices
-
-		struct _TRANS_LIT_TEX_VERTEX {
-			Vector4 p;
-			DWORD color;   // diffuse color
-			float	u;
-			float	v;
-		} v[4];
-
-		//bottom right
-		v[0].p = Vector4( BLOCK_SIZE-0.5f, BLOCK_SIZE-0.5f, 0.0f, 1.0f );
-		v[0].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();
-		v[0].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
-		//top right
-		v[1].p = Vector4( BLOCK_SIZE-0.5f, 0-0.5f, 0.0f, 1.0f );
-		v[1].u = BLOCK_SIZE/(Real)TheDisplay->getWidth();
-		v[1].v = 0;
-		//bottom left
-		v[2].p = Vector4(  0-0.5f, BLOCK_SIZE-0.5f, 0.0f, 1.0f );
-		v[2].u = 0;
-		v[2].v = BLOCK_SIZE/(Real)TheDisplay->getHeight();
-		//top left
-		v[3].p = Vector4(  0-0.5f,  0-0.5f, 0.0f, 1.0f );
-		v[3].u = 0;
-		v[3].v = 0;
-
-		v[0].color = UNIQUE_COLOR;
-		v[1].color = UNIQUE_COLOR;
-		v[2].color = UNIQUE_COLOR;
-		v[3].color = UNIQUE_COLOR;
-
-		LPDIRECT3DDEVICE8 pDev=DX8Wrapper::_Get_D3D_Device8();
-
-		//draw polygons like this is very inefficient but for only 2 triangles, it's
-		//not worth bothering with index/vertex buffers.
-		pDev->SetVertexShader(D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_TEX1);
-
-		pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-
-		DWORD refData[BLOCK_SIZE*BLOCK_SIZE];
-		memset(refData,0,sizeof(refData));
-		Int bufSize=copyRect((unsigned char *)refData,sizeof(refData),0,0,BLOCK_SIZE,BLOCK_SIZE);	//copy area we just rendered using solid color
-		if (!bufSize)
-		{
-			m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
-			return FALSE;
-		}
-
-		DX8Wrapper::Set_DX8_Texture(0,backTexture);
+	LPDIRECT3DDEVICE8 d3d8Device = DX8Wrapper::_Get_D3D_Device8();
+	LPDIRECT3D8 d3d8Interface = DX8Wrapper::_Get_D3D8();
+	if (!d3d8Device || !d3d8Interface)
+	{
+		m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
+		return false;
+	}
 
-		DWORD testData[BLOCK_SIZE*BLOCK_SIZE];
-		memset(testData,0xff,sizeof(testData));
+	D3DCAPS8 caps;
+	d3d8Device->GetDeviceCaps(&caps);
 
-		v[0].color = 0xffffffff;
-		v[1].color = 0xffffffff;
-		v[2].color = 0xffffffff;
-		v[3].color = 0xffffffff;
+	// DX8 requires dynamic textures to efficiently update smudge texture
+	if (!(caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES))
+	{
+		m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
+		return false;
+	}
 
-		pDev->DrawPrimitiveUP(D3DPT_TRIANGLESTRIP, 2, v, sizeof(_TRANS_LIT_TEX_VERTEX));
-		bufSize=copyRect((unsigned char *)testData,sizeof(testData),0,0,BLOCK_SIZE,BLOCK_SIZE);
+	IDirect3DTexture8 *backTexture = W3DShaderManager::getRenderTexture();
+	if (!backTexture)
+	{
+		m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
+		return FALSE;
+	}
 
-		if (!bufSize)
-		{
-			m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
-			return FALSE;
-		}
+	IDirect3DSurface8* surface;
+	if (FAILED(backTexture->GetSurfaceLevel(0, &surface)))
+	{
+		m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
+		return false;
+	}
 
-		//compare the 2 buffers to see if they match.
-		if (memcmp(testData,refData,bufSize) == 0)
-		{
-			m_hardwareSupportStatus = SMUDGE_SUPPORT_YES;
-			return TRUE;
-		}
+	D3DSURFACE_DESC desc;
+	surface->GetDesc(&desc);
+	surface->Release();
+
+	// Check if the device supports render-to-texture for this format
+	HRESULT hr = d3d8Interface->CheckDeviceFormat(
+		D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL,
+		DX8Wrapper::_Get_D3D_Back_Buffer_Format(),
+		D3DUSAGE_RENDERTARGET,
+		D3DRTYPE_TEXTURE,
+		desc.Format
+	);
+
+	if (hr != D3D_OK)
+	{
 		m_hardwareSupportStatus = SMUDGE_SUPPORT_NO;
+		return false;
 	}
 
-	return (SMUDGE_SUPPORT_YES == m_hardwareSupportStatus);
+	m_hardwareSupportStatus = SMUDGE_SUPPORT_YES;
+	return true;
 }
 
 void W3DSmudgeManager::render(RenderInfoClass &rinfo)
 {
 	//Verify that the card supports the effect.
-	if (!testHardwareSupport())
+	if (m_hardwareSupportStatus == SMUDGE_SUPPORT_NO)
 		return;
 
 	CameraClass &camera=rinfo.Camera;

GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h

@@ -527,6 +527,7 @@ class DX8Wrapper
 	static IDirect3D8* _Get_D3D8() { return D3DInterface; }
 	/// Returns the display format - added by TR for video playback - not part of W3D
 	static WW3DFormat	getBackBufferFormat( void );
+	static D3DFORMAT _Get_D3D_Back_Buffer_Format() { return DisplayFormat; }
 	static bool Reset_Device(bool reload_assets=true);
 
 	static const DX8Caps*	Get_Current_Caps() { WWASSERT(CurrentCaps); return CurrentCaps; }