OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk/0.210.0: Remove depth clip and add depth clamp

Browse Source
This commit is contained in:
Jason Ekstrand
2015-12-02 17:07:26 -08:00
parent d689745303
commit 5757ad2959
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/vulkan/vulkan.h
View File

@@ -1688,7 +1688,7 @@ typedef struct VkPipelineRasterizationStateCreateInfo {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
VkPipelineRasterizationStateCreateFlags flags; VkPipelineRasterizationStateCreateFlags flags;
VkBool32 depthClipEnable; VkBool32 depthClampEnable;
VkBool32 rasterizerDiscardEnable; VkBool32 rasterizerDiscardEnable;
VkPolygonMode polygonMode; VkPolygonMode polygonMode;
VkCullModeFlags cullMode; VkCullModeFlags cullMode;

1
src/vulkan/anv_meta.c
View File

@@ -334,7 +334,6 @@ anv_device_init_meta_blit_state(struct anv_device *device)
}, },
.pRasterizationState = &(VkPipelineRasterizationStateCreateInfo) { .pRasterizationState = &(VkPipelineRasterizationStateCreateInfo) {
.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
.depthClipEnable = true,
.rasterizerDiscardEnable = false, .rasterizerDiscardEnable = false,
.polygonMode = VK_POLYGON_MODE_FILL, .polygonMode = VK_POLYGON_MODE_FILL,
.cullMode = VK_CULL_MODE_NONE, .cullMode = VK_CULL_MODE_NONE,

2
src/vulkan/anv_meta_clear.c
View File

@@ -160,13 +160,11 @@ create_pipeline(struct anv_device *device,
}, },
.pRasterizationState = &(VkPipelineRasterizationStateCreateInfo) { .pRasterizationState = &(VkPipelineRasterizationStateCreateInfo) {
.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO,
.depthClipEnable = false,
.rasterizerDiscardEnable = false, .rasterizerDiscardEnable = false,
.polygonMode = VK_POLYGON_MODE_FILL, .polygonMode = VK_POLYGON_MODE_FILL,
.cullMode = VK_CULL_MODE_NONE, .cullMode = VK_CULL_MODE_NONE,
.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE, .frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE,
.depthBiasEnable = false, .depthBiasEnable = false,
.depthClipEnable = false,
}, },
.pMultisampleState = &(VkPipelineMultisampleStateCreateInfo) { .pMultisampleState = &(VkPipelineMultisampleStateCreateInfo) {
.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO,

6
src/vulkan/gen8_pipeline.c
View File

@@ -135,11 +135,11 @@ emit_rs_state(struct anv_pipeline *pipeline,
.BackFaceFillMode = vk_to_gen_fillmode[info->polygonMode], .BackFaceFillMode = vk_to_gen_fillmode[info->polygonMode],
.ScissorRectangleEnable = !(extra && extra->disable_scissor), .ScissorRectangleEnable = !(extra && extra->disable_scissor),
#if ANV_GEN == 8 #if ANV_GEN == 8
.ViewportZClipTestEnable = info->depthClipEnable .ViewportZClipTestEnable = true,
#else #else
/* GEN9+ splits ViewportZClipTestEnable into near and far enable bits */ /* GEN9+ splits ViewportZClipTestEnable into near and far enable bits */
.ViewportZFarClipTestEnable = info->depthClipEnable, .ViewportZFarClipTestEnable = true,
.ViewportZNearClipTestEnable = info->depthClipEnable, .ViewportZNearClipTestEnable = true,
#endif #endif
}; };