From f07b75dc09f8990f2fd6b34d55afe26346d1d876 Mon Sep 17 00:00:00 2001 From: daco65 Date: Sat, 13 Sep 2008 15:09:03 +0000 Subject: [PATCH] some patches done by F|res & OmegaDox git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@512 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Core.vcproj | 6 +- Source/Core/DolphinWX/DolphinWX.vcproj | 24 +- .../Plugin_VideoOGL/Src/VertexLoader.cpp | 7 + .../Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj | 326 +++++++++--------- 4 files changed, 196 insertions(+), 167 deletions(-) diff --git a/Source/Core/Core/Core.vcproj b/Source/Core/Core/Core.vcproj index f0ccf78555..97719f6257 100644 --- a/Source/Core/Core/Core.vcproj +++ b/Source/Core/Core/Core.vcproj @@ -1,7 +1,7 @@ + + + + @@ -878,6 +886,18 @@ RelativePath=".\resource1.h" > + + + + + + diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp index d665f25482..4e170bf6aa 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexLoader.cpp @@ -1010,6 +1010,12 @@ void VertexManager::Flush() GL_REPORT_ERRORD(); + s64 size = (s64)s_pCurBufferPointer-(s64)s_pBaseBufferPointer; + if (size < 0) + { + int t = 0; + } + glBindBuffer(GL_ARRAY_BUFFER, s_vboBuffers[s_nCurVBOIndex]); glBufferData(GL_ARRAY_BUFFER, s_pCurBufferPointer-s_pBaseBufferPointer, s_pBaseBufferPointer, GL_STREAM_DRAW); GL_REPORT_ERRORD(); @@ -1114,6 +1120,7 @@ void VertexManager::Flush() int offset = 0; vector< pair >::iterator it; + size_t vecSize = s_vStoredPrimitives.size(); for (it = s_vStoredPrimitives.begin(); it != s_vStoredPrimitives.end(); ++it) { glDrawArrays(it->first, offset, it->second); offset += it->second; diff --git a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj index 71328b1960..5f221fc1f3 100644 --- a/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj +++ b/Source/Plugins/Plugin_nJoy_SDL/Plugin_nJoy_SDL.vcproj @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +