From ea4746d0fa531798c051d97d03243ce2d1d0ef96 Mon Sep 17 00:00:00 2001 From: PatrickvL Date: Fri, 24 Feb 2017 01:43:22 +0100 Subject: [PATCH] D3D : Make sure there's only one g_pVertexBuffer --- src/CxbxKrnl/EmuD3D8.cpp | 2 +- src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp | 1 - src/CxbxKrnl/EmuXTL.h | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CxbxKrnl/EmuD3D8.cpp b/src/CxbxKrnl/EmuD3D8.cpp index e78d65ca3..8123e6f28 100644 --- a/src/CxbxKrnl/EmuD3D8.cpp +++ b/src/CxbxKrnl/EmuD3D8.cpp @@ -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 // 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 DWORD g_dwLastSetStream = 0; // The last stream set by D3DDevice::SetStreamSource diff --git a/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp b/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp index 531f272f4..53bfe64b8 100644 --- a/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp +++ b/src/CxbxKrnl/EmuD3D8/VertexBuffer.cpp @@ -53,7 +53,6 @@ XTL::X_D3DPRIMITIVETYPE XTL::g_IVBPrimitiveType = XTL::X_D3DPT_INVALID; UINT XTL::g_IVBTblOffs = 0; struct XTL::_D3DIVB *XTL::g_IVBTable = 0; extern DWORD XTL::g_IVBFVF = 0; -extern XTL::X_D3DVertexBuffer *g_pVertexBuffer = NULL; extern DWORD XTL::g_dwPrimPerFrame = 0; static unsigned int crctab[256]; diff --git a/src/CxbxKrnl/EmuXTL.h b/src/CxbxKrnl/EmuXTL.h index eca0f35fd..e2857c8bf 100644 --- a/src/CxbxKrnl/EmuXTL.h +++ b/src/CxbxKrnl/EmuXTL.h @@ -57,5 +57,6 @@ extern DWORD g_CurrentVertexShader; extern XTL::PIXEL_SHADER * g_CurrentPixelShader; extern BOOL g_bFakePixelShaderLoaded; extern BOOL g_bIsFauxFullscreen; +extern XTL::X_D3DVertexBuffer *g_pVertexBuffer; #endif