ilo: update genhw headers

Accumulated changes for various renames and additions, including Gen8
definitions.  Some of the dynamic state __SIZE no longer means the size of an
element, but the size of an array of elements.  The changes can be seen in
ilo_render_dynamic.c.

2 files changed, 12 insertions, 12 deletions

diff --git a/src/gallium/drivers/ilo/shader/ilo_shader_fs.c b/src/gallium/drivers/ilo/shader/ilo_shader_fs.c
index e41a1f64fcb..5250115a893 100644
--- a/src/gallium/drivers/ilo/shader/ilo_shader_fs.c
+++ b/src/gallium/drivers/ilo/shader/ilo_shader_fs.c
@@ -1476,7 +1476,7 @@ fs_write_fb(struct fs_compile_context *fcc)
       base_mrf += fcc->num_grf_per_vrf;
 
       /* this is a two-register header */
-      if (fcc->dispatch_mode == GEN6_WM_DW5_8_PIXEL_DISPATCH) {
+      if (fcc->dispatch_mode == GEN6_PS_DISPATCH_8) {
          inst = tc_MOV(tc, tdst_offset(header, 1, 0), tsrc_offset(r0, 1, 0));
          inst->mask_ctrl = GEN6_MASKCTRL_NOMASK;
          base_mrf += fcc->num_grf_per_vrf;
@@ -1559,7 +1559,7 @@ fs_write_fb(struct fs_compile_context *fcc)
          mrf += fcc->num_grf_per_vrf;
       }
 
-      msg_type = (fcc->dispatch_mode == GEN6_WM_DW5_16_PIXEL_DISPATCH) ?
+      msg_type = (fcc->dispatch_mode == GEN6_PS_DISPATCH_16) ?
          GEN6_MSG_DP_RT_MODE_SIMD16 >> 8 :
          GEN6_MSG_DP_RT_MODE_SIMD8_LO >> 8;
 
@@ -1670,11 +1670,11 @@ fs_setup_payloads(struct fs_compile_context *fcc)
    grf++;
 
    /* r1-r2: coordinates and etc. */
-   grf += (fcc->dispatch_mode == GEN6_WM_DW5_32_PIXEL_DISPATCH) ? 2 : 1;
+   grf += (fcc->dispatch_mode == GEN6_PS_DISPATCH_32) ? 2 : 1;
 
    for (i = 0; i < Elements(fcc->payloads); i++) {
       const int reg_scale =
-         (fcc->dispatch_mode == GEN6_WM_DW5_8_PIXEL_DISPATCH) ? 1 : 2;
+         (fcc->dispatch_mode == GEN6_PS_DISPATCH_8) ? 1 : 2;
 
       /* r3-r26 or r32-r55: barycentric interpolation parameters */
       if (sh->in.barycentric_interpolation_mode &
@@ -1726,7 +1726,7 @@ fs_setup_payloads(struct fs_compile_context *fcc)
          grf++;
       }
 
-      if (fcc->dispatch_mode != GEN6_WM_DW5_32_PIXEL_DISPATCH)
+      if (fcc->dispatch_mode != GEN6_PS_DISPATCH_32)
          break;
    }
 
@@ -1785,10 +1785,10 @@ fs_setup(struct fs_compile_context *fcc,
 
    toy_compiler_init(&fcc->tc, state->info.dev);
 
-   fcc->dispatch_mode = GEN6_WM_DW5_8_PIXEL_DISPATCH;
+   fcc->dispatch_mode = GEN6_PS_DISPATCH_8;
 
    fcc->tc.templ.access_mode = GEN6_ALIGN_1;
-   if (fcc->dispatch_mode == GEN6_WM_DW5_16_PIXEL_DISPATCH) {
+   if (fcc->dispatch_mode == GEN6_PS_DISPATCH_16) {
       fcc->tc.templ.qtr_ctrl = GEN6_QTRCTRL_1H;
       fcc->tc.templ.exec_size = GEN6_EXECSIZE_16;
    }
@@ -1848,7 +1848,7 @@ fs_setup(struct fs_compile_context *fcc,
 
    /* instructions are compressed with GEN6_EXECSIZE_16 */
    fcc->num_grf_per_vrf =
-      (fcc->dispatch_mode == GEN6_WM_DW5_16_PIXEL_DISPATCH) ? 2 : 1;
+      (fcc->dispatch_mode == GEN6_PS_DISPATCH_16) ? 2 : 1;
 
    if (ilo_dev_gen(fcc->tc.dev) >= ILO_GEN(7)) {
       fcc->last_free_grf -= 15;
@@ -1859,7 +1859,7 @@ fs_setup(struct fs_compile_context *fcc,
    fcc->shader->in.start_grf = fcc->first_const_grf;
    fcc->shader->has_kill = fcc->tgsi.uses_kill;
    fcc->shader->dispatch_16 =
-      (fcc->dispatch_mode == GEN6_WM_DW5_16_PIXEL_DISPATCH);
+      (fcc->dispatch_mode == GEN6_PS_DISPATCH_16);
 
    fcc->shader->bt.rt_base = 0;
    fcc->shader->bt.rt_count = fcc->variant->u.fs.num_cbufs;
diff --git a/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c b/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
index b23b68da482..cd6e69bcc4d 100644
--- a/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
+++ b/src/gallium/drivers/ilo/shader/toy_compiler_disasm.c
@@ -901,7 +901,7 @@ disasm_inst_mdesc_sampler_op(const struct disasm_inst *inst, int op)
    case GEN7_MSG_SAMPLER_SAMPLE_D_C:   return "sample_d_c";
    case GEN7_MSG_SAMPLER_SAMPLE_LZ:    return "sample_lz";
    case GEN7_MSG_SAMPLER_SAMPLE_C_LC:  return "sample_c_lc";
-   case GEN7_MSG_SAMPLER_SAMPLE_LD_LZ: return "sample_ld_lz";
+   case GEN7_MSG_SAMPLER_LD_LZ:        return "ld_lz";
    case GEN7_MSG_SAMPLER_LD_MCS:       return "ld_mcs";
    case GEN7_MSG_SAMPLER_LD2DMS:       return "ld2dms";
    case GEN7_MSG_SAMPLER_LD2DSS:       return "ld2dss";
@@ -977,7 +977,7 @@ disasm_inst_mdesc_dp_op_gen7(const struct disasm_inst *inst,
    switch (sfid) {
    case GEN6_SFID_DP_SAMPLER:
       switch (op) {
-      case GEN7_MSG_DP_SAMPLER_OWORD_BLOCK_READ:         return "OWORD block read";
+      case GEN7_MSG_DP_SAMPLER_UNALIGNED_OWORD_BLOCK_READ: return "OWORD block read";
       case GEN7_MSG_DP_SAMPLER_MEDIA_BLOCK_READ:         return "media block read";
       default:                                           return "BAD";
       }
@@ -1582,7 +1582,7 @@ disasm_printer_add_mdesc_dp_rc(struct disasm_printer *printer,
    if (is_rt_write) {
       disasm_printer_add(printer, " %s%s%s%s",
             disasm_inst_mdesc_dp_rt_write_simd_mode(inst, mdesc),
-            (mdesc & GEN6_MSG_DP_SLOTGRP_HI) ? " Hi" : "",
+            (mdesc & GEN6_MSG_DP_RT_SLOTGRP_HI) ? " Hi" : "",
             (mdesc & GEN6_MSG_DP_RT_LAST) ? " LastRT" : "",
             (ilo_dev_gen(inst->dev) == ILO_GEN(6) &&
              (mdesc & GEN6_MSG_DP_SEND_WRITE_COMMIT)) ? " WriteCommit" : "");