rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-04-12 03:02:33 +02:00
Code Issues Projects Releases Wiki Activity

[d3d9] Move remaining texture bitmask updates to function

Browse Source
This commit is contained in:
Robin Kertels 2024-11-02 00:56:06 +01:00
parent 8d10bfecd4
commit 19fea8c48d
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/d3d9/d3d9_device.cpp
View File

@ -4232,33 +4232,7 @@ namespace dxvk {
DWORD combinedUsage = oldUsage | newUsage; DWORD combinedUsage = oldUsage | newUsage;
TextureChangePrivate(m_state.textures[StateSampler], pTexture); TextureChangePrivate(m_state.textures[StateSampler], pTexture);
m_dirtyTextures |= 1u << StateSampler; m_dirtyTextures |= 1u << StateSampler;
UpdateActiveTextures(StateSampler, combinedUsage); UpdateTextureBitmasks(StateSampler, combinedUsage);
if (newTexture != nullptr) {
const bool oldDepth = m_depthTextures & (1u << StateSampler);
const bool newDepth = newTexture->IsShadow();
if (oldDepth != newDepth) {
m_depthTextures ^= 1u << StateSampler;
m_dirtySamplerStates |= 1u << StateSampler;
}
m_drefClamp &= ~(1u << StateSampler);
m_drefClamp |= uint32_t(newTexture->IsUpgradedToD32f()) << StateSampler;
const bool oldCube = m_cubeTextures & (1u << StateSampler);
const bool newCube = newTexture->GetType() == D3DRTYPE_CUBETEXTURE;
if (oldCube != newCube) {
m_cubeTextures ^= 1u << StateSampler;
m_dirtySamplerStates |= 1u << StateSampler;
}
if (unlikely(m_fetch4Enabled & (1u << StateSampler)))
UpdateActiveFetch4(StateSampler);
} else {
if (unlikely(m_fetch4 & (1u << StateSampler)))
UpdateActiveFetch4(StateSampler);
}
return D3D_OK; return D3D_OK;
} }
@ -5950,7 +5924,7 @@ namespace dxvk {
} }
inline void D3D9DeviceEx::UpdateActiveTextures(uint32_t index, DWORD combinedUsage) { inline void D3D9DeviceEx::UpdateTextureBitmasks(uint32_t index, DWORD combinedUsage) {
const uint32_t bit = 1 << index; const uint32_t bit = 1 << index;
m_activeTextureRTs &= ~bit; m_activeTextureRTs &= ~bit;
@ -5974,6 +5948,33 @@ namespace dxvk {
if (unlikely(tex->NeedsMipGen())) if (unlikely(tex->NeedsMipGen()))
m_activeTexturesToGen |= bit; m_activeTexturesToGen |= bit;
// Update shadow sampler mask
const bool oldDepth = m_depthTextures & bit;
const bool newDepth = tex->IsShadow();
if (oldDepth != newDepth) {
m_depthTextures ^= bit;
m_dirtySamplerStates |= bit;
}
// Update dref clamp mask
m_drefClamp &= ~bit;
m_drefClamp |= uint32_t(tex->IsUpgradedToD32f()) << index;
// Update non-seamless cubemap mask
const bool oldCube = m_cubeTextures & bit;
const bool newCube = tex->GetType() == D3DRTYPE_CUBETEXTURE;
if (oldCube != newCube) {
m_cubeTextures ^= bit;
m_dirtySamplerStates |= bit;
}
if (unlikely(m_fetch4Enabled & bit))
UpdateActiveFetch4(index);
} else {
if (unlikely(m_fetch4 & bit))
UpdateActiveFetch4(index);
} }
if (unlikely(combinedUsage & D3DUSAGE_RENDERTARGET)) if (unlikely(combinedUsage & D3DUSAGE_RENDERTARGET))

2
src/d3d9/d3d9_device.h
View File

@ -794,7 +794,7 @@ namespace dxvk {
template <uint32_t Index> template <uint32_t Index>
void UpdateAnyColorWrites(); void UpdateAnyColorWrites();
void UpdateActiveTextures(uint32_t index, DWORD combinedUsage); void UpdateTextureBitmasks(uint32_t index, DWORD combinedUsage);
void UpdateActiveHazardsRT(uint32_t rtMask); void UpdateActiveHazardsRT(uint32_t rtMask);