backup/OpenDX
1
0
Fork 0
mirror of https://github.com/EduApps-CDG/OpenDX synced 2024-12-30 09:45:37 +01:00
Code Issues Projects Releases Activity

[d3d9] Scale depth bias value based on current format's r value

Browse Source
This commit is contained in:
Joshua Ashton 2020-01-07 23:34:35 +00:00
parent 2d7f4b1a2c
commit b738c4220b
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/d3d9/d3d9_device.cpp
View File

@ -1231,6 +1231,14 @@ namespace dxvk {
FlushImplicit(FALSE); FlushImplicit(FALSE);
m_flags.set(D3D9DeviceFlag::DirtyFramebuffer); m_flags.set(D3D9DeviceFlag::DirtyFramebuffer);
if (ds != nullptr) {
float rValue = GetDepthBufferRValue(ds->GetCommonTexture()->GetFormatMapping().FormatColor);
if (m_depthBiasScale != rValue) {
m_depthBiasScale = rValue;
m_flags.set(D3D9DeviceFlag::DirtyDepthBias);
}
}
m_state.depthStencil = ds; m_state.depthStencil = ds;
return D3D_OK; return D3D_OK;
@ -5096,12 +5104,9 @@ namespace dxvk {
void D3D9DeviceEx::BindDepthBias() { void D3D9DeviceEx::BindDepthBias() {
m_flags.clr(D3D9DeviceFlag::DirtyDepthBias); m_flags.clr(D3D9DeviceFlag::DirtyDepthBias);
// TODO: Can we get a specific non-magic number in Vulkan for this based on device/adapter?
constexpr float DepthBiasFactor = float(1 << 23);
auto& rs = m_state.renderStates; auto& rs = m_state.renderStates;
float depthBias = bit::cast<float>(rs[D3DRS_DEPTHBIAS]) * DepthBiasFactor; float depthBias = bit::cast<float>(rs[D3DRS_DEPTHBIAS]) * m_depthBiasScale;
float slopeScaledDepthBias = bit::cast<float>(rs[D3DRS_SLOPESCALEDEPTHBIAS]); float slopeScaledDepthBias = bit::cast<float>(rs[D3DRS_SLOPESCALEDEPTHBIAS]);
DxvkDepthBias biases; DxvkDepthBias biases;

2
src/d3d9/d3d9_device.h
View File

@ -1025,6 +1025,8 @@ namespace dxvk {
bool m_nvATOC = false; bool m_nvATOC = false;
bool m_ffZTest = false; bool m_ffZTest = false;
float m_depthBiasScale = 0.0f;
D3D9ConstantLayout m_vsLayout; D3D9ConstantLayout m_vsLayout;
D3D9ConstantLayout m_psLayout; D3D9ConstantLayout m_psLayout;

16
src/d3d9/d3d9_util.h
View File

@ -176,6 +176,22 @@ namespace dxvk {
void ConvertRect(RECT rect, VkOffset2D& offset, VkExtent2D& extent); void ConvertRect(RECT rect, VkOffset2D& offset, VkExtent2D& extent);
inline float GetDepthBufferRValue(VkFormat Format) {
switch (Format) {
case VK_FORMAT_D16_UNORM_S8_UINT:
case VK_FORMAT_D16_UNORM:
return float(1 << 16);
case VK_FORMAT_D24_UNORM_S8_UINT:
return float(1 << 24);
default:
case VK_FORMAT_D32_SFLOAT_S8_UINT:
case VK_FORMAT_D32_SFLOAT:
return float(1 << 23);
}
}
template<typename T> template<typename T>
UINT CompactSparseList(T* pData, UINT Mask) { UINT CompactSparseList(T* pData, UINT Mask) {
uint32_t count = 0; uint32_t count = 0;