From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Sat, 27 Feb 2016 17:46:40 +0000 (-0800)
Subject: anv/gen7: Clean up the dummy PS case
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46b7c242da7c7c9ea7877a2c4b1fecdf5c1c0452;p=mesa.git

anv/gen7: Clean up the dummy PS case

Fix whitespace and remove dead comments
---

diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c
index 2167f296b2f..7151e36f17d 100644
--- a/src/intel/vulkan/gen7_pipeline.c
+++ b/src/intel/vulkan/gen7_pipeline.c
@@ -323,27 +323,21 @@ genX(graphics_pipeline_create)(
    }
 
    if (pipeline->ps_ksp0 == NO_KERNEL) {
-     anv_finishme("disabling ps");
+      anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SBE));
 
-     /* FIXME: generated header doesn't emit attr swizzle fields */
-     anv_batch_emit(&pipeline->batch, GENX(3DSTATE_SBE));
-
-     /* FIXME-GEN7: This needs a lot more work, cf gen7 upload_wm_state(). */
-     anv_batch_emit(&pipeline->batch, GENX(3DSTATE_WM),
-		    .StatisticsEnable                         = true,
-		    .ThreadDispatchEnable                     = false,
-		    .LineEndCapAntialiasingRegionWidth        = 0, /* 0.5 pixels */
-		    .LineAntialiasingRegionWidth              = 1, /* 1.0 pixels */
-		    .EarlyDepthStencilControl                 = EDSC_NORMAL,
-		    .PointRasterizationRule                   = RASTRULE_UPPER_RIGHT);
-
-
-     /* Even if no fragments are ever dispatched, the hardware hangs if we
-      * don't at least set the maximum number of threads.
-      */
-     anv_batch_emit(&pipeline->batch, GENX(3DSTATE_PS),
-                    .MaximumNumberofThreads                   = device->info.max_wm_threads - 1);
+      anv_batch_emit(&pipeline->batch, GENX(3DSTATE_WM),
+                     .StatisticsEnable                         = true,
+                     .ThreadDispatchEnable                     = false,
+                     .LineEndCapAntialiasingRegionWidth        = 0, /* 0.5 pixels */
+                     .LineAntialiasingRegionWidth              = 1, /* 1.0 pixels */
+                     .EarlyDepthStencilControl                 = EDSC_NORMAL,
+                     .PointRasterizationRule                   = RASTRULE_UPPER_RIGHT);
 
+      /* Even if no fragments are ever dispatched, the hardware hangs if we
+       * don't at least set the maximum number of threads.
+       */
+      anv_batch_emit(&pipeline->batch, GENX(3DSTATE_PS),
+                     .MaximumNumberofThreads                   = device->info.max_wm_threads - 1);
    } else {
       const struct brw_wm_prog_data *wm_prog_data = &pipeline->wm_prog_data;
       if (wm_prog_data->urb_setup[VARYING_SLOT_BFC0] != -1 ||