ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6289 from degasus/arb_mipmap_for_upscaled_textures 

VideoCommon: Apply custom texture scale for arbitrary mipmaps.
This commit is contained in:
Markus Wick 2018-01-17 20:04:51 +01:00 committed by GitHub
parent 2a43f41ace cb7eede193
commit 2719e1fb88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/VideoCommon/VertexManagerBase.cpp
View File

@ -12,6 +12,8 @@
#include "Common/ChunkFile.h" #include "Common/ChunkFile.h"
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Common/Logging/Log.h" #include "Common/Logging/Log.h"
#include "Common/MathUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "VideoCommon/BPMemory.h" #include "VideoCommon/BPMemory.h"
@ -209,7 +211,8 @@ std::pair<size_t, size_t> VertexManagerBase::ResetFlushAspectRatioCount()
return val; return val;
} }
static void SetSamplerState(u32 index, bool custom_tex, bool has_arbitrary_mips) static void SetSamplerState(u32 index, float custom_tex_scale, bool custom_tex,
bool has_arbitrary_mips)
{ {
const FourTexUnits& tex = bpmem.tex[index / 4]; const FourTexUnits& tex = bpmem.tex[index / 4];
const TexMode0& tm0 = tex.texMode0[index % 4]; const TexMode0& tm0 = tex.texMode0[index % 4];
@ -257,8 +260,9 @@ static void SetSamplerState(u32 index, bool custom_tex, bool has_arbitrary_mips)
// Apply a secondary bias calculated from the IR scale to pull inwards mipmaps // Apply a secondary bias calculated from the IR scale to pull inwards mipmaps
// that have arbitrary contents, eg. are used for fog effects where the // that have arbitrary contents, eg. are used for fog effects where the
// distance they kick in at is important to preserve at any resolution. // distance they kick in at is important to preserve at any resolution.
state.lod_bias = // Correct this with the upscaling factor of custom textures.
state.lod_bias + std::log2(static_cast<float>(g_renderer->GetEFBScale())) * 256.f; s64 lod_offset = std::log2(g_renderer->GetEFBScale() / custom_tex_scale) * 256.f;
state.lod_bias = MathUtil::Clamp<s64>(state.lod_bias + lod_offset, -32768, 32767);
// Anisotropic also pushes mips farther away so it cannot be used either // Anisotropic also pushes mips farther away so it cannot be used either
state.anisotropic_filtering = 0; state.anisotropic_filtering = 0;
@ -335,7 +339,8 @@ void VertexManagerBase::Flush()
if (tentry) if (tentry)
{ {
SetSamplerState(i, tentry->is_custom_tex, tentry->has_arbitrary_mips); float custom_tex_scale = tentry->GetWidth() / float(tentry->native_width);
SetSamplerState(i, custom_tex_scale, tentry->is_custom_tex, tentry->has_arbitrary_mips);
PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height); PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height);
} }
else else