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

Merge 'master' into shader-uids-awesome.

Browse source 
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
This commit is contained in:
NeoBrainX 2013-06-17 12:05:47 +02:00
commit ca22872dae
172 changed files with 4585 additions and 1736 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
View file

@ -346,6 +346,8 @@ ID3D11Buffer* &PixelShaderCache::GetConstantBuffer()
memcpy(map.pData, psconstants, sizeof(psconstants));
D3D::context->Unmap(pscbuf, 0);
pscbufchanged = false;
ADDSTAT(stats.thisFrame.bytesUniformStreamed, sizeof(psconstants));
}
return pscbuf;
}