Merge pull request #80 from elishacloud/master

crosire · May 17, 2018 · 25c6edc · 25c6edc
2 parents 100f6b5 + 007c3d2
commit 25c6edc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/source/d3d8to9.hpp b/source/d3d8to9.hpp
@@ -180,6 +180,7 @@ class Direct3DDevice8 : public IUnknown
 	INT CurrentBaseVertexIndex = 0;
 	const BOOL ZBufferDiscarding = FALSE;
 	DWORD CurrentVertexShaderHandle = 0, CurrentPixelShaderHandle = 0;
+	IDirect3DSurface9 *pCurrentRenderTarget = nullptr;
 	bool PaletteFlag = false;
 
 	static constexpr size_t MAX_CLIP_PLANES = 6;

diff --git a/source/d3d8to9_device.cpp b/source/d3d8to9_device.cpp
@@ -273,7 +273,7 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateTexture(UINT Width, UINT Height
 		{
 			Usage |= D3DUSAGE_RENDERTARGET;
 		}
-		else
+		else if (Usage != D3DUSAGE_DEPTHSTENCIL)
 		{
 			Usage |= D3DUSAGE_DYNAMIC;
 		}
@@ -410,6 +410,8 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::CreateRenderTarget(UINT Width, UINT H
 		return hr;
 	}
 
+	pCurrentRenderTarget = SurfaceInterface;
+
 	*ppSurface = new Direct3DSurface8(this, SurfaceInterface);
 
 	return D3D_OK;
@@ -621,6 +623,8 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::SetRenderTarget(Direct3DSurface8 *pRe
 		{
 			return hr;
 		}
+
+		pCurrentRenderTarget = pRenderTarget->GetProxyInterface();
 	}
 
 	if (pNewZStencil != nullptr)
@@ -655,6 +659,8 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::GetRenderTarget(Direct3DSurface8 **pp
 		return hr;
 	}
 
+	pCurrentRenderTarget = SurfaceInterface;
+
 	*ppRenderTarget = ProxyAddressLookupTable->FindAddress<Direct3DSurface8>(SurfaceInterface);
 
 	return D3D_OK;
@@ -705,6 +711,16 @@ HRESULT STDMETHODCALLTYPE Direct3DDevice8::MultiplyTransform(D3DTRANSFORMSTATETY
 }
 HRESULT STDMETHODCALLTYPE Direct3DDevice8::SetViewport(const D3DVIEWPORT8 *pViewport)
 {
+	if (pCurrentRenderTarget != nullptr)
+	{
+		D3DSURFACE_DESC Desc;
+		HRESULT hr = pCurrentRenderTarget->GetDesc(&Desc);
+		if (SUCCEEDED(hr) && (pViewport->Height > Desc.Height || pViewport->Width > Desc.Width))
+		{
+			return D3DERR_INVALIDCALL;
+		}
+	}
+
 	return ProxyInterface->SetViewport(pViewport);
 }
 HRESULT STDMETHODCALLTYPE Direct3DDevice8::GetViewport(D3DVIEWPORT8 *pViewport)