ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
dolphin/Source/Plugins/Plugin_VideoOGL/Src
History
degasus a1c5e90083 Merge branch 'master' into GLSL-master 
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
 		2013-03-06 15:59:29 +01:00
..
FramebufferManager.cpp Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae" 2013-01-24 16:11:07 +01:00
FramebufferManager.h Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)." 2013-01-16 15:46:11 -05:00
GLUtil.cpp Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
GLUtil.h Fix ARM build. 2013-03-03 07:37:22 +00:00
Globals.h Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins into Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken. 2011-01-31 01:28:32 +00:00
NativeVertexFormat.cpp Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
PerfQuery.cpp Kill warning. 2013-03-02 23:00:14 -06:00
PerfQuery.h Kill warning. 2013-03-02 23:00:14 -06:00
PixelShaderCache.cpp Open std::fstream in a unicode-safe manner. 2013-02-28 19:33:39 -06:00
PostProcessing.cpp merge Vertex and PixelShaderCache into ProgramShaderCache 2013-02-13 13:12:19 +01:00
PostProcessing.h Put some stuff in the gfx plugins into namespaces, so that the symbols won't collide if someone decides to merge the gfx plugins into dolphin too. still more things left to do though. 2011-01-29 20:16:51 +00:00
ProgramShaderCache.cpp fix glsl140 workaround 2013-03-05 15:24:10 +01:00
ProgramShaderCache.h merge glsl headers into one place 2013-02-13 21:34:48 +01:00
RasterFont.cpp merge glsl headers into one place 2013-02-13 21:34:48 +01:00
RasterFont.h Revert "Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae" 2013-01-24 16:11:07 +01:00
Render.cpp Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
Render.h fix bug when rasterfont disappears sometimes 2013-01-25 20:39:19 +01:00
SamplerCache.cpp make samplercache global and call constructor/destructor 2013-02-26 18:30:13 +01:00
SamplerCache.h make samplercache global and call constructor/destructor 2013-02-26 18:30:13 +01:00
StreamBuffer.cpp Revert "remove flag GL_SYNC_FLUSH_COMMANDS_BIT on syncing" 2013-03-05 16:51:09 +01:00
StreamBuffer.h workaround for GLEW_AMD_pinned_memory and older glew versions 2013-03-04 12:40:23 +01:00
TextureCache.cpp Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
TextureCache.h Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
TextureConverter.cpp merge glsl headers into one place 2013-02-13 21:34:48 +01:00
TextureConverter.h use renderbuf fo xfb 2013-01-16 01:37:00 +01:00
VertexManager.cpp Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
VertexManager.h create StreamBuffer class for ogl upload 2013-01-31 23:11:53 +01:00
VertexShaderCache.cpp Open std::fstream in a unicode-safe manner. 2013-02-28 19:33:39 -06:00
VideoBackend.h Split VideoBackend::Cleanup from Shutdown. 2013-02-26 16:42:32 +01:00
main.cpp Merge branch 'master' into GLSL-master 2013-03-06 15:59:29 +01:00
main.h Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins into Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken. 2011-01-31 01:28:32 +00:00
stdafx.cpp Minor code formatting: 2010-09-28 02:15:02 +00:00
stdafx.h Minor code formatting: 2010-09-28 02:15:02 +00:00