mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-02 19:12:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
3253603ae7
dolphin/Source/Core/VideoCommon
History
NeoBrainX 3253603ae7 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/PixelShaderManager.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.cpp
	Source/Core/VideoCommon/Src/VertexShaderGen.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
2013-03-26 22:21:19 +01:00
..
Src Merge 'master' into shader-uids-awesome. 2013-03-26 22:21:19 +01:00
CMakeLists.txt Merge branch 'master' into perfqueries. 2013-03-01 01:07:34 +01:00
OpenCL.rules
VideoCommon.vcxproj Merge branch 'master' into perfqueries. 2013-03-01 01:07:34 +01:00
VideoCommon.vcxproj.filters D3D11: Port perf queries code to the PerfQueryBase interface. 2013-03-01 19:30:37 +01:00