Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-08-13 04:42:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Graphic_Update' into GLSL-master

Browse Source 
Conflicts:
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
This commit is contained in:
degasus
2013-01-14 21:36:31 +01:00
parent ff5ac8c505 1919a458e8
commit 2f78986e2c
20 changed files with 691 additions and 546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoCommon/Src/VertexManagerBase.cpp
View File

@@ -163,6 +163,9 @@ void VertexManager::Flush()
// loading a state will invalidate BP, so check for it
g_video_backend->CheckInvalidState();
if (LocalVBuffer == s_pCurBufferPointer) return;
if (Flushed) return;
Flushed = true;
g_vertex_manager->vFlush();
}