diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-02 17:07:26 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-03 13:43:59 -0800 |
| commit | 5757ad2959a91f71dcc4a3661cce0e5ab065052b (patch) | |
| tree | eed4ce9e8b07d242010ab03c73084746eaa944ea | |
| parent | d6897453037111d654b1e58dd6e74aac6aa21134 (diff) | |
vk/0.210.0: Remove depth clip and add depth clamp
| -rw-r--r-- | include/vulkan/vulkan.h | 2 | ||||
| -rw-r--r-- | src/vulkan/anv_meta.c | 1 | ||||
| -rw-r--r-- | src/vulkan/anv_meta_clear.c | 2 | ||||
| -rw-r--r-- | src/vulkan/gen8_pipeline.c | 6 |
4 files changed, 4 insertions, 7 deletions
diff --git a/include/vulkan/vulkan.h b/include/vulkan/vulkan.h index 8036b6126aa..67ab34ddf23 100644 --- a/include/vulkan/vulkan.h +++ b/include/vulkan/vulkan.h @@ -1688,7 +1688,7 @@ typedef struct VkPipelineRasterizationStateCreateInfo { VkStructureType sType; const void* pNext; VkPipelineRasterizationStateCreateFlags flags; - VkBool32 depthClipEnable; + VkBool32 depthClampEnable; VkBool32 rasterizerDiscardEnable; VkPolygonMode polygonMode; VkCullModeFlags cullMode; diff --git a/src/vulkan/anv_meta.c b/src/vulkan/anv_meta.c index 67651c542b7..bed01980a0d 100644 --- a/src/vulkan/anv_meta.c +++ b/src/vulkan/anv_meta.c @@ -334,7 +334,6 @@ anv_device_init_meta_blit_state(struct anv_device *device) }, .pRasterizationState = &(VkPipelineRasterizationStateCreateInfo) { .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, - .depthClipEnable = true, .rasterizerDiscardEnable = false, .polygonMode = VK_POLYGON_MODE_FILL, .cullMode = VK_CULL_MODE_NONE, diff --git a/src/vulkan/anv_meta_clear.c b/src/vulkan/anv_meta_clear.c index a2667c7bb6e..24ff1ea75e4 100644 --- a/src/vulkan/anv_meta_clear.c +++ b/src/vulkan/anv_meta_clear.c @@ -160,13 +160,11 @@ create_pipeline(struct anv_device *device, }, .pRasterizationState = &(VkPipelineRasterizationStateCreateInfo) { .sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO, - .depthClipEnable = false, .rasterizerDiscardEnable = false, .polygonMode = VK_POLYGON_MODE_FILL, .cullMode = VK_CULL_MODE_NONE, .frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE, .depthBiasEnable = false, - .depthClipEnable = false, }, .pMultisampleState = &(VkPipelineMultisampleStateCreateInfo) { .sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO, diff --git a/src/vulkan/gen8_pipeline.c b/src/vulkan/gen8_pipeline.c index 82a63d3bfb3..d0395741474 100644 --- a/src/vulkan/gen8_pipeline.c +++ b/src/vulkan/gen8_pipeline.c @@ -135,11 +135,11 @@ emit_rs_state(struct anv_pipeline *pipeline, .BackFaceFillMode = vk_to_gen_fillmode[info->polygonMode], .ScissorRectangleEnable = !(extra && extra->disable_scissor), #if ANV_GEN == 8 - .ViewportZClipTestEnable = info->depthClipEnable + .ViewportZClipTestEnable = true, #else /* GEN9+ splits ViewportZClipTestEnable into near and far enable bits */ - .ViewportZFarClipTestEnable = info->depthClipEnable, - .ViewportZNearClipTestEnable = info->depthClipEnable, + .ViewportZFarClipTestEnable = true, + .ViewportZNearClipTestEnable = true, #endif }; |