diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2018-09-19 04:30:31 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2018-10-09 00:31:43 +0100 |
| commit | 56fdcf5f00a8066617ae738652ab041614b0938a (patch) | |
| tree | 27ea67ace40234c2bd47c3d3f7f47d3c4d8ae320 /Source/Core | |
| parent | 31594a81388d08f4989cf7031062d023b78f88ed (diff) | |
VideoCommon: remove unnecessary floor()
floatindex is clamped to the range [0, 9]. For non-negative numbers
floor() is equivalent to trunc(). Truncation happens implicitly when
converting to uint, so the floor() is unnecessary.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/VideoBackends/Software/Tev.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/PixelShaderGen.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/VideoCommon/UberShaderPixel.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 0d96d16506..4b7c41347c 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -780,7 +780,7 @@ void Tev::Draw() floatindex = MathUtil::Clamp(floatindex, 0.f, 9.f); // TODO: This shouldn't be necessary! // Get the two closest integer indices, look up the corresponding samples - const int indexlower = (int)floor(floatindex); + const int indexlower = (int)floatindex; const int indexupper = indexlower + 1; // Look up coefficient... Seems like multiplying by 4 makes Fortune Street work properly (fog // is too strong without the factor) diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index 7ba5edba7f..5271d31671 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -1354,7 +1354,7 @@ static void WriteFog(ShaderCode& out, const pixel_shader_uid_data* uid_data) out.SetConstantsUsed(C_FOGF, C_FOGF); out.Write("\tfloat offset = (2.0 * (rawpos.x / " I_FOGF ".w)) - 1.0 - " I_FOGF ".z;\n"); out.Write("\tfloat floatindex = clamp(9.0 - abs(offset) * 9.0, 0.0, 9.0);\n"); - out.Write("\tuint indexlower = uint(floor(floatindex));\n"); + out.Write("\tuint indexlower = uint(floatindex);\n"); out.Write("\tuint indexupper = indexlower + 1u;\n"); out.Write("\tfloat klower = " I_FOGRANGE "[indexlower >> 2u][indexlower & 3u];\n"); out.Write("\tfloat kupper = " I_FOGRANGE "[indexupper >> 2u][indexupper & 3u];\n"); diff --git a/Source/Core/VideoCommon/UberShaderPixel.cpp b/Source/Core/VideoCommon/UberShaderPixel.cpp index 9c9630886a..6c5f6f84fe 100644 --- a/Source/Core/VideoCommon/UberShaderPixel.cpp +++ b/Source/Core/VideoCommon/UberShaderPixel.cpp @@ -1171,7 +1171,7 @@ ShaderCode GenPixelShader(APIType ApiType, const ShaderHostConfig& host_config, " // ze *= x_adjust\n" " float offset = (2.0 * (rawpos.x / " I_FOGF ".w)) - 1.0 - " I_FOGF ".z;\n" " float floatindex = clamp(9.0 - abs(offset) * 9.0, 0.0, 9.0);\n" - " uint indexlower = uint(floor(floatindex));\n" + " uint indexlower = uint(floatindex);\n" " uint indexupper = indexlower + 1u;\n" " float klower = " I_FOGRANGE "[indexlower >> 2u][indexlower & 3u];\n" " float kupper = " I_FOGRANGE "[indexupper >> 2u][indexupper & 3u];\n" |