mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-07 00:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'Graphic_Update' into GLSL-master

Browse source 
Conflicts:
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
This commit is contained in:
degasus 2013-01-14 21:36:31 +01:00
commit 2f78986e2c
20 changed files with 691 additions and 546 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
View file

@ -23,7 +23,7 @@
int GetLightingShaderId(u32* out)
{
for (int i = 0; i < xfregs.numChan.numColorChans; ++i)
for (u32 i = 0; i < xfregs.numChan.numColorChans; ++i)
{
out[i] = xfregs.color[i].enablelighting ?
(u32)xfregs.color[i].hex :