degasus 316a33d1e6 Merge branch 'master' into GLSL-master ...

Conflicts:
	Source/Core/DolphinWX/Src/VideoConfigDiag.h
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp

2012-12-27 10:36:54 +01:00

..

FramebufferManager.cpp

move glBindBuffer and glBindVertexArray out of VertexManager

2012-12-13 15:28:52 -06:00

FramebufferManager.h

Put some stuff in the gfx plugins into namespaces, so that the symbols won't collide if someone decides to merge the gfx plugins into dolphin too. still more things left to do though.

2011-01-29 20:16:51 +00:00

Globals.h

Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins into Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken.

2011-01-31 01:28:32 +00:00

GLUtil.cpp

Merge Fail: Make sure we are using the interface file to get backbuffer dimensions. GL helper function was duplicated.

2012-12-26 13:15:19 -06:00

GLUtil.h

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

main.cpp

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

main.h

Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins into Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken.

2011-01-31 01:28:32 +00:00

NativeVertexFormat.cpp

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

PixelShaderCache.cpp

Initial removal of Nvidia CG. Still some more cleanup to go

2012-12-24 11:09:52 -06:00

PixelShaderCache.h

Initial removal of Nvidia CG. Still some more cleanup to go

2012-12-24 11:09:52 -06:00

PostProcessing.cpp

Initial removal of Nvidia CG. Still some more cleanup to go

2012-12-24 11:09:52 -06:00

PostProcessing.h

Put some stuff in the gfx plugins into namespaces, so that the symbols won't collide if someone decides to merge the gfx plugins into dolphin too. still more things left to do though.

2011-01-29 20:16:51 +00:00

ProgramShaderCache.cpp

set ProgramShaderCache program format correctly.

2012-10-09 23:56:00 -05:00

ProgramShaderCache.h

set ProgramShaderCache program format correctly.

2012-10-09 23:56:00 -05:00

RasterFont.cpp

fix byte order in osd rasterfont

2012-12-26 23:48:33 +01:00

RasterFont.h

custom shader for RasterFont, fix color support

2012-12-13 15:28:36 -06:00

Render.cpp

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

Render.h

Revert the recent zcomploc changes including the Graphic_Fixes merge.

2012-08-10 20:12:02 +02:00

stdafx.cpp

Minor code formatting:

2010-09-28 02:15:02 +00:00

stdafx.h

Minor code formatting:

2010-09-28 02:15:02 +00:00

TextureCache.cpp

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

TextureCache.h

Check texture params before updateing them

2012-12-13 15:28:48 -06:00

TextureConverter.cpp

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

TextureConverter.h

TextureCache: Move EFB copy cache code from TextureConverter to TextureCache

2012-01-31 19:51:32 +01:00

VertexManager.cpp

Merge branch 'master' into GLSL-master

2012-12-27 10:36:54 +01:00

VertexManager.h

Hey, long time no commits :).

2012-10-20 10:22:15 -03:00

VertexShaderCache.cpp

Initial removal of Nvidia CG. Still some more cleanup to go

2012-12-24 11:09:52 -06:00

VertexShaderCache.h

Initial removal of Nvidia CG. Still some more cleanup to go

2012-12-24 11:09:52 -06:00

VideoBackend.h

* GUI Video-Settings changes:

2011-03-21 19:57:31 +00:00