From e9d634f4adeb0343d255dcd46ea7eb0d79f0416c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Tue, 17 Nov 2015 19:10:31 -0800 Subject: [PATCH] gen7/pipeline: Re-arrange stencil parameters to match gen8 --- src/vulkan/gen7_pipeline.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/vulkan/gen7_pipeline.c b/src/vulkan/gen7_pipeline.c index 5e29df642da..bcfa986769e 100644 --- a/src/vulkan/gen7_pipeline.c +++ b/src/vulkan/gen7_pipeline.c @@ -227,27 +227,26 @@ gen7_emit_ds_state(struct anv_pipeline *pipeline, bool has_stencil = false; /* enable if subpass has stencil? */ struct GEN7_DEPTH_STENCIL_STATE state = { + .DepthTestEnable = info->depthTestEnable, + .DepthBufferWriteEnable = info->depthWriteEnable, + .DepthTestFunction = vk_to_gen_compare_op[info->depthCompareOp], + .DoubleSidedStencilEnable = true, + /* Is this what we need to do? */ .StencilBufferWriteEnable = has_stencil, .StencilTestEnable = info->stencilTestEnable, - .StencilTestFunction = vk_to_gen_compare_op[info->front.stencilCompareOp], .StencilFailOp = vk_to_gen_stencil_op[info->front.stencilFailOp], - .StencilPassDepthFailOp = vk_to_gen_stencil_op[info->front.stencilDepthFailOp], .StencilPassDepthPassOp = vk_to_gen_stencil_op[info->front.stencilPassOp], + .StencilPassDepthFailOp = vk_to_gen_stencil_op[info->front.stencilDepthFailOp], + .StencilTestFunction = vk_to_gen_compare_op[info->front.stencilCompareOp], - .DoubleSidedStencilEnable = true, - - .BackFaceStencilTestFunction = vk_to_gen_compare_op[info->back.stencilCompareOp], .BackfaceStencilFailOp = vk_to_gen_stencil_op[info->back.stencilFailOp], - .BackfaceStencilPassDepthFailOp = vk_to_gen_stencil_op[info->back.stencilDepthFailOp], .BackfaceStencilPassDepthPassOp = vk_to_gen_stencil_op[info->back.stencilPassOp], - - .DepthTestEnable = info->depthTestEnable, - .DepthTestFunction = vk_to_gen_compare_op[info->depthCompareOp], - .DepthBufferWriteEnable = info->depthWriteEnable, + .BackfaceStencilPassDepthFailOp = vk_to_gen_stencil_op[info->back.stencilDepthFailOp], + .BackFaceStencilTestFunction = vk_to_gen_compare_op[info->back.stencilCompareOp], }; - + GEN7_DEPTH_STENCIL_STATE_pack(NULL, &pipeline->gen7.depth_stencil_state, &state); } -- 2.30.2