dolphin-emulator/Source/Core
degasus e1a081ad2d Merge branch 'GLSL-master'
Merge an endless story. The branch name is a lie, it was started as glsl, but now it is a complete reworked opengl3 backend.

It just began with simple changes which aren't supported on osx.
They either support ogl2 OR ogl3 core, but mixing isn't allowed.
As the branch name says, the vicious circle starts with GLSL, but just implementing one wasn't possible either:
- OSX supports only GLSL100 which doesn't support our shaders.
- Vertex Array Objects are needed for ogl3, but not supported on ogl2
- immediate mode isn't supported any more, so we must implement vertex buffers
- uniform buffers are recommended as else we would need tons glUniform
- postprocessing shaders have to be converted to glsl
- lots of smaller outdated issues and bug fixes :-)

Thanks at all for testing and at Sonic for converting all of our shaders to glsl130

And sorry for all upcoming bugs...
2013-03-15 22:49:26 +01:00
..
AudioCommon ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Common Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
Core Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
DiscIO Fix a potential memory leak in function DecompressBlobToFile in CompressedBlob.cpp 2013-03-07 10:59:50 -05:00
DolphinWX Merge branch 'GLSL-master' 2013-03-15 22:49:26 +01:00
InputCommon Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
VideoCommon Merge branch 'master' into GLSL-master 2013-03-15 11:19:52 -05:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00