gen8/pipeline: Properly set bits in PS_EXTRA for W, depth, and samaple mask

diff --git a/src/vulkan/gen7_pipeline.c b/src/vulkan/gen7_pipeline.c
index d4d6131794a67c08602bdc3639b3369475791f0d..ec8db1d195663f735b49c2432a03400a15c8bad5 100644 (file)
--- a/src/vulkan/gen7_pipeline.c
+++ b/src/vulkan/gen7_pipeline.c
@@ -387,6 +387,9 @@ genX(graphics_pipeline_create)(
                      .EarlyDepthStencilControl                 = EDSC_NORMAL,
                      .PointRasterizationRule                   = RASTRULE_UPPER_RIGHT,
                      .PixelShaderComputedDepthMode             = wm_prog_data->computed_depth_mode,
+                     .PixelShaderUsesSourceDepth               = wm_prog_data->uses_src_depth,
+                     .PixelShaderUsesSourceW                   = wm_prog_data->uses_src_w,
+                     .PixelShaderUsesInputCoverageMask         = wm_prog_data->uses_sample_mask,
                      .BarycentricInterpolationMode             = wm_prog_data->barycentric_interp_modes);
    }
 

diff --git a/src/vulkan/gen8_pipeline.c b/src/vulkan/gen8_pipeline.c
index e796ab3d51da2e93efaf90a6159bb5d55d6cf41f..c41d6ffa82e1b8c6b4d234292215bb2e100b1cb1 100644 (file)
--- a/src/vulkan/gen8_pipeline.c
+++ b/src/vulkan/gen8_pipeline.c
@@ -547,9 +547,15 @@ genX(graphics_pipeline_create)(
                      .AttributeEnable = wm_prog_data->num_varying_inputs > 0,
                      .oMaskPresenttoRenderTarget = wm_prog_data->uses_omask,
                      .PixelShaderIsPerSample = per_sample_ps,
+                     .PixelShaderUsesSourceDepth = wm_prog_data->uses_src_depth,
+                     .PixelShaderUsesSourceW = wm_prog_data->uses_src_w,
 #if ANV_GEN >= 9
                      .PixelShaderPullsBary = wm_prog_data->pulls_bary,
-                     .InputCoverageMaskState = ICMS_NONE
+                     .InputCoverageMaskState = wm_prog_data->uses_sample_mask ?
+                        ICMS_INNER_CONSERVATIVE : ICMS_NONE,
+#else
+                     .PixelShaderUsesInputCoverageMask =
+                        wm_prog_data->uses_sample_mask,
 #endif
          );
    }