gen{7,8}_pipeline: Always set ViewportXYClipTestEnable

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 <nanley.g.chery@intel.com>
Reviewed-by: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>

diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c
index 10397343e5f6cefc75f33c4f790de6ed10ad2cd7..5c04fb749cc491a06f4f0d8ae246717c432472b2 100644 (file)
--- 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 0d71e0719daef7fe53bbf975b44eeee539bea74c..7f26ef5e1978afa2e7d532cb3d9d86ac7dfb6d09 100644 (file)
--- 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 ?