dolphin

mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 23:54:21 +00:00

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

AGL.cpp

fix agl

2013-03-05 15:17:00 +01:00

AGL.h

Rename another function...

2012-12-26 00:34:09 -06:00

EGL_X11.cpp

Fix compiling Dolphin on devices that provide crazy GLES drivers

2013-03-05 03:53:25 +00:00

EGL_X11.h

Fix compiling Dolphin on devices that provide crazy GLES drivers