mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[d3d9] Add spec constant for null samplers 

And rework the way spec constants are updated.
This commit is contained in:
Philip Rebohle 2022-06-30 22:33:06 +02:00
parent 186dc29384
commit 735e741681
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
3 changed files with 37 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/d3d9/d3d9_device.cpp
View File

@ -6182,17 +6182,6 @@ namespace dxvk {
if (m_flags.test(D3D9DeviceFlag::DirtyInputLayout))
BindInputLayout();
auto UpdateSamplerTypes = [&](uint32_t types, uint32_t projections, uint32_t fetch4) {
if (m_lastSamplerTypes != types)
UpdateSamplerSpecConsant(types);
if (m_lastProjectionBitfield != projections)
UpdateProjectionSpecConstant(projections);
if (m_lastFetch4 != fetch4)
UpdateFetch4SpecConstant(fetch4);
};
if (likely(UseProgrammablePS())) {
UploadConstants<DxsoProgramTypes::PixelShader>();
@ -6203,9 +6192,9 @@ namespace dxvk {
const auto& programInfo = GetCommonShader(m_state.pixelShader)->GetInfo();
if (programInfo.majorVersion() >= 2)
UpdateSamplerTypes(m_d3d9Options.forceSamplerTypeSpecConstants ? m_textureTypes : 0u, 0u, fetch4);
UpdatePsSamplerSpecConstants(m_d3d9Options.forceSamplerTypeSpecConstants ? m_textureTypes : 0u, 0u, fetch4);
else
UpdateSamplerTypes(m_textureTypes, programInfo.minorVersion() >= 4 ? 0u : projected, fetch4); // For implicit samplers...
UpdatePsSamplerSpecConstants(m_textureTypes, programInfo.minorVersion() >= 4 ? 0u : projected, fetch4); // For implicit samplers...
UpdateBoolSpecConstantPixel(
m_state.psConsts.bConsts[0] &
@ -6213,14 +6202,14 @@ namespace dxvk {
}
else {
UpdateBoolSpecConstantPixel(0);
UpdateSamplerTypes(0u, 0u, 0u);
UpdatePsSamplerSpecConstants(0u, 0u, 0u);
UpdateFixedFunctionPS();
}
const uint32_t nullTextureMask = usedSamplerMask & ~usedTextureMask;
const uint32_t depthTextureMask = m_depthTextures & usedTextureMask;
if (depthTextureMask != m_lastSamplerDepthMode)
UpdateSamplerDepthModeSpecConstant(depthTextureMask);
UpdateCommonSamplerSpecConstants(nullTextureMask, depthTextureMask);
if (m_flags.test(D3D9DeviceFlag::DirtySharedPixelShaderData)) {
m_flags.clr(D3D9DeviceFlag::DirtySharedPixelShaderData);
@ -6904,39 +6893,38 @@ namespace dxvk {
}
void D3D9DeviceEx::UpdateSamplerSpecConsant(uint32_t value) {
EmitCs([cBitfield = value](DxvkContext* ctx) {
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::SamplerType, cBitfield);
});
void D3D9DeviceEx::UpdatePsSamplerSpecConstants(uint32_t types, uint32_t projections, uint32_t fetch4) {
if (m_lastSamplerTypes != types || m_lastProjectionBitfield != projections || m_lastFetch4 != fetch4) {
m_lastSamplerTypes = types;
m_lastProjectionBitfield = projections;
m_lastFetch4 = fetch4;
m_lastSamplerTypes = value;
}
void D3D9DeviceEx::UpdateProjectionSpecConstant(uint32_t value) {
EmitCs([cBitfield = value](DxvkContext* ctx) {
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::ProjectionType, cBitfield);
});
m_lastProjectionBitfield = value;
}
void D3D9DeviceEx::UpdateFetch4SpecConstant(uint32_t value) {
EmitCs([cBitfield = value](DxvkContext* ctx) {
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::Fetch4, cBitfield);
EmitCs([
cSamplerType = types,
cProjectionType = projections,
cFetch4 = fetch4
] (DxvkContext* ctx) {
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::SamplerType, cSamplerType);
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::ProjectionType, cProjectionType);
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::Fetch4, cFetch4);
});
m_lastFetch4 = value;
}
}
void D3D9DeviceEx::UpdateSamplerDepthModeSpecConstant(uint32_t value) {
EmitCs([cBitfield = value](DxvkContext* ctx) {
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::SamplerDepthMode, cBitfield);
});
void D3D9DeviceEx::UpdateCommonSamplerSpecConstants(uint32_t nullMask, uint32_t depthMask) {
if (m_lastSamplerNull != nullMask || m_lastSamplerDepthMode != depthMask) {
m_lastSamplerNull = nullMask;
m_lastSamplerDepthMode = depthMask;
m_lastSamplerDepthMode = value;
EmitCs([
cNullMask = nullMask,
cDepthMask = depthMask
] (DxvkContext* ctx) {
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::SamplerNull, cNullMask);
ctx->setSpecConstant(VK_PIPELINE_BIND_POINT_GRAPHICS, D3D9SpecConstantId::SamplerDepthMode, cDepthMask);
});
}
}
@ -7304,10 +7292,10 @@ namespace dxvk {
// We should do this...
m_flags.set(D3D9DeviceFlag::DirtyInputLayout);
UpdateSamplerSpecConsant(0u);
UpdatePsSamplerSpecConstants(0u, 0u, 0u);
UpdateBoolSpecConstantVertex(0u);
UpdateBoolSpecConstantPixel(0u);
UpdateSamplerDepthModeSpecConstant(0u);
UpdateCommonSamplerSpecConstants(0u, 0u);
return D3D_OK;
}

9
src/d3d9/d3d9_device.h
View File

@ -1126,13 +1126,9 @@ namespace dxvk {
void UpdateBoolSpecConstantPixel(uint32_t value);
void UpdateSamplerSpecConsant(uint32_t value);
void UpdatePsSamplerSpecConstants(uint32_t types, uint32_t projections, uint32_t fetch4);
void UpdateProjectionSpecConstant(uint32_t value);
void UpdateFetch4SpecConstant(uint32_t value);
void UpdateSamplerDepthModeSpecConstant(uint32_t value);
void UpdateCommonSamplerSpecConstants(uint32_t boundMask, uint32_t depthMask);
void TrackBufferMappingBufferSequenceNumber(
D3D9CommonBuffer* pResource);
@ -1228,6 +1224,7 @@ namespace dxvk {
uint32_t m_lastBoolSpecConstantPixel = 0;
uint32_t m_lastSamplerDepthMode = 0;
uint32_t m_lastProjectionBitfield = 0;
uint32_t m_lastSamplerNull = 0;
uint32_t m_lastSamplerTypes = 0;
uint32_t m_lastPointMode = 0;
uint32_t m_lastFetch4 = 0;

1
src/d3d9/d3d9_spec_constants.h
View File

@ -19,6 +19,7 @@ namespace dxvk {
Fetch4 = 9,
SamplerDepthMode = 10,
SamplerNull = 11,
};
}