piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

roll back r7431

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7432 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
smelenchuk
2011-04-01 01:46:18 +00:00
parent 15c51c37f3
commit 7a9a47376f
7 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
View File

@ -1346,10 +1346,6 @@ void Renderer::SetSamplerState(int stage, int texindex)
{
gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
}
else if (g_ActiveConfig.bForceNoFiltering)
{
gx_state.sampdc[stage].Filter = D3D11_FILTER_MIN_MAG_MIP_POINT;
}
else if (tm0.min_filter & 4) // linear min filter
{
if (tm0.mag_filter) // linear mag filter
@ -1394,4 +1390,4 @@ void Renderer::SetInterlacingMode()
// TODO
}
} // namespace DX11
} // namespace DX11

4
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -1381,10 +1381,6 @@ void Renderer::SetSamplerState(int stage, int texindex)
{
min = mag = mip = D3DTEXF_LINEAR;
}
else if (g_ActiveConfig.bForceNoFiltering)
{
min = mag = mip = D3DTEXF_POINT;
}
else
{
min = (tm0.min_filter & 4) ? D3DTEXF_LINEAR : D3DTEXF_POINT;

6
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
View File

@ -348,15 +348,13 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co
//mode1 = newmode1;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER,
((newmode.mag_filter && !g_Config.bForceNoFiltering) || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST);
(newmode.mag_filter || g_Config.bForceFiltering) ? GL_LINEAR : GL_NEAREST);
if (bHaveMipMaps)
{
// TODO: not used anywhere
if (g_ActiveConfig.bForceFiltering && newmode.min_filter < 4)
mode.min_filter += 4; // take equivalent forced linear
else if (g_ActiveConfig.bForceNoFiltering && newmode.min_filter >= 4)
mode.min_filter -= 4;
int filt = newmode.min_filter;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, c_MinLinearFilter[filt & 7]);
@ -366,7 +364,7 @@ void TextureCache::TCacheEntry::SetTextureParameters(const TexMode0 &newmode, co
}
else
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
(g_ActiveConfig.bForceFiltering || (newmode.min_filter >= 4 && !g_ActiveConfig.bForceNoFiltering)) ? GL_LINEAR : GL_NEAREST);
(g_ActiveConfig.bForceFiltering || newmode.min_filter >= 4) ? GL_LINEAR : GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, c_WrapSettings[newmode.wrap_s]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, c_WrapSettings[newmode.wrap_t]);