meson: Build i965 and dri stack

[mesa.git] / src / mesa / drivers / dri / i965 / gen4_blorp_exec.h

diff --git a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h
index 183c0da0af3be151bea0de264d924c7258782ffd..798496ffffe3032a6b4d5abc75c5330b90b1c439 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen4_blorp_exec.h
+++ b/src/mesa/drivers/dri/i965/gen4_blorp_exec.h
@@ -28,10 +28,8 @@ dynamic_state_address(struct blorp_batch *batch, uint32_t offset)
    struct brw_context *brw = batch->driver_batch;
 
    return (struct blorp_address) {
-      .buffer = brw->batch.bo,
+      .buffer = brw->batch.state_bo,
       .offset = offset,
-      .write_domain = 0,
-      .read_domains = I915_GEM_DOMAIN_INSTRUCTION,
    };
 }
 
@@ -44,8 +42,6 @@ instruction_state_address(struct blorp_batch *batch, uint32_t offset)
    return (struct blorp_address) {
       .buffer = brw->cache.bo,
       .offset = offset,
-      .write_domain = 0,
-      .read_domains = I915_GEM_DOMAIN_INSTRUCTION,
    };
 }
 
@@ -125,13 +121,13 @@ blorp_emit_wm_state(struct blorp_batch *batch,
       }
 
       if (prog_data) {
-         wm.DispatchGRFStartRegisterForURBData =
+         wm.DispatchGRFStartRegisterForConstantSetupData0 =
             prog_data->base.dispatch_grf_start_reg;
          wm.SetupURBEntryReadLength = prog_data->num_varying_inputs * 2;
          wm.SetupURBEntryReadOffset = 0;
 
          wm.DepthCoefficientURBReadOffset = 1;
-         wm.PixelShaderKillPixel = prog_data->uses_kill;
+         wm.PixelShaderKillsPixel = prog_data->uses_kill;
          wm.ThreadDispatchEnable = true;
          wm.EarlyDepthTestEnable = true;
 
@@ -139,9 +135,9 @@ blorp_emit_wm_state(struct blorp_batch *batch,
          wm._16PixelDispatchEnable = prog_data->dispatch_16;
 
 #if GEN_GEN == 4
-         wm.KernelStartPointer =
+         wm.KernelStartPointer0 =
             instruction_state_address(batch, params->wm_prog_kernel);
-         wm.GRFRegisterCount = prog_data->reg_blocks_0;
+         wm.GRFRegisterCount0 = prog_data->reg_blocks_0;
 #else
          wm.KernelStartPointer0 = params->wm_prog_kernel;
          wm.GRFRegisterCount0 = prog_data->reg_blocks_0;