Dolphin Emulator - Information on shader-uids-awesome-3.5-1344

Version: 3.5-1344
Branch: shader-uids-awesome
Date: 9 years, 11 months ago

Windows x64 Windows x86 Mac OS X Android

Commit

5e6b712651dc042b06ce59bcfb4becda5ee15022

Change author

NeoBrainX

Change description

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

Information for shader-uids-awesome-3.5-1344