dolphin/Source/Plugins/Plugin_VideoSoftware/Src
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
..
BPMemLoader.cpp
BPMemLoader.h
Clipper.cpp
Clipper.h
CPMemLoader.cpp
CPMemLoader.h
DebugUtil.cpp
DebugUtil.h
EfbCopy.cpp
EfbCopy.h
EfbInterface.cpp
EfbInterface.h
HwRasterizer.cpp
HwRasterizer.h
NativeVertexFormat.h
OpcodeDecoder.cpp
OpcodeDecoder.h
Rasterizer.cpp
Rasterizer.h
SetupUnit.cpp
SetupUnit.h
stdafx.cpp
stdafx.h
SWCommandProcessor.cpp
SWCommandProcessor.h
SWmain.cpp
SWPixelEngine.cpp
SWPixelEngine.h
SWRenderer.cpp
SWRenderer.h
SWStatistics.cpp
SWStatistics.h
SWVertexLoader.cpp
SWVertexLoader.h
SWVideoConfig.cpp
SWVideoConfig.h
Tev.cpp
Tev.h
TextureEncoder.cpp
TextureEncoder.h
TextureSampler.cpp
TextureSampler.h
TransformUnit.cpp
TransformUnit.h
Vec3.h
VideoBackend.h
VideoConfigDialog.cpp
VideoConfigDialog.h
XFMemLoader.cpp
XFMemLoader.h