From a3c472a2ec58038c5cd6b61f0c33260d38cd816e Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 8 Aug 2016 20:30:07 +0100 Subject: [PATCH] anv/pipeline: rename info to rs_info in emit_rs_state Signed-off-by: Lionel Landwerlin Reviewed-by: Anuj Phogat Reviewed-by: Jason Ekstrand --- src/intel/vulkan/genX_pipeline_util.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/intel/vulkan/genX_pipeline_util.h b/src/intel/vulkan/genX_pipeline_util.h index c17d930..0aa85ba 100644 --- a/src/intel/vulkan/genX_pipeline_util.h +++ b/src/intel/vulkan/genX_pipeline_util.h @@ -364,7 +364,7 @@ static const uint32_t vk_to_gen_front_face[] = { static void emit_rs_state(struct anv_pipeline *pipeline, - const VkPipelineRasterizationStateCreateInfo *info, + const VkPipelineRasterizationStateCreateInfo *rs_info, const struct anv_render_pass *pass, const struct anv_subpass *subpass, const struct anv_graphics_pipeline_create_info *extra) @@ -398,10 +398,10 @@ emit_rs_state(struct anv_pipeline *pipeline, raster.ForceMultisampling = false; #endif - raster.FrontWinding = vk_to_gen_front_face[info->frontFace]; - raster.CullMode = vk_to_gen_cullmode[info->cullMode]; - raster.FrontFaceFillMode = vk_to_gen_fillmode[info->polygonMode]; - raster.BackFaceFillMode = vk_to_gen_fillmode[info->polygonMode]; + raster.FrontWinding = vk_to_gen_front_face[rs_info->frontFace]; + raster.CullMode = vk_to_gen_cullmode[rs_info->cullMode]; + raster.FrontFaceFillMode = vk_to_gen_fillmode[rs_info->polygonMode]; + raster.BackFaceFillMode = vk_to_gen_fillmode[rs_info->polygonMode]; raster.ScissorRectangleEnable = !(extra && extra->use_rectlist); #if GEN_GEN >= 9 @@ -412,9 +412,9 @@ emit_rs_state(struct anv_pipeline *pipeline, raster.ViewportZClipTestEnable = !pipeline->depth_clamp_enable; #endif - raster.GlobalDepthOffsetEnableSolid = info->depthBiasEnable; - raster.GlobalDepthOffsetEnableWireframe = info->depthBiasEnable; - raster.GlobalDepthOffsetEnablePoint = info->depthBiasEnable; + raster.GlobalDepthOffsetEnableSolid = rs_info->depthBiasEnable; + raster.GlobalDepthOffsetEnableWireframe = rs_info->depthBiasEnable; + raster.GlobalDepthOffsetEnablePoint = rs_info->depthBiasEnable; #if GEN_GEN == 7 /* Gen7 requires that we provide the depth format in 3DSTATE_SF so that it -- 2.7.4