vk: Move 3DSTATE_SBE setup to just before 3DSTATE_PS
authorKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Fri, 21 Aug 2015 05:55:08 +0000 (22:55 -0700)
committerKristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
Mon, 24 Aug 2015 20:45:41 +0000 (13:45 -0700)
This is a more logical place for it, between geometry front end state
and pixel backend state.

Signed-off-by: Kristian Høgsberg Kristensen <kristian.h.kristensen@intel.com>
src/vulkan/gen8_pipeline.c

index 9060b3c744a9dfc61dab259885c798e9a3e5f204..bd179fdc845e0355a27fee3663ae44eea8ae482f 100644 (file)
@@ -136,13 +136,6 @@ emit_rs_state(struct anv_pipeline *pipeline,
       .ViewportZClipTestEnable = info->depthClipEnable
    };
 
-   anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_SBE,
-                  .ForceVertexURBEntryReadLength = false,
-                  .ForceVertexURBEntryReadOffset = false,
-                  .PointSpriteTextureCoordinateOrigin = UPPERLEFT,
-                  .NumberofSFOutputAttributes =
-                     pipeline->wm_prog_data.num_varying_inputs);
-
    GEN8_3DSTATE_RASTER_pack(NULL, pipeline->gen8.raster, &raster);
 }
 
@@ -528,6 +521,13 @@ gen8_graphics_pipeline_create(
 
    const struct brw_wm_prog_data *wm_prog_data = &pipeline->wm_prog_data;
 
+   anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_SBE,
+                  .ForceVertexURBEntryReadLength = false,
+                  .ForceVertexURBEntryReadOffset = false,
+                  .PointSpriteTextureCoordinateOrigin = UPPERLEFT,
+                  .NumberofSFOutputAttributes =
+                     wm_prog_data->num_varying_inputs);
+
    anv_batch_emit(&pipeline->batch, GEN8_3DSTATE_PS,
                   .KernelStartPointer0 = pipeline->ps_ksp0,