ilo: update genhw headers

Add some new registers and some tweaks.  The changes that affect ilo are

 GEN6_REG_HS_INVOCATION_COUNT -> GEN7_REG_HS_INVOCATION_COUNT
 GEN6_REG_DS_INVOCATION_COUNT -> GEN7_REG_DS_INVOCATION_COUNT
 GEN6_COND_NORMAL             -> GEN6_COND_NONE

4 files changed, 10 insertions, 10 deletions

diff --git a/src/gallium/drivers/ilo/shader/toy_compiler.c b/src/gallium/drivers/ilo/shader/toy_compiler.c
index 6e9dac1bf50..a3e0897f997 100644
--- a/src/gallium/drivers/ilo/shader/toy_compiler.c
+++ b/src/gallium/drivers/ilo/shader/toy_compiler.c
@@ -407,7 +407,7 @@ get_cond_modifier_name(unsigned opcode, unsigned cond_modifier)
       break;
    default:
       switch (cond_modifier) {
-      case GEN6_COND_NORMAL:                return NULL;
+      case GEN6_COND_NONE:                return NULL;
       case GEN6_COND_Z:                   return "z";
       case GEN6_COND_NZ:                  return "nz";
       case GEN6_COND_G:                   return "g";
@@ -515,7 +515,7 @@ tc_init_inst_templ(struct toy_compiler *tc)
    templ->pred_ctrl = GEN6_PREDCTRL_NONE;
    templ->pred_inv = false;
    templ->exec_size = GEN6_EXECSIZE_1;
-   templ->cond_modifier = GEN6_COND_NORMAL;
+   templ->cond_modifier = GEN6_COND_NONE;
    templ->acc_wr_ctrl = false;
    templ->saturate = false;
 
diff --git a/src/gallium/drivers/ilo/shader/toy_legalize.c b/src/gallium/drivers/ilo/shader/toy_legalize.c
index d632a57da1c..6530c4b6947 100644
--- a/src/gallium/drivers/ilo/shader/toy_legalize.c
+++ b/src/gallium/drivers/ilo/shader/toy_legalize.c
@@ -45,7 +45,7 @@ toy_compiler_lower_to_send(struct toy_compiler *tc, struct toy_inst *inst,
    /* thread control is reserved */
    assert(inst->thread_ctrl == 0);
 
-   assert(inst->cond_modifier == GEN6_COND_NORMAL);
+   assert(inst->cond_modifier == GEN6_COND_NONE);
    inst->cond_modifier = sfid;
 }
 
@@ -98,7 +98,7 @@ toy_compiler_lower_math(struct toy_compiler *tc, struct toy_inst *inst)
    }
 
    /* FC[0:3] */
-   assert(inst->cond_modifier == GEN6_COND_NORMAL);
+   assert(inst->cond_modifier == GEN6_COND_NONE);
    inst->cond_modifier = math_op_to_func(inst->opcode);
    /* FC[4:5] */
    assert(inst->thread_ctrl == 0);
@@ -567,7 +567,7 @@ toy_compiler_legalize_for_asm(struct toy_compiler *tc)
          break;
       case GEN6_OPCODE_IF:
          if (tc->dev->gen >= ILO_GEN(7) &&
-             inst->cond_modifier != GEN6_COND_NORMAL) {
+             inst->cond_modifier != GEN6_COND_NONE) {
             struct toy_inst *inst2;
 
             inst2 = tc_duplicate_inst(tc, inst);
@@ -579,7 +579,7 @@ toy_compiler_legalize_for_asm(struct toy_compiler *tc)
             inst2->dst = tdst_null();
             inst2->src[0] = tsrc_null();
             inst2->src[1] = tsrc_null();
-            inst2->cond_modifier = GEN6_COND_NORMAL;
+            inst2->cond_modifier = GEN6_COND_NONE;
             inst2->pred_ctrl = GEN6_PREDCTRL_NORMAL;
 
             pc++;
diff --git a/src/gallium/drivers/ilo/shader/toy_optimize.c b/src/gallium/drivers/ilo/shader/toy_optimize.c
index 97a04c88632..86fab967cfc 100644
--- a/src/gallium/drivers/ilo/shader/toy_optimize.c
+++ b/src/gallium/drivers/ilo/shader/toy_optimize.c
@@ -55,7 +55,7 @@ eliminate_dead_code(struct toy_compiler *tc)
          if (tdst_is_null(inst->dst) || !inst->dst.writemask) {
             /* math is always GEN6_COND_NORMAL */
             if ((inst->opcode == GEN6_OPCODE_MATH ||
-                 inst->cond_modifier == GEN6_COND_NORMAL) &&
+                 inst->cond_modifier == GEN6_COND_NONE) &&
                 !inst->acc_wr_ctrl)
                tc_discard_inst(tc, inst);
          }
diff --git a/src/gallium/drivers/ilo/shader/toy_tgsi.c b/src/gallium/drivers/ilo/shader/toy_tgsi.c
index 08fb10b9273..7c74bad28fc 100644
--- a/src/gallium/drivers/ilo/shader/toy_tgsi.c
+++ b/src/gallium/drivers/ilo/shader/toy_tgsi.c
@@ -111,7 +111,7 @@ aos_simple(struct toy_compiler *tc,
 {
    struct toy_inst *inst;
    int opcode;
-   int cond_modifier = GEN6_COND_NORMAL;
+   int cond_modifier = GEN6_COND_NONE;
    int num_dst = tgsi_inst->Instruction.NumDstRegs;
    int num_src = tgsi_inst->Instruction.NumSrcRegs;
    int i;
@@ -284,7 +284,7 @@ aos_compare(struct toy_compiler *tc,
    }
 
    tc_CMP(tc, tdst_null(), src[0], zero, GEN6_COND_L);
-   inst = tc_SEL(tc, dst[0], src[1], src[2], GEN6_COND_NORMAL);
+   inst = tc_SEL(tc, dst[0], src[1], src[2], GEN6_COND_NONE);
    inst->pred_ctrl = GEN6_PREDCTRL_NORMAL;
 }
 
@@ -579,7 +579,7 @@ aos_CND(struct toy_compiler *tc,
    assert(!"CND untested");
 
    tc_CMP(tc, tdst_null(), src[2], tsrc_imm_f(0.5f), GEN6_COND_G);
-   inst = tc_SEL(tc, dst[0], src[0], src[1], GEN6_COND_NORMAL);
+   inst = tc_SEL(tc, dst[0], src[0], src[1], GEN6_COND_NONE);
    inst->pred_ctrl = GEN6_PREDCTRL_NORMAL;
 }