mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-29 12:19:12 +00:00
Merge branch 'master' into GLSL-master
Conflicts: Source/Core/VideoCommon/Src/PixelShaderGen.cpp Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
This commit is contained in:
commit
8c1091a21f
38 changed files with 384 additions and 190 deletions
|
@ -415,6 +415,7 @@ void PixelShaderManager::SetZTextureBias(u32 bias)
|
|||
void PixelShaderManager::SetViewportChanged()
|
||||
{
|
||||
s_bDepthRangeChanged = true;
|
||||
s_bFogRangeAdjustChanged = true; // TODO: Shouldn't be necessary with an accurate fog range adjust implementation
|
||||
}
|
||||
|
||||
void PixelShaderManager::SetIndTexScaleChanged(u8 stagemask)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue