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

Version: 3.5-1466
Branch: shader-uids-awesome
Date: 9 years, 10 months ago

Windows x64 Windows x86 Mac OS X Android

Commit

ca22872daed7c384db350b2987b21ea92299a9e8

Change author

NeoBrainX

Change description

Merge 'master' into shader-uids-awesome.

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

Information for shader-uids-awesome-3.5-1466