29 Commits

Author SHA1 Message Date
Grant Paul
aabd8ce664 Add retina display support for Mac. 2013-03-31 11:36:42 -07:00
Braden
a2af6494cf Clean up CInterfaceAGL, make sure the screen gets cleared on stop, and remove the FPS update that messes up GUI builds since GUIless doesn't build anyways. 2013-03-18 17:15:59 -05:00
Braden
ae3c5a64cc Fix full screen on OSX, well as fixed as its ever been. Apperently in render to main it always shown the FPS on the bottom in full screen. 2013-03-17 20:58:43 -05:00
degasus
84119a966b Revert "remove wx from agl"
This reverts commit e63a5d85297b7fc31c89b13c2ba09aa7d2fd4294.
window_handle is also used at many other places, so just move it here isn't allowed
2013-03-15 02:40:08 +01:00
degasus
e63a5d8529 remove wx from agl 2013-03-14 09:52:13 +01:00
Braden
a0fdcaced8 Removes the redundant window on OSX 2013-03-13 21:34:52 -05:00
degasus
e1ca002937 osx: only use accelerated backends 2013-03-11 16:36:07 +01: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
degasus
4714e4f99c fix agl 2013-03-05 15:17:00 +01:00
Ryan Houdek
3ac7ee4623 Fix compiling Dolphin on devices that provide crazy GLES drivers 2013-03-05 03:53:25 +00:00
Ryan Houdek
717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
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
818a376bd4 Fix header guard and definitions not being set to 1 2013-02-12 14:11:29 -06:00
Ryan Houdek
8923f0e13b Fix header guard and definitions not being set to 1 2013-02-11 15:06:40 -06:00
degasus
376a807dea first try of osx fix, mostly by pauldachz 2013-02-07 10:34:29 +01:00
degasus
c05f66bdd0 first try for osx core profile
now it doesn't crash, but it still hangs on startup
2013-01-31 12:20:17 +01:00
Ryan Houdek
10418d449f Removed the need for this temporary variable. 2013-01-24 10:53:37 -06:00
Ryan Houdek
52ead25534 Cleans up EGL. Removes printf output with INFO_LOG and ERROR_LOG 2013-01-24 10:39:38 -06:00
Ryan Houdek
73eb98ed8e Move swap control to the host specific GLInterface files. 2013-01-24 10:31:08 -06:00
degasus
e0ffdda26e Merge branch 'immediate-removal' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
Sonicadvance1
0ba1794df3 Fix AGL.cpp 2013-01-21 21:48:02 +00: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
NeoBrainX
09197e0ffc X11: Disable OSD hotkeys when the corresponding option is disabled. 2013-01-08 18:16:47 +01:00
Ryan Houdek
64afbade33 Fix 4 warnings on OSX 2012-12-30 04:32:37 -06: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
c884dbf654 Mistype in WX.cpp 2012-12-25 19:18:03 -06:00
Ryan Houdek
01953ff64a Rename the interface files and hopefully fix OSX building. 2012-12-25 19:08:24 -06:00