diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp index 692a35517..7ea4ebd23 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp @@ -8323,31 +8323,6 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_LoadVertexShaderProgram) EmuLog(LOG_LEVEL::WARNING, "Vertex Shader Cache Size: %d", g_LoadVertexShaderProgramCache.size()); } -// ****************************************************************** -// * patch: D3DDevice_GetVertexShaderType -// ****************************************************************** -VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderType) -( - DWORD Handle, - DWORD *pType -) -{ - LOG_FUNC_BEGIN - LOG_FUNC_ARG(Handle) - LOG_FUNC_ARG(pType) - LOG_FUNC_END; - - // Handle is always address of an Xbox VertexShader struct, or-ed with 1 (X_D3DFVF_RESERVED0) - // *pType is set according to flags in the VertexShader struct - - if (pType) { - CxbxVertexShader *pCxbxVertexShader = GetCxbxVertexShader(Handle); - if (pCxbxVertexShader) { - *pType = pCxbxVertexShader->XboxVertexShaderType; - } - } -} - // ****************************************************************** // * patch: D3DDevice_GetVertexShaderDeclaration // ****************************************************************** diff --git a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches index 0cf7a53d8..61b0b5b2c 100644 --- a/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches +++ b/src/core/hle/D3D8/Direct3D9/Direct3D9.cpp.unused-patches @@ -3943,3 +3943,28 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderSize) *pSize = pVertexShader ? pVertexShader->XboxNrAddressSlots : 0; } } + +// ****************************************************************** +// * patch: D3DDevice_GetVertexShaderType +// ****************************************************************** +VOID WINAPI XTL::EMUPATCH(D3DDevice_GetVertexShaderType) +( + DWORD Handle, + DWORD *pType +) +{ + LOG_FUNC_BEGIN + LOG_FUNC_ARG(Handle) + LOG_FUNC_ARG(pType) + LOG_FUNC_END; + + // Handle is always address of an Xbox VertexShader struct, or-ed with 1 (X_D3DFVF_RESERVED0) + // *pType is set according to flags in the VertexShader struct + + if (pType) { + CxbxVertexShader *pCxbxVertexShader = GetCxbxVertexShader(Handle); + if (pCxbxVertexShader) { + *pType = pCxbxVertexShader->XboxVertexShaderType; + } + } +} diff --git a/src/core/hle/Patches.cpp b/src/core/hle/Patches.cpp index 53e39309a..86916e0ef 100644 --- a/src/core/hle/Patches.cpp +++ b/src/core/hle/Patches.cpp @@ -96,7 +96,7 @@ std::map g_PatchTable = { PATCH_ENTRY("D3DDevice_GetVertexShaderFunction", XTL::EMUPATCH(D3DDevice_GetVertexShaderFunction), PATCH_HLE_D3D), PATCH_ENTRY("D3DDevice_GetVertexShaderInput", XTL::EMUPATCH(D3DDevice_GetVertexShaderInput), PATCH_HLE_D3D), //PATCH_ENTRY("D3DDevice_GetVertexShaderSize", XTL::EMUPATCH(D3DDevice_GetVertexShaderSize), PATCH_HLE_D3D), - PATCH_ENTRY("D3DDevice_GetVertexShaderType", XTL::EMUPATCH(D3DDevice_GetVertexShaderType), PATCH_HLE_D3D), + //PATCH_ENTRY("D3DDevice_GetVertexShaderType", XTL::EMUPATCH(D3DDevice_GetVertexShaderType), PATCH_HLE_D3D), PATCH_ENTRY("D3DDevice_GetViewportOffsetAndScale", XTL::EMUPATCH(D3DDevice_GetViewportOffsetAndScale), PATCH_HLE_D3D), PATCH_ENTRY("D3DDevice_GetVisibilityTestResult", XTL::EMUPATCH(D3DDevice_GetVisibilityTestResult), PATCH_HLE_D3D), PATCH_ENTRY("D3DDevice_InsertCallback", XTL::EMUPATCH(D3DDevice_InsertCallback), PATCH_HLE_D3D),