NeoBrainX 5e6b712651 Merge 'master' into shader-uids-awesome. ...

Conflicts:
	Source/Core/VideoCommon/Src/BPMemory.h
	Source/Core/VideoCommon/Src/LightingShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/PixelShaderGen.h
	Source/Core/VideoCommon/Src/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h

2013-04-25 14:05:54 +02:00

..

D3DBase.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DBase.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DShader.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DShader.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DTexture.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DTexture.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DUtil.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

D3DUtil.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

FramebufferManager.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

FramebufferManager.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

Globals.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

main.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

main.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

NativeVertexFormat.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

PerfQuery.cpp

Fix for the hang after close caused by my previews perf queries commit.

2013-04-04 12:53:06 -03:00

PerfQuery.h

Fix for the hang after close caused by my previews perf queries commit.

2013-04-04 12:53:06 -03:00

PixelShaderCache.cpp

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

PixelShaderCache.h

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

Render.cpp

Fix a bunch of random typos in comments and logging.

2013-04-19 09:21:45 -04:00

Render.h

Revert the recent zcomploc changes including the Graphic_Fixes merge.

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

stdafx.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

stdafx.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

TextureCache.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

TextureCache.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

TextureConverter.cpp

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

TextureConverter.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

VertexManager.cpp

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

VertexManager.h

New license header introduced to all Video based projects.

2013-04-17 23:29:41 -04:00

VertexShaderCache.cpp

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

VertexShaderCache.h

Merge 'master' into shader-uids-awesome.

2013-04-25 14:05:54 +02:00

VideoBackend.h

Mark the Direct3D9 backend deprecated.

2013-03-23 23:53:19 +01:00