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

[d3d11] Lazy-bind samplers

Browse Source
This commit is contained in:
Philip Rebohle 2025-02-19 02:36:45 +01:00 committed by Philip Rebohle
parent f2ab76c8db
commit b0d881046f
2 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/d3d11/d3d11_context.cpp
View File

@ -3206,6 +3206,24 @@ namespace dxvk {
}
template<typename ContextType>
void D3D11CommonContext<ContextType>::ApplyDirtySamplers(
DxbcProgramType Stage,
const DxbcBindingMask& BoundMask,
DxbcBindingMask& DirtyMask) {
uint32_t bindMask = BoundMask.samplerMask & DirtyMask.samplerMask;
if (!bindMask)
return;
const auto& state = m_state.samplers[Stage];
DirtyMask.samplerMask -= bindMask;
for (uint32_t slot : bit::BitMask(bindMask))
BindSampler(Stage, slot, state.samplers[slot]);
}
template<typename ContextType>
void D3D11CommonContext<ContextType>::ApplyDirtyShaderResources(
DxbcProgramType Stage,
@ -3239,6 +3257,7 @@ namespace dxvk {
auto& boundMask = m_state.lazy.bindingsUsed[stage];
auto& dirtyMask = m_state.lazy.bindingsDirty[stage];
ApplyDirtySamplers(stage, boundMask, dirtyMask);
ApplyDirtyConstantBuffers(stage, boundMask, dirtyMask);
ApplyDirtyShaderResources(stage, boundMask, dirtyMask);
@ -3254,6 +3273,7 @@ namespace dxvk {
auto& boundMask = m_state.lazy.bindingsUsed[stage];
auto& dirtyMask = m_state.lazy.bindingsDirty[stage];
ApplyDirtySamplers(stage, boundMask, dirtyMask);
ApplyDirtyConstantBuffers(stage, boundMask, dirtyMask);
ApplyDirtyShaderResources(stage, boundMask, dirtyMask);
@ -3838,25 +3858,27 @@ namespace dxvk {
template<typename ContextType>
template<DxbcProgramType ShaderStage>
void D3D11CommonContext<ContextType>::BindSampler(
DxbcProgramType ShaderStage,
UINT Slot,
D3D11SamplerState* pSampler) {
uint32_t slotId = computeSamplerBinding(ShaderStage, Slot);
if (pSampler) {
EmitCs([
cSlotId = Slot,
cSlotId = slotId,
cStage = GetShaderStage(ShaderStage),
cSampler = pSampler->GetDXVKSampler()
] (DxvkContext* ctx) mutable {
VkShaderStageFlagBits stage = GetShaderStage(ShaderStage);
ctx->bindResourceSampler(stage, cSlotId,
ctx->bindResourceSampler(cStage, cSlotId,
Forwarder::move(cSampler));
});
} else {
EmitCs([
cSlotId = Slot
cSlotId = slotId,
cStage = GetShaderStage(ShaderStage)
] (DxvkContext* ctx) {
VkShaderStageFlagBits stage = GetShaderStage(ShaderStage);
ctx->bindResourceSampler(stage, cSlotId, nullptr);
ctx->bindResourceSampler(cStage, cSlotId, nullptr);
});
}
}
@ -4388,6 +4410,18 @@ namespace dxvk {
}
template<typename ContextType>
bool D3D11CommonContext<ContextType>::DirtySampler(
DxbcProgramType ShaderStage,
uint32_t Slot,
bool IsNull) {
return DirtyBindingGeneric(ShaderStage,
m_state.lazy.bindingsUsed[ShaderStage].samplerMask,
m_state.lazy.bindingsDirty[ShaderStage].samplerMask,
1u << Slot, IsNull);
}
template<typename ContextType>
bool D3D11CommonContext<ContextType>::DirtyShaderResource(
DxbcProgramType ShaderStage,
@ -4908,10 +4942,8 @@ namespace dxvk {
template<DxbcProgramType Stage>
void D3D11CommonContext<ContextType>::RestoreSamplers() {
const auto& bindings = m_state.samplers[Stage];
uint32_t slotId = computeSamplerBinding(Stage, 0);
for (uint32_t i = 0; i < bindings.maxCount; i++)
BindSampler<Stage>(slotId + i, bindings.samplers[i]);
BindSampler(Stage, i, bindings.samplers[i]);
}
@ -5088,14 +5120,15 @@ namespace dxvk {
UINT NumSamplers,
ID3D11SamplerState* const* ppSamplers) {
auto& bindings = m_state.samplers[ShaderStage];
uint32_t slotId = computeSamplerBinding(ShaderStage, StartSlot);
for (uint32_t i = 0; i < NumSamplers; i++) {
auto sampler = static_cast<D3D11SamplerState*>(ppSamplers[i]);
if (bindings.samplers[StartSlot + i] != sampler) {
bindings.samplers[StartSlot + i] = sampler;
BindSampler<ShaderStage>(slotId + i, sampler);
if (!DirtySampler(ShaderStage, StartSlot + i, !sampler))
BindSampler(ShaderStage, StartSlot + i, sampler);
}
}

12
src/d3d11/d3d11_context.h
View File

@ -804,6 +804,11 @@ namespace dxvk {
const DxbcBindingMask& BoundMask,
DxbcBindingMask& DirtyMask);
void ApplyDirtySamplers(
DxbcProgramType Stage,
const DxbcBindingMask& BoundMask,
DxbcBindingMask& DirtyMask);
void ApplyDirtyShaderResources(
DxbcProgramType Stage,
const DxbcBindingMask& BoundMask,
@ -881,8 +886,8 @@ namespace dxvk {
UINT Offset,
UINT Length);
template<DxbcProgramType ShaderStage>
void BindSampler(
DxbcProgramType ShaderStage,
UINT Slot,
D3D11SamplerState* pSampler);
@ -938,6 +943,11 @@ namespace dxvk {
uint32_t Slot,
bool IsNull);
bool DirtySampler(
DxbcProgramType ShaderStage,
uint32_t Slot,
bool IsNull);
bool DirtyShaderResource(
DxbcProgramType ShaderStage,
uint32_t Slot,