Skip to content

Commit

Permalink
[d3d9] Reduce size of state blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@K0bin
K0bin committed Feb 6, 2023
1 parent 2263dca commit fd58481
Show file tree
Hide file tree
Showing 6 changed files with 227 additions and 67 deletions.
20 changes: 10 additions & 10 deletions src/d3d9/d3d9_device.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5145,11 +5145,11 @@ namespace dxvk {
void D3D9DeviceEx::UploadConstants() {
if constexpr (ShaderStage == DxsoProgramTypes::VertexShader) {
if (CanSWVP())
return UploadSoftwareConstantSet(m_state.vsConsts, m_vsLayout);
return UploadSoftwareConstantSet(m_state.consts.vs, m_vsLayout);
else
return UploadConstantSet<ShaderStage, D3D9ShaderConstantsVSHardware>(m_state.vsConsts, m_vsLayout, m_state.vertexShader);
return UploadConstantSet<ShaderStage, D3D9ShaderConstantsVSHardware>(m_state.consts.vs, m_vsLayout, m_state.vertexShader);
} else {
return UploadConstantSet<ShaderStage, D3D9ShaderConstantsPS> (m_state.psConsts, m_psLayout, m_state.pixelShader);
return UploadConstantSet<ShaderStage, D3D9ShaderConstantsPS> (m_state.consts.ps, m_psLayout, m_state.pixelShader);
}
}

Expand Down Expand Up @@ -6257,7 +6257,7 @@ namespace dxvk {

if (likely(!CanSWVP())) {
UpdateVertexBoolSpec(
m_state.vsConsts.bConsts[0] &
m_state.consts.vs.bConsts[0] &
m_consts[DxsoProgramType::VertexShader].meta.boolConstantMask);
} else
UpdateVertexBoolSpec(0);
Expand Down Expand Up @@ -6285,7 +6285,7 @@ namespace dxvk {
UpdatePixelShaderSamplerSpec(m_textureTypes, programInfo.minorVersion() >= 4 ? 0u : projected, fetch4); // For implicit samplers...

UpdatePixelBoolSpec(
m_state.psConsts.bConsts[0] &
m_state.consts.ps.bConsts[0] &
m_consts[DxsoProgramType::PixelShader].meta.boolConstantMask);
}
else {
Expand Down Expand Up @@ -6526,16 +6526,16 @@ namespace dxvk {


void D3D9DeviceEx::SetVertexBoolBitfield(uint32_t idx, uint32_t mask, uint32_t bits) {
m_state.vsConsts.bConsts[idx] &= ~mask;
m_state.vsConsts.bConsts[idx] |= bits & mask;
m_state.consts.vs.bConsts[idx] &= ~mask;
m_state.consts.vs.bConsts[idx] |= bits & mask;

m_consts[DxsoProgramTypes::VertexShader].dirty = true;
}


void D3D9DeviceEx::SetPixelBoolBitfield(uint32_t idx, uint32_t mask, uint32_t bits) {
m_state.psConsts.bConsts[idx] &= ~mask;
m_state.psConsts.bConsts[idx] |= bits & mask;
m_state.consts.ps.bConsts[idx] &= ~mask;
m_state.consts.ps.bConsts[idx] |= bits & mask;

m_consts[DxsoProgramTypes::PixelShader].dirty = true;
}
Expand Down Expand Up @@ -6618,7 +6618,7 @@ namespace dxvk {
}

UpdateStateConstants<ProgramType, ConstantType, T>(
&m_state,
&m_state.consts,
StartRegister,
pConstantData,
Count,
Expand Down
8 changes: 4 additions & 4 deletions src/d3d9/d3d9_device.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,7 @@ namespace dxvk {
return &m_d3d9Options;
}

Direct3DState9* GetRawState() {
D3D9DeviceState* GetRawState() {
return &m_state;
}

Expand Down Expand Up @@ -1121,8 +1121,8 @@ namespace dxvk {
};

return ProgramType == DxsoProgramTypes::VertexShader
? GetHelper(m_state.vsConsts)
: GetHelper(m_state.psConsts);
? GetHelper(m_state.consts.vs)
: GetHelper(m_state.consts.ps);
}

void UpdateFixedFunctionVS();
Expand Down Expand Up @@ -1315,7 +1315,7 @@ namespace dxvk {
std::atomic<int64_t> m_availableMemory = { 0 };
std::atomic<int32_t> m_samplerCount = { 0 };

Direct3DState9 m_state;
D3D9DeviceState m_state;

#ifdef D3D9_ALLOW_UNMAPPING
lru_list<D3D9CommonTexture*> m_mappedTextures;
Expand Down
4 changes: 2 additions & 2 deletions src/d3d9/d3d9_state.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

namespace dxvk {

D3D9CapturableState::D3D9CapturableState() {
D3D9DeviceState::D3D9DeviceState() {
for (uint32_t i = 0; i < streamFreq.size(); i++)
streamFreq[i] = 1;

for (uint32_t i = 0; i < enabledLightIndices.size(); i++)
enabledLightIndices[i] = UINT32_MAX;
}

D3D9CapturableState::~D3D9CapturableState() {
D3D9DeviceState::~D3D9DeviceState() {
for (uint32_t i = 0; i < textures.size(); i++)
TextureChangePrivate(textures[i], nullptr);
}
Expand Down
30 changes: 15 additions & 15 deletions src/d3d9/d3d9_state.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,15 @@ namespace dxvk {
0.0f // Phi
};

struct D3D9CapturableState {
D3D9CapturableState();
struct D3D9Constants {
D3D9ShaderConstantsVSSoftware vs;
D3D9ShaderConstantsPS ps;
};

struct D3D9DeviceState {
D3D9DeviceState();

~D3D9CapturableState();
~D3D9DeviceState();

Com<D3D9VertexDecl, false> vertexDecl;
Com<D3D9IndexBuffer, false> indices;
Expand Down Expand Up @@ -215,8 +220,7 @@ namespace dxvk {
std::array<DWORD, TextureStageStateCount>,
caps::TextureStageCount> textureStages = {};

D3D9ShaderConstantsVSSoftware vsConsts;
D3D9ShaderConstantsPS psConsts;
D3D9Constants consts = {};

std::array<UINT, caps::MaxStreams> streamFreq = {};

Expand All @@ -227,6 +231,9 @@ namespace dxvk {
std::vector<std::optional<D3DLIGHT9>> lights;
std::array<DWORD, caps::MaxEnabledLights> enabledLightIndices;

std::array<Com<D3D9Surface, false>, caps::MaxSimultaneousRenderTargets> renderTargets;
Com<D3D9Surface, false> depthStencil;

bool IsLightEnabled(DWORD Index) {
const auto& indices = enabledLightIndices;
return std::find(indices.begin(), indices.end(), Index) != indices.end();
Expand All @@ -238,7 +245,7 @@ namespace dxvk {
D3D9ConstantType ConstantType,
typename T>
HRESULT UpdateStateConstants(
D3D9CapturableState* pState,
D3D9Constants* pConsts,
UINT StartRegister,
const T* pConstantData,
UINT Count,
Expand Down Expand Up @@ -279,17 +286,10 @@ namespace dxvk {
};

return ProgramType == DxsoProgramTypes::VertexShader
? UpdateHelper(pState->vsConsts)
: UpdateHelper(pState->psConsts);
? UpdateHelper(pConsts->vs)
: UpdateHelper(pConsts->ps);
}

struct Direct3DState9 : public D3D9CapturableState {

std::array<Com<D3D9Surface, false>, caps::MaxSimultaneousRenderTargets> renderTargets;
Com<D3D9Surface, false> depthStencil;

};


struct D3D9InputAssemblyState {
D3DPRIMITIVETYPE primitiveType = D3DPRIMITIVETYPE(0);
Expand Down
77 changes: 63 additions & 14 deletions src/d3d9/d3d9_stateblock.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,21 @@

namespace dxvk {

D3D9CapturedState::D3D9CapturedState() {
for (uint32_t i = 0; i < streamFreq.size(); i++)
streamFreq[i] = 1;

for (uint32_t i = 0; i < enabledLightIndices.size(); i++)
enabledLightIndices[i] = UINT32_MAX;
}

D3D9CapturedState::~D3D9CapturedState() {
if (unlikely(textures != nullptr)) {
for (uint32_t i = 0; i < textures->size(); i++)
TextureChangePrivate((*textures)[i], nullptr);
}
}

D3D9StateBlock::D3D9StateBlock(D3D9DeviceEx* pDevice, D3D9StateBlockType Type)
: D3D9StateBlockBase(pDevice)
, m_deviceState (pDevice->GetRawState()) {
Expand Down Expand Up @@ -78,7 +93,10 @@ namespace dxvk {


HRESULT D3D9StateBlock::SetRenderState(D3DRENDERSTATETYPE State, DWORD Value) {
m_state.renderStates[State] = Value;
if (unlikely(!m_state.renderStates))
m_state.renderStates = std::make_unique<D3D9CapturedState::RenderStatesArray>();

(*m_state.renderStates)[State] = Value;

m_captures.flags.set(D3D9CapturedStateFlag::RenderStates);
m_captures.renderStates.set(State, true);
Expand All @@ -90,7 +108,10 @@ namespace dxvk {
DWORD StateSampler,
D3DSAMPLERSTATETYPE Type,
DWORD Value) {
m_state.samplerStates[StateSampler][Type] = Value;
if (unlikely(!m_state.samplerStates))
m_state.samplerStates = std::make_unique<D3D9CapturedState::SamplerStatesArray>();

(*m_state.samplerStates)[StateSampler][Type] = Value;

m_captures.flags.set(D3D9CapturedStateFlag::SamplerStates);
m_captures.samplers.set(StateSampler, true);
Expand All @@ -104,10 +125,13 @@ namespace dxvk {
D3D9VertexBuffer* pStreamData,
UINT OffsetInBytes,
UINT Stride) {
m_state.vertexBuffers[StreamNumber].vertexBuffer = pStreamData;
if (unlikely(!m_state.vertexBuffers))
m_state.vertexBuffers = std::make_unique<D3D9CapturedState::VertexBuffersArray>();

m_state.vertexBuffers[StreamNumber].offset = OffsetInBytes;
m_state.vertexBuffers[StreamNumber].stride = Stride;
D3D9VBO& vbo = (*m_state.vertexBuffers)[StreamNumber];
vbo.vertexBuffer = pStreamData;
vbo.offset = OffsetInBytes;
vbo.stride = Stride;

m_captures.flags.set(D3D9CapturedStateFlag::VertexBuffers);
m_captures.vertexBuffers.set(StreamNumber, true);
Expand All @@ -125,7 +149,10 @@ namespace dxvk {


HRESULT D3D9StateBlock::SetStateTexture(DWORD StateSampler, IDirect3DBaseTexture9* pTexture) {
TextureChangePrivate(m_state.textures[StateSampler], pTexture);
if (unlikely(!m_state.textures))
m_state.textures = std::make_unique<D3D9CapturedState::TexturesArray>();

TextureChangePrivate((*m_state.textures)[StateSampler], pTexture);

m_captures.flags.set(D3D9CapturedStateFlag::Textures);
m_captures.textures.set(StateSampler, true);
Expand All @@ -150,7 +177,10 @@ namespace dxvk {


HRESULT D3D9StateBlock::SetMaterial(const D3DMATERIAL9* pMaterial) {
m_state.material = *pMaterial;
if (!m_state.material)
m_state.material = std::make_unique<D3DMATERIAL9>();

*m_state.material = *pMaterial;

m_captures.flags.set(D3D9CapturedStateFlag::Material);
return D3D_OK;
Expand Down Expand Up @@ -198,7 +228,10 @@ namespace dxvk {


HRESULT D3D9StateBlock::SetStateTransform(uint32_t idx, const D3DMATRIX* pMatrix) {
m_state.transforms[idx] = ConvertMatrix(pMatrix);
if (unlikely(!m_state.transforms))
m_state.transforms = std::make_unique<D3D9CapturedState::TransformsArray>();

(*m_state.transforms)[idx] = ConvertMatrix(pMatrix);

m_captures.flags.set(D3D9CapturedStateFlag::Transforms);
m_captures.transforms.set(idx, true);
Expand All @@ -210,7 +243,10 @@ namespace dxvk {
DWORD Stage,
D3D9TextureStageStateTypes Type,
DWORD Value) {
m_state.textureStages[Stage][Type] = Value;
if (unlikely(!m_state.textureStages))
m_state.textureStages = std::make_unique<D3D9CapturedState::TextureStagesArray>();

(*m_state.textureStages)[Stage][Type] = Value;

m_captures.flags.set(D3D9CapturedStateFlag::TextureStages);
m_captures.textureStages.set(Stage, true);
Expand All @@ -220,7 +256,11 @@ namespace dxvk {


HRESULT D3D9StateBlock::MultiplyStateTransform(uint32_t idx, const D3DMATRIX* pMatrix) {
m_state.transforms[idx] = m_state.transforms[idx] * ConvertMatrix(pMatrix);
if (unlikely(!m_state.textureStages))
m_state.textureStages = std::make_unique<D3D9CapturedState::TextureStagesArray>();

Matrix4& transform = (*m_state.transforms)[idx];
transform = transform * ConvertMatrix(pMatrix);

m_captures.flags.set(D3D9CapturedStateFlag::Transforms);
m_captures.transforms.set(idx, true);
Expand Down Expand Up @@ -323,6 +363,9 @@ namespace dxvk {
UINT StartRegister,
const BOOL* pConstantData,
UINT BoolCount) {
if (unlikely(!m_state.consts))
m_state.consts = std::make_unique<D3D9Constants>();

return SetShaderConstants<
DxsoProgramTypes::PixelShader,
D3D9ConstantType::Bool>(
Expand All @@ -333,15 +376,21 @@ namespace dxvk {


HRESULT D3D9StateBlock::SetVertexBoolBitfield(uint32_t idx, uint32_t mask, uint32_t bits) {
m_state.vsConsts.bConsts[idx] &= ~mask;
m_state.vsConsts.bConsts[idx] |= bits & mask;
if (unlikely(!m_state.consts))
m_state.consts = std::make_unique<D3D9Constants>();

m_state.consts->vs.bConsts[idx] &= ~mask;
m_state.consts->vs.bConsts[idx] |= bits & mask;
return D3D_OK;
}


HRESULT D3D9StateBlock::SetPixelBoolBitfield(uint32_t idx, uint32_t mask, uint32_t bits) {
m_state.psConsts.bConsts[idx] &= ~mask;
m_state.psConsts.bConsts[idx] |= bits & mask;
if (unlikely(!m_state.consts))
m_state.consts = std::make_unique<D3D9Constants>();

m_state.consts->ps.bConsts[idx] &= ~mask;
m_state.consts->ps.bConsts[idx] |= bits & mask;
return D3D_OK;
}

Expand Down
Loading

0 comments on commit fd58481

Please sign in to comment.