From cff0f6b027f139cc33c9ecbfd22f9662d75c0cb7 Mon Sep 17 00:00:00 2001 From: Nanley Chery Date: Thu, 31 Mar 2016 23:16:12 -0700 Subject: [PATCH] gen{7,8}_pipeline: Always set ViewportXYClipTestEnable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For the following reasons, there is no behavioural change with this commit: the ViewportXYClipTest function of the CLIP stage will continue to be enabled outside of Meta (where disable_viewport is always false), and the CLIP stage is turned off within Meta, so this function will continue to be disabled in that case. Signed-off-by: Nanley Chery Reviewed-by: Kristian Høgsberg Kristensen --- src/intel/vulkan/gen7_pipeline.c | 2 +- src/intel/vulkan/gen8_pipeline.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c index 10397343e5f..5c04fb749cc 100644 --- a/src/intel/vulkan/gen7_pipeline.c +++ b/src/intel/vulkan/gen7_pipeline.c @@ -227,7 +227,7 @@ genX(graphics_pipeline_create)( .CullMode = vk_to_gen_cullmode[rs_info->cullMode], .ClipEnable = !(extra && extra->use_rectlist), .APIMode = APIMODE_OGL, - .ViewportXYClipTestEnable = !(extra && extra->disable_viewport), + .ViewportXYClipTestEnable = true, .ClipMode = CLIPMODE_NORMAL, .TriangleStripListProvokingVertexSelect = 0, .LineStripListProvokingVertexSelect = 0, diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 0d71e0719da..7f26ef5e197 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -351,7 +351,7 @@ genX(graphics_pipeline_create)( .ClipEnable = !(extra && extra->use_rectlist), .EarlyCullEnable = true, .APIMode = 1, /* D3D */ - .ViewportXYClipTestEnable = !(extra && extra->disable_viewport), + .ViewportXYClipTestEnable = true, .ClipMode = pCreateInfo->pRasterizationState->rasterizerDiscardEnable ? -- 2.30.2