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

D3D : Make sure there's only one g_pVertexBuffer

This commit is contained in:
PatrickvL 2017-02-24 01:43:22 +01:00
parent 56abb773bb
commit ea4746d0fa
3 changed files with 2 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

@ -117,7 +117,7 @@ static XTL::X_D3DIndexBuffer *g_pIndexBuffer = NULL; // current active in
static DWORD g_dwBaseVertexIndex = 0;// current active index buffer base index static DWORD g_dwBaseVertexIndex = 0;// current active index buffer base index
// current active vertex stream // current active vertex stream
static XTL::X_D3DVertexBuffer *g_pVertexBuffer = NULL; // current active vertex buffer extern XTL::X_D3DVertexBuffer *g_pVertexBuffer = NULL; // current active vertex buffer
static XTL::IDirect3DVertexBuffer8 *g_pDummyBuffer = NULL; // Dummy buffer, used to set unused stream sources with static XTL::IDirect3DVertexBuffer8 *g_pDummyBuffer = NULL; // Dummy buffer, used to set unused stream sources with
static DWORD g_dwLastSetStream = 0; // The last stream set by D3DDevice::SetStreamSource static DWORD g_dwLastSetStream = 0; // The last stream set by D3DDevice::SetStreamSource

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

@ -53,7 +53,6 @@ XTL::X_D3DPRIMITIVETYPE XTL::g_IVBPrimitiveType = XTL::X_D3DPT_INVALID;
UINT XTL::g_IVBTblOffs = 0; UINT XTL::g_IVBTblOffs = 0;
struct XTL::_D3DIVB *XTL::g_IVBTable = 0; struct XTL::_D3DIVB *XTL::g_IVBTable = 0;
extern DWORD XTL::g_IVBFVF = 0; extern DWORD XTL::g_IVBFVF = 0;
extern XTL::X_D3DVertexBuffer *g_pVertexBuffer = NULL;
extern DWORD XTL::g_dwPrimPerFrame = 0; extern DWORD XTL::g_dwPrimPerFrame = 0;
static unsigned int crctab[256]; static unsigned int crctab[256];

1
src/CxbxKrnl/EmuXTL.h
View File

@ -57,5 +57,6 @@ extern DWORD g_CurrentVertexShader;
extern XTL::PIXEL_SHADER * g_CurrentPixelShader; extern XTL::PIXEL_SHADER * g_CurrentPixelShader;
extern BOOL g_bFakePixelShaderLoaded; extern BOOL g_bFakePixelShaderLoaded;
extern BOOL g_bIsFauxFullscreen; extern BOOL g_bIsFauxFullscreen;
extern XTL::X_D3DVertexBuffer *g_pVertexBuffer;
#endif #endif