i965: switch vs over to shared shader_info

Note we access shader_info from the program struct rather than the
nir_shader pointer because shader cache won't create a nir_shader.

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index a2e044275afe8e261c980d606a63a442beae6173..92a500cfc00b78c731b6a410708ce51c0406b487 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -302,7 +302,7 @@ brw_merge_inputs(struct brw_context *brw,
    }
 
    if (brw->gen < 8 && !brw->is_haswell) {
-      uint64_t mask = ctx->VertexProgram._Current->Base.nir->info->inputs_read;
+      uint64_t mask = ctx->VertexProgram._Current->Base.info.inputs_read;
       /* Prior to Haswell, the hardware can't natively support GL_FIXED or
        * 2_10_10_10_REV vertex formats.  Set appropriate workaround flags.
        */

diff --git a/src/mesa/drivers/dri/i965/brw_vs.c b/src/mesa/drivers/dri/i965/brw_vs.c
index f24a2eeb5536ee56cdd53854364dd01778344315..a7f89f390ddff32f1e9901f4bc5384bb5a6fffae 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_vs.c
+++ b/src/mesa/drivers/dri/i965/brw_vs.c
@@ -150,9 +150,8 @@ brw_codegen_vs_prog(struct brw_context *brw,
    }
 
    uint64_t outputs_written =
-      brw_vs_outputs_written(brw, key,
-                             vp->program.Base.nir->info->outputs_written);
-   prog_data.inputs_read = vp->program.Base.nir->info->inputs_read;
+      brw_vs_outputs_written(brw, key, vp->program.Base.info.outputs_written);
+   prog_data.inputs_read = vp->program.Base.info.inputs_read;
 
    if (key->copy_edgeflag) {
       prog_data.inputs_read |= VERT_BIT_EDGEFLAG;