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

[d3d9] Rename some members to be clearer

Browse Source
This commit is contained in:
Joshua Ashton 2023-06-24 04:09:04 +01:00
parent 00ae118655
commit 3b3ebc9350
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/d3d9/d3d9_device.cpp
View File

@ -178,7 +178,7 @@ namespace dxvk {
// Bitfields can't be initialized in header. // Bitfields can't be initialized in header.
m_boundRTs = 0; m_boundRTs = 0;
m_anyColorWrites = 0; m_anyColorWrites = 0;
m_activeRTs = 0; m_activeRTsWhichAreTextures = 0;
m_alphaSwizzleRTs = 0; m_alphaSwizzleRTs = 0;
m_lastHazardsRT = 0; m_lastHazardsRT = 0;
} }
@ -5493,12 +5493,12 @@ namespace dxvk {
inline void D3D9DeviceEx::UpdateActiveRTs(uint32_t index) { inline void D3D9DeviceEx::UpdateActiveRTs(uint32_t index) {
const uint32_t bit = 1 << index; const uint32_t bit = 1 << index;
m_activeRTs &= ~bit; m_activeRTsWhichAreTextures &= ~bit;
if ((m_boundRTs & bit) != 0 && if ((m_boundRTs & bit) != 0 &&
m_state.renderTargets[index]->GetBaseTexture() != nullptr && m_state.renderTargets[index]->GetBaseTexture() != nullptr &&
m_anyColorWrites & bit) m_anyColorWrites & bit)
m_activeRTs |= bit; m_activeRTsWhichAreTextures |= bit;
UpdateActiveHazardsRT(bit); UpdateActiveHazardsRT(bit);
} }
@ -5523,8 +5523,8 @@ namespace dxvk {
inline void D3D9DeviceEx::UpdateActiveTextures(uint32_t index, DWORD combinedUsage) { inline void D3D9DeviceEx::UpdateActiveTextures(uint32_t index, DWORD combinedUsage) {
const uint32_t bit = 1 << index; const uint32_t bit = 1 << index;
m_activeRTTextures &= ~bit; m_activeTextureRTs &= ~bit;
m_activeDSTextures &= ~bit; m_activeTextureDSs &= ~bit;
m_activeTextures &= ~bit; m_activeTextures &= ~bit;
m_activeTexturesToUpload &= ~bit; m_activeTexturesToUpload &= ~bit;
m_activeTexturesToGen &= ~bit; m_activeTexturesToGen &= ~bit;
@ -5534,10 +5534,10 @@ namespace dxvk {
m_activeTextures |= bit; m_activeTextures |= bit;
if (unlikely(tex->IsRenderTarget())) if (unlikely(tex->IsRenderTarget()))
m_activeRTTextures |= bit; m_activeTextureRTs |= bit;
if (unlikely(tex->IsDepthStencil())) if (unlikely(tex->IsDepthStencil()))
m_activeDSTextures |= bit; m_activeTextureDSs |= bit;
if (unlikely(tex->NeedsAnyUpload())) if (unlikely(tex->NeedsAnyUpload()))
m_activeTexturesToUpload |= bit; m_activeTexturesToUpload |= bit;
@ -5556,8 +5556,8 @@ namespace dxvk {
inline void D3D9DeviceEx::UpdateActiveHazardsRT(uint32_t texMask) { inline void D3D9DeviceEx::UpdateActiveHazardsRT(uint32_t texMask) {
auto masks = m_psShaderMasks; auto masks = m_psShaderMasks;
masks.rtMask &= m_activeRTs; masks.rtMask &= m_activeRTsWhichAreTextures;
masks.samplerMask &= m_activeRTTextures & texMask; masks.samplerMask &= m_activeTextureRTs & texMask;
m_activeHazardsRT = m_activeHazardsRT & (~texMask); m_activeHazardsRT = m_activeHazardsRT & (~texMask);
for (uint32_t rtIdx : bit::BitMask(masks.rtMask)) { for (uint32_t rtIdx : bit::BitMask(masks.rtMask)) {
@ -5583,7 +5583,7 @@ namespace dxvk {
inline void D3D9DeviceEx::UpdateActiveHazardsDS(uint32_t texMask) { inline void D3D9DeviceEx::UpdateActiveHazardsDS(uint32_t texMask) {
auto masks = m_psShaderMasks; auto masks = m_psShaderMasks;
masks.samplerMask &= m_activeDSTextures & texMask; masks.samplerMask &= m_activeTextureDSs & texMask;
m_activeHazardsDS = m_activeHazardsDS & (~texMask); m_activeHazardsDS = m_activeHazardsDS & (~texMask);
if (m_state.depthStencil != nullptr && if (m_state.depthStencil != nullptr &&

6
src/d3d9/d3d9_device.h
View File

@ -1280,12 +1280,12 @@ namespace dxvk {
uint32_t m_boundRTs : 4; uint32_t m_boundRTs : 4;
uint32_t m_anyColorWrites : 4; uint32_t m_anyColorWrites : 4;
uint32_t m_activeRTs : 4; uint32_t m_activeRTsWhichAreTextures : 4;
uint32_t m_alphaSwizzleRTs : 4; uint32_t m_alphaSwizzleRTs : 4;
uint32_t m_lastHazardsRT : 4; uint32_t m_lastHazardsRT : 4;
uint32_t m_activeRTTextures = 0; uint32_t m_activeTextureRTs = 0;
uint32_t m_activeDSTextures = 0; uint32_t m_activeTextureDSs = 0;
uint32_t m_activeHazardsRT = 0; uint32_t m_activeHazardsRT = 0;
uint32_t m_activeHazardsDS = 0; uint32_t m_activeHazardsDS = 0;
uint32_t m_activeTextures = 0; uint32_t m_activeTextures = 0;