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

..

D3DBase.cpp

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DBase.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DBlob.cpp

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DBlob.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DShader.cpp

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

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

D3DShader.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DTexture.cpp

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DTexture.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

D3DUtil.cpp

Fix some minor bugs pointed out by PVS Studio (thanks!)

2012-03-03 20:07:20 +01:00

D3DUtil.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

FramebufferManager.cpp

move RestoreAPIState and ResetAPIState into backends

2013-01-28 18:16:03 +01: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

GfxState.cpp

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

GfxState.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +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

LineGeometryShader.cpp

fix build issue with intel compiler and fix some unsafe string usages, patch by FilthyMonkey

2011-10-01 21:31:43 -05:00

LineGeometryShader.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

main.cpp

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +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

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

PerfQuery.cpp

PerfQueries: Fix an integer overflow.

2013-03-01 23:57:56 +01:00

PerfQuery.h

D3D11: Port perf queries code to the PerfQueryBase interface.

2013-03-01 19:30:37 +01:00

PixelShaderCache.cpp

Revert the recent zcomploc changes including the Graphic_Fixes merge.

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

PixelShaderCache.h

Revert the recent zcomploc changes including the Graphic_Fixes merge.

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

PointGeometryShader.cpp

fix build issue with intel compiler and fix some unsafe string usages, patch by FilthyMonkey

2011-10-01 21:31:43 -05:00

PointGeometryShader.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

PSTextureEncoder.cpp

Fixed texture encoding in DX11. Thanks to wordmanwords for the patch.

2012-05-06 10:51:38 +10:00

PSTextureEncoder.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

Render.cpp

D3D11: Port perf queries code to the PerfQueryBase interface.

2013-03-01 19:30:37 +01:00

Render.h

D3D11: Port perf queries code to the PerfQueryBase interface.

2013-03-01 19:30:37 +01:00

stdafx.cpp

Add a DX11 video plugin.

2010-06-13 19:50:06 +00:00

stdafx.h

Add a DX11 video plugin.

2010-06-13 19:50:06 +00:00

Television.cpp

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

Television.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

TextureCache.cpp

Fix my DX11 texture-related failure..

2013-02-20 14:18:21 -06:00

TextureCache.h

Merge branch 'master' into GLSL-master

2013-02-18 18:49:20 +01:00

TextureEncoder.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

VertexManager.cpp

Merge branch 'master' into GLSL-master

2013-03-06 15:59:29 +01:00

VertexManager.h

Implement the new buffer approach in opengl. sadly in my machine it gives my only 2 more fps and if your hardware does not support ARB_map_buffer_range is even slower than plain vertex arrays.

2012-10-26 11:34:02 -03:00

VertexShaderCache.cpp

Only sync shader caches to disk on stop.

2011-09-29 23:16:42 +02:00

VertexShaderCache.h

Fix Windows build.

2011-09-29 22:54:52 +02:00

VideoBackend.h

Split VideoBackend::Cleanup from Shutdown.

2013-02-26 16:42:32 +01:00

XFBEncoder.cpp

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00

XFBEncoder.h

Revert r7421 and r7422.

2011-06-11 19:37:21 +00:00