Braden
|
a0fdcaced8
|
Removes the redundant window on OSX
|
2013-03-13 21:34:52 -05:00 |
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 |
Ryan Houdek
|
717b976875
|
ARM Support without GLSL
|
2013-02-26 13:49:00 -06:00 |
degasus
|
376a807dea
|
first try of osx fix, mostly by pauldachz
|
2013-02-07 10:34:29 +01:00 |
Ryan Houdek
|
5169804a61
|
Remove duplicated X11 code.
|
2012-12-26 12:12:26 -06:00 |
Ryan Houdek
|
01953ff64a
|
Rename the interface files and hopefully fix OSX building.
|
2012-12-25 19:08:24 -06:00 |