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

[dxvk] DepthClampEnable -> DepthClipEnable

Browse Source 
There are subtle differences between the two that we
should deal with in the backend at some point.
This commit is contained in:
Philip Rebohle 2019-01-17 01:58:03 +01:00
parent 4819287029
commit 0d84ebd4c9
No known key found for this signature in database
GPG Key ID: C8CC613427A31C99
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/d3d11/d3d11_rasterizer.cpp
View File

@ -48,7 +48,7 @@ namespace dxvk {
m_state.depthBiasConstant = static_cast<float>(desc.DepthBias); m_state.depthBiasConstant = static_cast<float>(desc.DepthBias);
m_state.depthBiasClamp = desc.DepthBiasClamp; m_state.depthBiasClamp = desc.DepthBiasClamp;
m_state.depthBiasSlope = desc.SlopeScaledDepthBias; m_state.depthBiasSlope = desc.SlopeScaledDepthBias;
m_state.depthClampEnable = desc.DepthClipEnable ? VK_FALSE : VK_TRUE; m_state.depthClipEnable = desc.DepthClipEnable;
m_state.sampleCount = VkSampleCountFlags(desc.ForcedSampleCount); m_state.sampleCount = VkSampleCountFlags(desc.ForcedSampleCount);
if (desc.AntialiasedLineEnable) if (desc.AntialiasedLineEnable)

2
src/d3d11/d3d11_swapchain.cpp
View File

@ -572,7 +572,7 @@ namespace dxvk {
m_rsState.polygonMode = VK_POLYGON_MODE_FILL; m_rsState.polygonMode = VK_POLYGON_MODE_FILL;
m_rsState.cullMode = VK_CULL_MODE_BACK_BIT; m_rsState.cullMode = VK_CULL_MODE_BACK_BIT;
m_rsState.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE; m_rsState.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE;
m_rsState.depthClampEnable = VK_FALSE; m_rsState.depthClipEnable = VK_FALSE;
m_rsState.depthBiasEnable = VK_FALSE; m_rsState.depthBiasEnable = VK_FALSE;
m_rsState.depthBiasConstant = 0.0f; m_rsState.depthBiasConstant = 0.0f;
m_rsState.depthBiasClamp = 0.0f; m_rsState.depthBiasClamp = 0.0f;

2
src/dxvk/dxvk_constant_state.h
View File

@ -53,7 +53,7 @@ namespace dxvk {
VkPolygonMode polygonMode; VkPolygonMode polygonMode;
VkCullModeFlags cullMode; VkCullModeFlags cullMode;
VkFrontFace frontFace; VkFrontFace frontFace;
VkBool32 depthClampEnable; VkBool32 depthClipEnable;
VkBool32 depthBiasEnable; VkBool32 depthBiasEnable;
float depthBiasConstant; float depthBiasConstant;
float depthBiasClamp; float depthBiasClamp;

2
src/dxvk/dxvk_context.cpp
View File

@ -1652,7 +1652,7 @@ namespace dxvk {
void DxvkContext::setRasterizerState(const DxvkRasterizerState& rs) { void DxvkContext::setRasterizerState(const DxvkRasterizerState& rs) {
m_state.gp.state.rsDepthClampEnable = rs.depthClampEnable; m_state.gp.state.rsDepthClipEnable = rs.depthClipEnable;
m_state.gp.state.rsDepthBiasEnable = rs.depthBiasEnable; m_state.gp.state.rsDepthBiasEnable = rs.depthBiasEnable;
m_state.gp.state.rsPolygonMode = rs.polygonMode; m_state.gp.state.rsPolygonMode = rs.polygonMode;
m_state.gp.state.rsCullMode = rs.cullMode; m_state.gp.state.rsCullMode = rs.cullMode;

2
src/dxvk/dxvk_graphics.cpp
View File

@ -319,7 +319,7 @@ namespace dxvk {
rsInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; rsInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO;
rsInfo.pNext = nullptr; rsInfo.pNext = nullptr;
rsInfo.flags = 0; rsInfo.flags = 0;
rsInfo.depthClampEnable = state.rsDepthClampEnable; rsInfo.depthClampEnable = !state.rsDepthClipEnable;
rsInfo.rasterizerDiscardEnable = rasterizedStream < 0; rsInfo.rasterizerDiscardEnable = rasterizedStream < 0;
rsInfo.polygonMode = state.rsPolygonMode; rsInfo.polygonMode = state.rsPolygonMode;
rsInfo.cullMode = state.rsCullMode; rsInfo.cullMode = state.rsCullMode;

2
src/dxvk/dxvk_graphics.h
View File

@ -81,7 +81,7 @@ namespace dxvk {
VkVertexInputBindingDescription ilBindings[DxvkLimits::MaxNumVertexBindings]; VkVertexInputBindingDescription ilBindings[DxvkLimits::MaxNumVertexBindings];
uint32_t ilDivisors[DxvkLimits::MaxNumVertexBindings]; uint32_t ilDivisors[DxvkLimits::MaxNumVertexBindings];
VkBool32 rsDepthClampEnable; VkBool32 rsDepthClipEnable;
VkBool32 rsDepthBiasEnable; VkBool32 rsDepthBiasEnable;
VkPolygonMode rsPolygonMode; VkPolygonMode rsPolygonMode;
VkCullModeFlags rsCullMode; VkCullModeFlags rsCullMode;

2
src/dxvk/hud/dxvk_hud.cpp
View File

@ -19,7 +19,7 @@ namespace dxvk::hud {
m_rsState.polygonMode = VK_POLYGON_MODE_FILL; m_rsState.polygonMode = VK_POLYGON_MODE_FILL;
m_rsState.cullMode = VK_CULL_MODE_BACK_BIT; m_rsState.cullMode = VK_CULL_MODE_BACK_BIT;
m_rsState.frontFace = VK_FRONT_FACE_CLOCKWISE; m_rsState.frontFace = VK_FRONT_FACE_CLOCKWISE;
m_rsState.depthClampEnable = VK_FALSE; m_rsState.depthClipEnable = VK_FALSE;
m_rsState.depthBiasEnable = VK_FALSE; m_rsState.depthBiasEnable = VK_FALSE;
m_rsState.depthBiasConstant = 0.0f; m_rsState.depthBiasConstant = 0.0f;
m_rsState.depthBiasClamp = 0.0f; m_rsState.depthBiasClamp = 0.0f;