Merge pull request #1302 from gandalfthewhite19890404/patch-1

Change Unsupported D3DVERTEXBLENDFLAGS from Fatal to Test Case
This commit is contained in:
Luke Usher 2018-06-21 12:02:40 +01:00 committed by GitHub
commit c17f830df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions

View File

@ -6395,22 +6395,24 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetRenderState_VertexBlend)
DWORD Value
)
{
FUNC_EXPORTS
FUNC_EXPORTS
LOG_FUNC_ONE_ARG(Value);
LOG_FUNC_ONE_ARG(Value);
// convert from Xbox direct3d to PC direct3d enumeration
if(Value <= 1)
if(Value <= 1) {
Value = Value;
else if(Value == 3)
} else if(Value == 3) {
Value = 2;
else if(Value == 5)
} else if(Value == 5) {
Value = 3;
else
CxbxKrnlCleanup("Unsupported D3DVERTEXBLENDFLAGS (%d)", Value);
} else {
LOG_TEST_CASE("Unsupported D3DVERTEXBLENDFLAGS (%d)", Value);
return;
}
HRESULT hRet = g_pD3DDevice->SetRenderState(D3DRS_VERTEXBLEND, Value);
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetRenderState");
HRESULT hRet = g_pD3DDevice->SetRenderState(D3DRS_VERTEXBLEND, Value);
DEBUG_D3DRESULT(hRet, "g_pD3DDevice->SetRenderState");
}
// ******************************************************************