rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2024-12-02 01:24:11 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Still rebind viewport/scissor when setting the same RT

Browse Source 
Closes #1290
This commit is contained in:
Joshua Ashton 2019-12-18 22:47:07 +00:00
parent 7b0723520a
commit 9ec0541b93
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/d3d9/d3d9_device.cpp
View File

@ -1126,10 +1126,41 @@ namespace dxvk {
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
D3D9Surface* rt = static_cast<D3D9Surface*>(pRenderTarget); D3D9Surface* rt = static_cast<D3D9Surface*>(pRenderTarget);
const auto* desc = rt != nullptr
? rt->GetCommonTexture()->Desc()
: nullptr;
if (unlikely(rt && !(rt->GetCommonTexture()->Desc()->Usage & D3DUSAGE_RENDERTARGET))) if (unlikely(desc && !(desc->Usage & D3DUSAGE_RENDERTARGET)))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (RenderTargetIndex == 0) {
D3DVIEWPORT9 viewport;
viewport.X = 0;
viewport.Y = 0;
viewport.Width = desc->Width;
viewport.Height = desc->Height;
viewport.MinZ = 0.0f;
viewport.MaxZ = 1.0f;
RECT scissorRect;
scissorRect.left = 0;
scissorRect.top = 0;
scissorRect.right = desc->Width;
scissorRect.bottom = desc->Height;
if (m_state.viewport != viewport) {
m_flags.set(D3D9DeviceFlag::DirtyFFViewport);
m_flags.set(D3D9DeviceFlag::DirtyPointScale);
m_flags.set(D3D9DeviceFlag::DirtyViewportScissor);
m_state.viewport = viewport;
}
if (m_state.scissorRect != scissorRect) {
m_flags.set(D3D9DeviceFlag::DirtyViewportScissor);
m_state.scissorRect = scissorRect;
}
}
if (m_state.renderTargets[RenderTargetIndex] == rt) if (m_state.renderTargets[RenderTargetIndex] == rt)
return D3D_OK; return D3D_OK;
@ -1152,8 +1183,6 @@ namespace dxvk {
m_flags.set(D3D9DeviceFlag::DirtyBlendState); m_flags.set(D3D9DeviceFlag::DirtyBlendState);
if (RenderTargetIndex == 0) { if (RenderTargetIndex == 0) {
const auto* desc = m_state.renderTargets[0]->GetCommonTexture()->Desc();
bool validSampleMask = desc->MultiSample > D3DMULTISAMPLE_NONMASKABLE; bool validSampleMask = desc->MultiSample > D3DMULTISAMPLE_NONMASKABLE;
if (validSampleMask != m_flags.test(D3D9DeviceFlag::ValidSampleMask)) { if (validSampleMask != m_flags.test(D3D9DeviceFlag::ValidSampleMask)) {
@ -1163,26 +1192,6 @@ namespace dxvk {
m_flags.set(D3D9DeviceFlag::DirtyMultiSampleState); m_flags.set(D3D9DeviceFlag::DirtyMultiSampleState);
} }
D3DVIEWPORT9 viewport;
viewport.X = 0;
viewport.Y = 0;
viewport.Width = desc->Width;
viewport.Height = desc->Height;
viewport.MinZ = 0.0f;
viewport.MaxZ = 1.0f;
m_state.viewport = viewport;
RECT scissorRect;
scissorRect.left = 0;
scissorRect.top = 0;
scissorRect.right = desc->Width;
scissorRect.bottom = desc->Height;
m_state.scissorRect = scissorRect;
m_flags.set(D3D9DeviceFlag::DirtyViewportScissor);
m_flags.set(D3D9DeviceFlag::DirtyFFViewport);
m_flags.set(D3D9DeviceFlag::DirtyPointScale);
} }
return D3D_OK; return D3D_OK;