rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-03-01 10:54:14 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Simplify SetViewport

Browse Source 
pViewport == nullptr is illegal
This commit is contained in:
Joshua Ashton 2019-12-18 22:50:54 +00:00
parent bab56433cb
commit 5cc0fd5c25
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/d3d9/d3d9_device.cpp
View File

@ -1460,27 +1460,16 @@ namespace dxvk {
HRESULT STDMETHODCALLTYPE D3D9DeviceEx::SetViewport(const D3DVIEWPORT9* pViewport) { HRESULT STDMETHODCALLTYPE D3D9DeviceEx::SetViewport(const D3DVIEWPORT9* pViewport) {
D3D9DeviceLock lock = LockDevice(); D3D9DeviceLock lock = LockDevice();
D3DVIEWPORT9 viewport; if (unlikely(pViewport == nullptr))
if (pViewport == nullptr) { return D3DERR_INVALIDCALL;
auto rtv = m_state.renderTargets[0]->GetRenderTargetView(false);
viewport.X = 0;
viewport.Y = 0;
viewport.Width = rtv->image()->info().extent.width;
viewport.Height = rtv->image()->info().extent.height;
viewport.MinZ = 0.0f;
viewport.MaxZ = 1.0f;
}
else
viewport = *pViewport;
if (unlikely(ShouldRecord())) if (unlikely(ShouldRecord()))
return m_recorder->SetViewport(&viewport); return m_recorder->SetViewport(pViewport);
if (m_state.viewport == viewport) if (m_state.viewport == *pViewport)
return D3D_OK; return D3D_OK;
m_state.viewport = viewport; m_state.viewport = *pViewport;
m_flags.set(D3D9DeviceFlag::DirtyViewportScissor); m_flags.set(D3D9DeviceFlag::DirtyViewportScissor);
m_flags.set(D3D9DeviceFlag::DirtyFFViewport); m_flags.set(D3D9DeviceFlag::DirtyFFViewport);