piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7457 from Tilka/use_clamp

Browse Source 
VideoSoftware: make use of Clamp()
This commit is contained in:
Jules Blok 2018-10-07 19:53:45 +01:00 committed by GitHub
commit 1ab1d41b10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/VideoBackends/Software/Tev.cpp
View File

@ -6,6 +6,7 @@
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "VideoBackends/Software/DebugUtil.h" #include "VideoBackends/Software/DebugUtil.h"
#include "VideoBackends/Software/EfbInterface.h" #include "VideoBackends/Software/EfbInterface.h"
#include "VideoBackends/Software/Tev.h" #include "VideoBackends/Software/Tev.h"
@ -776,9 +777,7 @@ void Tev::Draw()
// Based on that, choose the index such that points which are far away from the z-axis use the // Based on that, choose the index such that points which are far away from the z-axis use the
// 10th "k" value and such that central points use the first value. // 10th "k" value and such that central points use the first value.
float floatindex = 9.f - std::abs(offset) * 9.f; float floatindex = 9.f - std::abs(offset) * 9.f;
floatindex = (floatindex < 0.f) ? floatindex = MathUtil::Clamp(floatindex, 0.f, 9.f); // TODO: This shouldn't be necessary!
0.f :
(floatindex > 9.f) ? 9.f : floatindex; // TODO: This shouldn't be necessary!
// Get the two closest integer indices, look up the corresponding samples // Get the two closest integer indices, look up the corresponding samples
const int indexlower = (int)floor(floatindex); const int indexlower = (int)floor(floatindex);
@ -799,7 +798,7 @@ void Tev::Draw()
ze -= bpmem.fog.GetC(); ze -= bpmem.fog.GetC();
// clamp 0 to 1 // clamp 0 to 1
float fog = (ze < 0.0f) ? 0.0f : ((ze > 1.0f) ? 1.0f : ze); float fog = MathUtil::Clamp(ze, 0.f, 1.f);
switch (bpmem.fog.c_proj_fsel.fsel) switch (bpmem.fog.c_proj_fsel.fsel)
{ {