archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 11:51:48 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix incorrect handling of auto IR

Browse source 
Some lines of code in Dolphin just plainly grabbed the value of
g_ActiveConfig.iEFBScale, which resulted in Auto being treated as
0x rather than the actual automatically selected scale.
This commit is contained in:
JosJuice 2017-11-03 16:04:46 +01:00
parent c8710d0861
commit a310cbec8e
6 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
View file

@ -131,7 +131,7 @@ void PSTextureEncoder::Encode(u8* dst, const EFBCopyParams& params, u32 native_w
// TODO: This only produces perfect downsampling for 2x IR, other resolutions will need more // TODO: This only produces perfect downsampling for 2x IR, other resolutions will need more
// complex down filtering to average all pixels and produce the correct result. // complex down filtering to average all pixels and produce the correct result.
// Also, box filtering won't be correct for anything other than 1x IR // Also, box filtering won't be correct for anything other than 1x IR
if (scale_by_half || g_ActiveConfig.iEFBScale != 1) if (scale_by_half || g_renderer->GetEFBScale() != 1)
D3D::SetLinearCopySampler(); D3D::SetLinearCopySampler();
else else
D3D::SetPointCopySampler(); D3D::SetPointCopySampler();

2
Source/Core/VideoBackends/OGL/TextureConverter.cpp
View file

@ -233,7 +233,7 @@ static void EncodeToRamUsingShader(GLuint srcTexture, u8* destAddr, u32 dst_line
// TODO: This only produces perfect downsampling for 2x IR, other resolutions will need more // TODO: This only produces perfect downsampling for 2x IR, other resolutions will need more
// complex down filtering to average all pixels and produce the correct result. // complex down filtering to average all pixels and produce the correct result.
// Also, box filtering won't be correct for anything other than 1x IR // Also, box filtering won't be correct for anything other than 1x IR
if (linearFilter || g_ActiveConfig.iEFBScale != 1) if (linearFilter || g_renderer->GetEFBScale() != 1)
g_sampler_cache->BindLinearSampler(9); g_sampler_cache->BindLinearSampler(9);
else else
g_sampler_cache->BindNearestSampler(9); g_sampler_cache->BindNearestSampler(9);

2
Source/Core/VideoBackends/Vulkan/TextureConverter.cpp
View file

@ -250,7 +250,7 @@ void TextureConverter::EncodeTextureToMemory(VkImageView src_texture, u8* dest_p
// We also linear filtering for both box filtering and downsampling higher resolutions to 1x // We also linear filtering for both box filtering and downsampling higher resolutions to 1x
// TODO: This only produces perfect downsampling for 2x IR, other resolutions will need more // TODO: This only produces perfect downsampling for 2x IR, other resolutions will need more
// complex down filtering to average all pixels and produce the correct result. // complex down filtering to average all pixels and produce the correct result.
bool linear_filter = (scale_by_half && !params.depth) || g_ActiveConfig.iEFBScale != 1; bool linear_filter = (scale_by_half && !params.depth) || g_renderer->GetEFBScale() != 1;
draw.SetPSSampler(0, src_texture, linear_filter ? g_object_cache->GetLinearSampler() : draw.SetPSSampler(0, src_texture, linear_filter ? g_object_cache->GetLinearSampler() :
g_object_cache->GetPointSampler()); g_object_cache->GetPointSampler());

5
Source/Core/VideoCommon/RenderBase.cpp
View file

@ -131,6 +131,11 @@ void Renderer::RenderToXFB(u32 xfbAddr, const EFBRectangle& sourceRc, u32 fbStri
} }
} }
unsigned int Renderer::GetEFBScale() const
{
return m_efb_scale;
}
int Renderer::EFBToScaledX(int x) const int Renderer::EFBToScaledX(int x) const
{ {
return x * static_cast<int>(m_efb_scale); return x * static_cast<int>(m_efb_scale);

2
Source/Core/VideoCommon/RenderBase.h
View file

@ -101,6 +101,8 @@ public:
std::tuple<TargetRectangle, TargetRectangle> std::tuple<TargetRectangle, TargetRectangle>
ConvertStereoRectangle(const TargetRectangle& rc) const; ConvertStereoRectangle(const TargetRectangle& rc) const;
unsigned int GetEFBScale() const;
// Use this to upscale native EFB coordinates to IDEAL internal resolution // Use this to upscale native EFB coordinates to IDEAL internal resolution
int EFBToScaledX(int x) const; int EFBToScaledX(int x) const;
int EFBToScaledY(int y) const; int EFBToScaledY(int y) const;

2
Source/Core/VideoCommon/VertexManagerBase.cpp
View file

@ -258,7 +258,7 @@ static void SetSamplerState(u32 index, bool custom_tex, bool has_arbitrary_mips)
// 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 = state.lod_bias =
state.lod_bias + std::log2(static_cast<float>(g_ActiveConfig.iEFBScale)) * 256.f; state.lod_bias + std::log2(static_cast<float>(g_renderer->GetEFBScale())) * 256.f;
// 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;