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

Merge pull request #738 from LukeUsher/fixing-jsrf 

Fix JSRF Regression after NV2A merge
This commit is contained in:
Luke Usher 2017-09-20 10:33:15 +01:00 committed by GitHub
parent 66502da40f 96925bc97d
commit 761143945c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CxbxKrnl/EmuD3D8.cpp
View File

@ -4871,7 +4871,7 @@ VOID WINAPI XTL::EMUPATCH(D3DDevice_SetVertexDataColor)
// ****************************************************************** // ******************************************************************
VOID WINAPI XTL::EMUPATCH(D3DDevice_End)() VOID WINAPI XTL::EMUPATCH(D3DDevice_End)()
{ {
//FUNC_EXPORTS FUNC_EXPORTS
LOG_FUNC(); LOG_FUNC();

4
src/CxbxKrnl/EmuNV2A.cpp
View File

@ -71,6 +71,7 @@ namespace xboxkrnl
#include "EmuFS.h" #include "EmuFS.h"
#include "EmuKrnl.h" #include "EmuKrnl.h"
#include "EmuNV2A.h" #include "EmuNV2A.h"
#include "HLEIntercept.h"
#include "nv2a_int.h" // from https://github.com/espes/xqemu/tree/xbox/hw/xbox #include "nv2a_int.h" // from https://github.com/espes/xqemu/tree/xbox/hw/xbox
#include <gl\glew.h> #include <gl\glew.h>
@ -3749,5 +3750,8 @@ void EmuNV2A_Init()
pfifo.puller_thread = std::thread(pfifo_puller_thread); pfifo.puller_thread = std::thread(pfifo_puller_thread);
// Only spawn VBlank thread when LLE is enabled
if (bLLE_GPU) {
vblank_thread = std::thread(nv2a_vblank_thread);; vblank_thread = std::thread(nv2a_vblank_thread);;
}
} }