degasus
|
a629dea4dc
|
Merge branch 'master' into GLSL-master
Conflicts:
CMakeLists.txt
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Src/GLInterface/WX.cpp
Source/Core/DolphinWX/Src/GLInterface/WX.h
Source/Core/VideoCommon/Src/TextureCacheBase.cpp
Source/Core/VideoCommon/Src/TextureCacheBase.h
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
damn mipmap_fixes ...
|
2013-02-18 18:49:20 +01:00 |
|
Ryan Houdek
|
73eb98ed8e
|
Move swap control to the host specific GLInterface files.
|
2013-01-24 10:31:08 -06:00 |
|
degasus
|
84debc17d5
|
fix msaa
blitting between msaa fbos may not scale. So we need to resolve the efb before swapping.
|
2013-01-09 01:50:52 +01:00 |
|
Ryan Houdek
|
5169804a61
|
Remove duplicated X11 code.
|
2012-12-26 12:12:26 -06:00 |
|
Ryan Houdek
|
9a58f9a3bb
|
Rename another function...
|
2012-12-26 00:34:09 -06:00 |
|
Ryan Houdek
|
f4e7a280a9
|
Remove cg.lib from some files for Windows and renaming a function.
|
2012-12-26 00:07:43 -06:00 |
|
Ryan Houdek
|
01953ff64a
|
Rename the interface files and hopefully fix OSX building.
|
2012-12-25 19:08:24 -06:00 |