ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the Dolphin XDK sample

This commit is contained in:
Luke Usher 2018-02-14 11:29:42 +00:00
parent dc586f8509
commit 9438893ce1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -6704,9 +6704,9 @@ void EmuUpdateActiveTextureStages()
void CxbxUpdateNativeD3DResources() void CxbxUpdateNativeD3DResources()
{ {
XTL::EmuUpdateDeferredStates();
EmuUpdateActiveTextureStages();
EmuUnswizzleTextureStages(); EmuUnswizzleTextureStages();
EmuUpdateActiveTextureStages();
XTL::EmuUpdateDeferredStates();
/* TODO : Port these : /* TODO : Port these :
DxbxUpdateActiveVertexShader(); DxbxUpdateActiveVertexShader();
DxbxUpdateActiveTextures(); DxbxUpdateActiveTextures();

13
src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp
View File

@ -333,13 +333,21 @@ UINT XTL::VertexPatcher::GetNbrStreams(VertexPatchDesc *pPatchDesc)
} }
else else
{ {
return 1; // Could be more, but it doesn't matter as we're not going to patch the types int lastStreamIndex;
for (int i = 0; i < 16; i++) {
if (g_D3DStreams[i] != nullptr) {
lastStreamIndex = i;
}
}
return lastStreamIndex + 1;
} }
} }
else if(pPatchDesc->hVertexShader) else if(pPatchDesc->hVertexShader)
{ {
return 1; return 1;
} }
return 0; return 0;
} }
@ -360,7 +368,7 @@ bool XTL::VertexPatcher::PatchStream(VertexPatchDesc *pPatchDesc,
} }
} }
if(!m_pDynamicPatch || !m_pDynamicPatch->pStreamPatches[uiStream].NeedPatch) if(!m_pDynamicPatch || m_pDynamicPatch->NbrStreams < uiStream || !m_pDynamicPatch->pStreamPatches[uiStream].NeedPatch)
{ {
return false; return false;
} }
@ -942,6 +950,7 @@ bool XTL::VertexPatcher::Apply(VertexPatchDesc *pPatchDesc, bool *pbFatalError)
bool Patched = false; bool Patched = false;
// Get the number of streams // Get the number of streams
m_uiNbrStreams = GetNbrStreams(pPatchDesc); m_uiNbrStreams = GetNbrStreams(pPatchDesc);
EmuWarning("Stream Count: %d", m_uiNbrStreams);
if(VshHandleIsVertexShader(pPatchDesc->hVertexShader)) if(VshHandleIsVertexShader(pPatchDesc->hVertexShader))
{ {
m_pDynamicPatch = &((VERTEX_SHADER *)VshHandleGetVertexShader(pPatchDesc->hVertexShader)->Handle)->VertexDynamicPatch; m_pDynamicPatch = &((VERTEX_SHADER *)VshHandleGetVertexShader(pPatchDesc->hVertexShader)->Handle)->VertexDynamicPatch;