Jordan Woyak f3f89e1d00 Merge branch 'master' into vertex-loader-cleanup ...

Conflicts:
	Source/Core/Common/Src/CommonFuncs.h
	Source/Core/VideoCommon/Src/VertexLoader.cpp

2013-03-04 15:47:56 -06:00

..

FramebufferManager.cpp

Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)."

2013-01-16 15:46:11 -05:00

FramebufferManager.h

Revert "Made several variables/parameters unsigned in the DX9, DX11 and OGL plugins. They make more sense like this (given their names)."

2013-01-16 15:46:11 -05: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

ARM Support without GLSL

2013-02-26 13:49:00 -06:00

GLUtil.h

Fix ARM build.

2013-03-03 07:37:22 +00:00

main.cpp

Some cleanups.

2013-03-01 01:31:57 +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

ARM Support without GLSL

2013-02-26 13:49:00 -06:00

PerfQuery.cpp

Kill warning.

2013-03-02 23:00:14 -06:00

PerfQuery.h

Kill warning.

2013-03-02 23:00:14 -06:00

PixelShaderCache.cpp

Open std::fstream in a unicode-safe manner.

2013-02-28 19:33:39 -06:00

PixelShaderCache.h

Revert the recent zcomploc changes including the Graphic_Fixes merge.

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

PostProcessing.cpp

Convert GetUserPath to return a std::string instead of a const char *. This simplifies its usage in most cases.

2011-02-28 20:40:15 +00: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

RasterFont.cpp

Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae

2013-01-07 13:47:34 -06:00

RasterFont.h

Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae

2013-01-07 13:47:34 -06:00

Render.cpp

Merge branch 'master' into windows-unicode

2013-03-02 15:33:32 -06: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

Revert "Don't load level 0 twice for 1-level textures in DX11." and fix it properly.

2013-02-20 05:42:22 -06:00

TextureCache.h

Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae

2013-01-07 13:47:34 -06:00

TextureConverter.cpp

Revert 30dd9c2 e9d00bf db5f4c8 and bff0fae

2013-01-07 13:47:34 -06: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 vertex-loader-cleanup

2013-03-04 15:47:56 -06:00

VertexManager.h

Hey, long time no commits :).

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

VertexShaderCache.cpp

Open std::fstream in a unicode-safe manner.

2013-02-28 19:33:39 -06:00

VertexShaderCache.h

Clean up various things.

2011-09-29 23:32:39 +02:00

VideoBackend.h

* GUI Video-Settings changes:

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