diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index dc95a492671..79a7fb57c85 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -6179,7 +6179,7 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv radv_pipeline_init_dynamic_state(pipeline, &state); if (state.vp) - pipeline->negative_one_to_one = state.vp->negative_one_to_one; + pipeline->negative_one_to_one = state.vp->depth_clip_negative_one_to_one; radv_pipeline_init_raster_state(pipeline, &state); diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 7e580de75d6..b841592eb17 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -955,8 +955,8 @@ static void handle_graphics_pipeline(struct vk_cmd_queue_entry *cmd, state->scissor_dirty = true; } - if (state->rs_state.clip_halfz != !ps->vp->negative_one_to_one) { - state->rs_state.clip_halfz = !ps->vp->negative_one_to_one; + if (state->rs_state.clip_halfz != !ps->vp->depth_clip_negative_one_to_one) { + state->rs_state.clip_halfz = !ps->vp->depth_clip_negative_one_to_one; state->rs_dirty = true; for (uint32_t i = 0; i < state->num_viewports; i++) set_viewport_depth_xform(state, i); diff --git a/src/intel/vulkan/anv_pipeline.c b/src/intel/vulkan/anv_pipeline.c index 807c05841a3..8e58c5ff47e 100644 --- a/src/intel/vulkan/anv_pipeline.c +++ b/src/intel/vulkan/anv_pipeline.c @@ -2297,7 +2297,7 @@ anv_graphics_pipeline_init(struct anv_graphics_pipeline *pipeline, } pipeline->negative_one_to_one = - state->vp != NULL && state->vp->negative_one_to_one; + state->vp != NULL && state->vp->depth_clip_negative_one_to_one; /* Store line mode, polygon mode and rasterization samples, these are used * for dynamic primitive topology. diff --git a/src/intel/vulkan_hasvk/anv_pipeline.c b/src/intel/vulkan_hasvk/anv_pipeline.c index 548c00bd9e6..1a65fabbe29 100644 --- a/src/intel/vulkan_hasvk/anv_pipeline.c +++ b/src/intel/vulkan_hasvk/anv_pipeline.c @@ -1931,7 +1931,7 @@ anv_graphics_pipeline_init(struct anv_graphics_pipeline *pipeline, pipeline->instance_multiplier = util_bitcount(pipeline->view_mask); pipeline->negative_one_to_one = - state->vp != NULL && state->vp->negative_one_to_one; + state->vp != NULL && state->vp->depth_clip_negative_one_to_one; /* Store line mode, polygon mode and rasterization samples, these are used * for dynamic primitive topology. diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c index f21a2e504ca..977ae8db581 100644 --- a/src/vulkan/runtime/vk_graphics_state.c +++ b/src/vulkan/runtime/vk_graphics_state.c @@ -376,7 +376,7 @@ vk_viewport_state_init(struct vk_viewport_state *vp, vk_find_struct_const(vp_info->pNext, PIPELINE_VIEWPORT_DEPTH_CLIP_CONTROL_CREATE_INFO_EXT); if (vp_dcc_info != NULL) - vp->negative_one_to_one = vp_dcc_info->negativeOneToOne; + vp->depth_clip_negative_one_to_one = vp_dcc_info->negativeOneToOne; } static void diff --git a/src/vulkan/runtime/vk_graphics_state.h b/src/vulkan/runtime/vk_graphics_state.h index 05e32e53ce7..47c54be7482 100644 --- a/src/vulkan/runtime/vk_graphics_state.h +++ b/src/vulkan/runtime/vk_graphics_state.h @@ -150,7 +150,7 @@ struct vk_tessellation_state { struct vk_viewport_state { /** VkPipelineViewportDepthClipControlCreateInfoEXT::negativeOneToOne */ - bool negative_one_to_one; + bool depth_clip_negative_one_to_one; /** VkPipelineViewportStateCreateInfo::viewportCount */ uint8_t viewport_count;