Merge pull request #1216 from PatrickvL/FixPushbufferResources
D3D : Fix pushbuffer based drawing
This commit is contained in:
commit
2d81b79587
|
@ -7468,7 +7468,7 @@ void EmuUpdateActiveTextureStages()
|
|||
}
|
||||
}
|
||||
|
||||
void CxbxUpdateNativeD3DResources()
|
||||
void XTL::CxbxUpdateNativeD3DResources()
|
||||
{
|
||||
EmuUpdateActiveTextureStages();
|
||||
|
||||
|
|
|
@ -205,9 +205,7 @@ extern void XTL::EmuExecutePushBufferRaw
|
|||
|
||||
X_D3DPRIMITIVETYPE XboxPrimitiveType = X_D3DPT_INVALID;
|
||||
|
||||
// TODO: This technically should be enabled
|
||||
XTL::EmuUpdateDeferredStates();
|
||||
EmuUpdateActiveTextureStages();
|
||||
CxbxUpdateNativeD3DResources();
|
||||
|
||||
#ifdef _DEBUG_TRACK_PB
|
||||
bool bShowPB = false;
|
||||
|
|
|
@ -53,4 +53,6 @@ extern DWORD *EmuD3DDeferredTextureState;
|
|||
|
||||
extern void EmuUpdateDeferredStates();
|
||||
|
||||
extern void CxbxUpdateNativeD3DResources();
|
||||
|
||||
#endif
|
|
@ -820,8 +820,7 @@ void XTL::CxbxVertexBufferConverter::Apply(CxbxDrawContext *pDrawContext)
|
|||
|
||||
VOID XTL::EmuFlushIVB()
|
||||
{
|
||||
XTL::EmuUpdateDeferredStates();
|
||||
EmuUpdateActiveTextureStages();
|
||||
CxbxUpdateNativeD3DResources();
|
||||
|
||||
// Parse IVB table with current FVF shader if possible.
|
||||
bool bFVF = VshHandleIsFVF(g_CurrentXboxVertexShaderHandle);
|
||||
|
|
|
@ -2404,7 +2404,7 @@ extern HRESULT XTL::EmuRecompileVshFunction
|
|||
// Build an array of registers that are declared
|
||||
// This is used to remove instructions that haven't been declared
|
||||
// as they cause CreateVertexShader to fail
|
||||
bool declaredRegisters[13];
|
||||
bool declaredRegisters[13] = { false };
|
||||
DWORD* pDeclToken = pRecompiledDeclaration;
|
||||
do {
|
||||
DWORD regNum = *pDeclToken & X_D3DVSD_VERTEXREGMASK;
|
||||
|
|
Loading…
Reference in New Issue