mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-04 23:29:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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();
}