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

GSdx-d3d: Update nvidia hack with vendor id detection. 

Hack will no longer be active on Intel or AMD gpus.
Also remove UserHacks_disable_NV_hack. sprite hack
basically does the same thing so it's kinda useless.
This commit is contained in:
KrossX 2018-09-20 02:13:26 +02:00 committed by lightningterror
parent e063be3043
commit 560966c539
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/GSdx/GSDevice11.cpp
View File

@ -41,12 +41,13 @@ GSDevice11::GSDevice11()
m_mipmap = theApp.GetConfigI("mipmap"); m_mipmap = theApp.GetConfigI("mipmap");
if (theApp.GetConfigB("UserHacks")) { if (theApp.GetConfigB("UserHacks"))
{
UserHacks_unscale_pt_ln = theApp.GetConfigB("UserHacks_unscale_point_line"); UserHacks_unscale_pt_ln = theApp.GetConfigB("UserHacks_unscale_point_line");
UserHacks_disable_NV_hack = theApp.GetConfigB("UserHacks_DisableNVhack"); }
} else { else
{
UserHacks_unscale_pt_ln = false; UserHacks_unscale_pt_ln = false;
UserHacks_disable_NV_hack = false;
} }
} }
@ -121,10 +122,6 @@ bool GSDevice11::Create(const std::shared_ptr<GSWnd> &wnd)
scd.Windowed = TRUE; scd.Windowed = TRUE;
spritehack = theApp.GetConfigB("UserHacks") ? theApp.GetConfigI("UserHacks_SpriteHack") : 0;
isNative = theApp.GetConfigI("upscale_multiplier") == 1;
// NOTE : D3D11_CREATE_DEVICE_SINGLETHREADED // NOTE : D3D11_CREATE_DEVICE_SINGLETHREADED
// This flag is safe as long as the DXGI's internal message pump is disabled or is on the // This flag is safe as long as the DXGI's internal message pump is disabled or is on the
// same thread as the GS window (which the emulator makes sure of, if it utilizes a // same thread as the GS window (which the emulator makes sure of, if it utilizes a
@ -154,6 +151,32 @@ bool GSDevice11::Create(const std::shared_ptr<GSWnd> &wnd)
return false; return false;
} }
{ // HACK: check nVIDIA
bool nvidia_gpu = false;
IDXGIDevice *dxd;
if(SUCCEEDED(m_dev->QueryInterface(IID_PPV_ARGS(&dxd))))
{
IDXGIAdapter *dxa;
if(SUCCEEDED(dxd->GetAdapter(&dxa)))
{
DXGI_ADAPTER_DESC dxad;
if(SUCCEEDED(dxa->GetDesc(&dxad)))
nvidia_gpu = dxad.VendorId == 0x10DE;
dxa->Release();
}
dxd->Release();
}
bool native_resolution = theApp.GetConfigI("upscale_multiplier") == 1;
bool spritehack_enabled = theApp.GetConfigB("UserHacks") && theApp.GetConfigI("UserHacks_SpriteHack");
m_hack_topleft_offset = (!nvidia_gpu || native_resolution || spritehack_enabled) ? 0.0f : -0.01f;
}
D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS options; D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS options;
hr = m_dev->CheckFeatureSupport(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &options, sizeof(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS)); hr = m_dev->CheckFeatureSupport(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS, &options, sizeof(D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS));
@ -1269,8 +1292,8 @@ void GSDevice11::OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector
D3D11_VIEWPORT vp; D3D11_VIEWPORT vp;
memset(&vp, 0, sizeof(vp)); memset(&vp, 0, sizeof(vp));
vp.TopLeftX = (UserHacks_disable_NV_hack || spritehack > 0 || isNative) ? 0.0f : -0.01f; vp.TopLeftX = m_hack_topleft_offset;
vp.TopLeftY = (UserHacks_disable_NV_hack || spritehack > 0 || isNative) ? 0.0f : -0.01f; vp.TopLeftY = m_hack_topleft_offset;
vp.Width = (float)size.x; vp.Width = (float)size.x;
vp.Height = (float)size.y; vp.Height = (float)size.y;
vp.MinDepth = 0.0f; vp.MinDepth = 0.0f;

5
plugins/GSdx/GSDevice11.h
View File

@ -54,11 +54,8 @@ class GSDevice11 : public GSDeviceDX
CComPtr<ID3D11Buffer> m_ib_old; CComPtr<ID3D11Buffer> m_ib_old;
bool m_srv_changed, m_ss_changed; bool m_srv_changed, m_ss_changed;
int spritehack;
bool isNative;
bool UserHacks_unscale_pt_ln; bool UserHacks_unscale_pt_ln;
bool UserHacks_disable_NV_hack; float m_hack_topleft_offset;
int m_mipmap; int m_mipmap;

1
plugins/GSdx/GSdx.cpp
View File

@ -434,7 +434,6 @@ void GSdxApp::Init()
m_default_configuration["UserHacks_DisableDepthSupport"] = "0"; m_default_configuration["UserHacks_DisableDepthSupport"] = "0";
m_default_configuration["UserHacks_CPU_FB_Conversion"] = "0"; m_default_configuration["UserHacks_CPU_FB_Conversion"] = "0";
m_default_configuration["UserHacks_DisableGsMemClear"] = "0"; m_default_configuration["UserHacks_DisableGsMemClear"] = "0";
m_default_configuration["UserHacks_DisableNVhack"] = "0";
m_default_configuration["UserHacks_DisablePartialInvalidation"] = "0"; m_default_configuration["UserHacks_DisablePartialInvalidation"] = "0";
m_default_configuration["UserHacks_HalfPixelOffset"] = "0"; m_default_configuration["UserHacks_HalfPixelOffset"] = "0";
m_default_configuration["UserHacks_merge_pp_sprite"] = "0"; m_default_configuration["UserHacks_merge_pp_sprite"] = "0";