From 2d6fa1dcdf315a78c7fb4cf0f574dd43e90d1f99 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 30 Sep 2022 11:40:58 -0400 Subject: [PATCH] zink: define zink_pipeline_dynamic_state3 as zink_rasterizer_hw_state this ensures the structs are kept in sync Reviewed-by: Adam Jackson Part-of: --- src/gallium/drivers/zink/zink_types.h | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gallium/drivers/zink/zink_types.h b/src/gallium/drivers/zink/zink_types.h index 4f857cefdd4..0e84fe0b536 100644 --- a/src/gallium/drivers/zink/zink_types.h +++ b/src/gallium/drivers/zink/zink_types.h @@ -650,14 +650,7 @@ struct zink_pipeline_dynamic_state2 { uint16_t vertices_per_patch; //5 bits }; -struct zink_pipeline_dynamic_state3 { - unsigned polygon_mode : 2; //VkPolygonMode - unsigned line_mode : 2; //VkLineRasterizationModeEXT - unsigned depth_clamp:1; - unsigned pv_last:1; - unsigned line_stipple_enable:1; - unsigned clip_halfz:1; -}; +#define zink_pipeline_dynamic_state3 zink_rasterizer_hw_state struct zink_gfx_pipeline_state { /* order matches zink_gfx_output_key */