From: Marek Olšák <marek.olsak@amd.com>
Date: Wed, 16 Oct 2019 19:59:41 +0000 (-0400)
Subject: st/mesa: rename st_xxx_program::tgsi to state
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=33d53f0614f863049825763e9ceb8505e7e048d8;p=mesa.git

st/mesa: rename st_xxx_program::tgsi to state

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
---

diff --git a/src/mesa/state_tracker/st_debug.c b/src/mesa/state_tracker/st_debug.c
index 7faffb581ef..88a788518a1 100644
--- a/src/mesa/state_tracker/st_debug.c
+++ b/src/mesa/state_tracker/st_debug.c
@@ -93,11 +93,11 @@ st_print_current(void)
 #endif
 
    if (st->vp->variants)
-      tgsi_dump( st->vp->variants[0].tgsi.tokens, 0 );
+      tgsi_dump( st->vp->variants[0].state.tokens, 0 );
    if (st->vp->Base.Parameters)
       _mesa_print_parameter_list(st->vp->Base.Parameters);
 
-   tgsi_dump(st->fp->tgsi.tokens, 0);
+   tgsi_dump(st->fp->state.tokens, 0);
    if (st->fp->Base.Parameters)
       _mesa_print_parameter_list(st->fp->Base.Parameters);
 }
diff --git a/src/mesa/state_tracker/st_draw_feedback.c b/src/mesa/state_tracker/st_draw_feedback.c
index 275e1090735..e0aae5aef44 100644
--- a/src/mesa/state_tracker/st_draw_feedback.c
+++ b/src/mesa/state_tracker/st_draw_feedback.c
@@ -139,7 +139,7 @@ st_feedback_draw_vbo(struct gl_context *ctx,
    /* must get these after state validation! */
    vp = st->vp;
    vp_variant = st->vp_variant;
-   vs = &vp_variant->tgsi;
+   vs = &vp_variant->state;
 
    if (!vp_variant->draw_shader) {
       vp_variant->draw_shader = draw_create_vertex_shader(draw, vs);
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index c0b63ac36f8..4ecaa05797f 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -509,8 +509,8 @@ set_st_program(struct gl_program *prog,
    case MESA_SHADER_VERTEX:
       stvp = (struct st_vertex_program *)prog;
       stvp->shader_program = shader_program;
-      stvp->tgsi.type = PIPE_SHADER_IR_NIR;
-      stvp->tgsi.ir.nir = nir;
+      stvp->state.type = PIPE_SHADER_IR_NIR;
+      stvp->state.ir.nir = nir;
       break;
    case MESA_SHADER_GEOMETRY:
    case MESA_SHADER_TESS_CTRL:
@@ -518,14 +518,14 @@ set_st_program(struct gl_program *prog,
    case MESA_SHADER_COMPUTE:
       stp = (struct st_common_program *)prog;
       stp->shader_program = shader_program;
-      stp->tgsi.type = PIPE_SHADER_IR_NIR;
-      stp->tgsi.ir.nir = nir;
+      stp->state.type = PIPE_SHADER_IR_NIR;
+      stp->state.ir.nir = nir;
       break;
    case MESA_SHADER_FRAGMENT:
       stfp = (struct st_fragment_program *)prog;
       stfp->shader_program = shader_program;
-      stfp->tgsi.type = PIPE_SHADER_IR_NIR;
-      stfp->tgsi.ir.nir = nir;
+      stfp->state.type = PIPE_SHADER_IR_NIR;
+      stfp->state.ir.nir = nir;
       break;
    default:
       unreachable("unknown shader stage");
diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
index fb43cdd2352..fdd3cf1a3fa 100644
--- a/src/mesa/state_tracker/st_program.c
+++ b/src/mesa/state_tracker/st_program.c
@@ -244,7 +244,7 @@ delete_vp_variant(struct st_context *st, struct st_vp_variant *vpv)
    if (vpv->draw_shader)
       draw_delete_vertex_shader( st->draw, vpv->draw_shader );
 
-   delete_ir(&vpv->tgsi);
+   delete_ir(&vpv->state);
 
    free( vpv );
 }
@@ -268,7 +268,7 @@ st_release_vp_variants( struct st_context *st,
 
    stvp->variants = NULL;
 
-   delete_ir(&stvp->tgsi);
+   delete_ir(&stvp->state);
 }
 
 
@@ -309,7 +309,7 @@ st_release_fp_variants(struct st_context *st, struct st_fragment_program *stfp)
 
    stfp->variants = NULL;
 
-   delete_ir(&stfp->tgsi);
+   delete_ir(&stfp->state);
 }
 
 
@@ -383,7 +383,7 @@ st_release_basic_variants(struct st_context *st, struct st_common_program *p)
    }
 
    p->variants = NULL;
-   delete_ir(&p->tgsi);
+   delete_ir(&p->state);
 }
 
 
@@ -470,9 +470,9 @@ st_translate_stream_output_info(struct gl_program *prog)
    /* Translate stream output info. */
    struct pipe_stream_output_info *so_info = NULL;
    if (prog->info.stage == MESA_SHADER_VERTEX)
-      so_info = &((struct st_vertex_program*)prog)->tgsi.stream_output;
+      so_info = &((struct st_vertex_program*)prog)->state.stream_output;
    else
-      so_info = &((struct st_common_program*)prog)->tgsi.stream_output;
+      so_info = &((struct st_common_program*)prog)->state.stream_output;
 
    for (unsigned i = 0; i < info->NumOutputs; i++) {
       so_info->output[i].register_index =
@@ -604,7 +604,7 @@ st_translate_vertex_program(struct st_context *st,
       return false;
    }
 
-   stvp->tgsi.tokens = ureg_get_tokens(ureg, &stvp->num_tgsi_tokens);
+   stvp->state.tokens = ureg_get_tokens(ureg, &stvp->num_tgsi_tokens);
    ureg_destroy(ureg);
 
    if (stvp->glsl_to_tgsi) {
@@ -626,15 +626,15 @@ st_translate_vertex_program(struct st_context *st,
       nir_shader *nir =
          st_translate_prog_to_nir(st, &stvp->Base, MESA_SHADER_VERTEX);
 
-      if (stvp->tgsi.ir.nir)
-         ralloc_free(stvp->tgsi.ir.nir);
-      stvp->tgsi.type = PIPE_SHADER_IR_NIR;
-      stvp->tgsi.ir.nir = nir;
+      if (stvp->state.ir.nir)
+         ralloc_free(stvp->state.ir.nir);
+      stvp->state.type = PIPE_SHADER_IR_NIR;
+      stvp->state.ir.nir = nir;
       stvp->Base.nir = nir;
       return true;
    }
 
-   return stvp->tgsi.tokens != NULL;
+   return stvp->state.tokens != NULL;
 }
 
 static const gl_state_index16 depth_range_state[STATE_LENGTH] =
@@ -653,7 +653,7 @@ st_create_vp_variant(struct st_context *st,
    struct gl_program_parameter_list *params = stvp->Base.Parameters;
 
    vpv->key = *key;
-   vpv->tgsi.stream_output = stvp->tgsi.stream_output;
+   vpv->state.stream_output = stvp->state.stream_output;
    vpv->num_inputs = stvp->num_inputs;
 
    /* When generating a NIR program, we usually don't have TGSI tokens.
@@ -661,22 +661,22 @@ st_create_vp_variant(struct st_context *st,
     * programs which we may need to use with the draw module for legacy
     * feedback/select emulation.  If they exist, copy them.
     */
-   if (stvp->tgsi.tokens)
-      vpv->tgsi.tokens = tgsi_dup_tokens(stvp->tgsi.tokens);
+   if (stvp->state.tokens)
+      vpv->state.tokens = tgsi_dup_tokens(stvp->state.tokens);
 
-   if (stvp->tgsi.type == PIPE_SHADER_IR_NIR) {
-      vpv->tgsi.type = PIPE_SHADER_IR_NIR;
-      vpv->tgsi.ir.nir = nir_shader_clone(NULL, stvp->tgsi.ir.nir);
+   if (stvp->state.type == PIPE_SHADER_IR_NIR) {
+      vpv->state.type = PIPE_SHADER_IR_NIR;
+      vpv->state.ir.nir = nir_shader_clone(NULL, stvp->state.ir.nir);
       if (key->clamp_color)
-         NIR_PASS_V(vpv->tgsi.ir.nir, nir_lower_clamp_color_outputs);
+         NIR_PASS_V(vpv->state.ir.nir, nir_lower_clamp_color_outputs);
       if (key->passthrough_edgeflags) {
-         NIR_PASS_V(vpv->tgsi.ir.nir, nir_lower_passthrough_edgeflags);
+         NIR_PASS_V(vpv->state.ir.nir, nir_lower_passthrough_edgeflags);
          vpv->num_inputs++;
       }
 
       if (key->lower_point_size) {
          _mesa_add_state_reference(params, point_size_state);
-         NIR_PASS_V(vpv->tgsi.ir.nir, nir_lower_point_size_mov,
+         NIR_PASS_V(vpv->state.ir.nir, nir_lower_point_size_mov,
                     point_size_state);
       }
 
@@ -699,18 +699,18 @@ st_create_vp_variant(struct st_context *st,
             _mesa_add_state_reference(params, clipplane_state[i]);
          }
 
-         NIR_PASS_V(vpv->tgsi.ir.nir, nir_lower_clip_vs, key->lower_ucp,
+         NIR_PASS_V(vpv->state.ir.nir, nir_lower_clip_vs, key->lower_ucp,
                     true, can_compact, clipplane_state);
-         NIR_PASS_V(vpv->tgsi.ir.nir, nir_lower_io_to_temporaries,
-                    nir_shader_get_entrypoint(vpv->tgsi.ir.nir), true, false);
+         NIR_PASS_V(vpv->state.ir.nir, nir_lower_io_to_temporaries,
+                    nir_shader_get_entrypoint(vpv->state.ir.nir), true, false);
       }
 
       st_finalize_nir(st, &stvp->Base, stvp->shader_program,
-                      vpv->tgsi.ir.nir);
+                      vpv->state.ir.nir);
 
-      vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->tgsi);
+      vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->state);
       /* driver takes ownership of IR: */
-      vpv->tgsi.ir.nir = NULL;
+      vpv->state.ir.nir = NULL;
       return vpv;
    }
 
@@ -721,11 +721,11 @@ st_create_vp_variant(struct st_context *st,
          (key->clamp_color ? TGSI_EMU_CLAMP_COLOR_OUTPUTS : 0) |
          (key->passthrough_edgeflags ? TGSI_EMU_PASSTHROUGH_EDGEFLAG : 0);
 
-      tokens = tgsi_emulate(vpv->tgsi.tokens, flags);
+      tokens = tgsi_emulate(vpv->state.tokens, flags);
 
       if (tokens) {
-         tgsi_free_tokens(vpv->tgsi.tokens);
-         vpv->tgsi.tokens = tokens;
+         tgsi_free_tokens(vpv->state.tokens);
+         vpv->state.tokens = tokens;
 
          if (key->passthrough_edgeflags)
             vpv->num_inputs++;
@@ -738,19 +738,19 @@ st_create_vp_variant(struct st_context *st,
             _mesa_add_state_reference(params, depth_range_state);
 
       const struct tgsi_token *tokens;
-      tokens = st_tgsi_lower_depth_clamp(vpv->tgsi.tokens, depth_range_const,
+      tokens = st_tgsi_lower_depth_clamp(vpv->state.tokens, depth_range_const,
                                          key->clip_negative_one_to_one);
-      if (tokens != vpv->tgsi.tokens)
-         tgsi_free_tokens(vpv->tgsi.tokens);
-      vpv->tgsi.tokens = tokens;
+      if (tokens != vpv->state.tokens)
+         tgsi_free_tokens(vpv->state.tokens);
+      vpv->state.tokens = tokens;
    }
 
    if (ST_DEBUG & DEBUG_TGSI) {
-      tgsi_dump(vpv->tgsi.tokens, 0);
+      tgsi_dump(vpv->state.tokens, 0);
       debug_printf("\n");
    }
 
-   vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->tgsi);
+   vpv->driver_shader = pipe->create_vs_state(pipe, &vpv->state);
    return vpv;
 }
 
@@ -834,10 +834,10 @@ st_translate_fragment_program(struct st_context *st,
          nir_shader *nir =
             st_translate_prog_to_nir(st, &stfp->Base, MESA_SHADER_FRAGMENT);
 
-         if (stfp->tgsi.ir.nir)
-            ralloc_free(stfp->tgsi.ir.nir);
-         stfp->tgsi.type = PIPE_SHADER_IR_NIR;
-         stfp->tgsi.ir.nir = nir;
+         if (stfp->state.ir.nir)
+            ralloc_free(stfp->state.ir.nir);
+         stfp->state.type = PIPE_SHADER_IR_NIR;
+         stfp->state.ir.nir = nir;
          stfp->Base.nir = nir;
          return true;
       }
@@ -1158,7 +1158,7 @@ st_translate_fragment_program(struct st_context *st,
                                 fs_output_semantic_name,
                                 fs_output_semantic_index);
 
-   stfp->tgsi.tokens = ureg_get_tokens(ureg, &stfp->num_tgsi_tokens);
+   stfp->state.tokens = ureg_get_tokens(ureg, &stfp->num_tgsi_tokens);
    ureg_destroy(ureg);
 
    if (stfp->glsl_to_tgsi) {
@@ -1166,7 +1166,7 @@ st_translate_fragment_program(struct st_context *st,
       st_store_ir_in_disk_cache(st, &stfp->Base, false);
    }
 
-   return stfp->tgsi.tokens != NULL;
+   return stfp->state.tokens != NULL;
 }
 
 static struct st_fp_variant *
@@ -1190,9 +1190,9 @@ st_create_fp_variant(struct st_context *st,
    if (!variant)
       return NULL;
 
-   if (stfp->tgsi.type == PIPE_SHADER_IR_NIR) {
+   if (stfp->state.type == PIPE_SHADER_IR_NIR) {
       tgsi.type = PIPE_SHADER_IR_NIR;
-      tgsi.ir.nir = nir_shader_clone(NULL, stfp->tgsi.ir.nir);
+      tgsi.ir.nir = nir_shader_clone(NULL, stfp->state.ir.nir);
 
       if (key->clamp_color)
          NIR_PASS_V(tgsi.ir.nir, nir_lower_clamp_color_outputs);
@@ -1296,7 +1296,7 @@ st_create_fp_variant(struct st_context *st,
       return variant;
    }
 
-   tgsi.tokens = stfp->tgsi.tokens;
+   tgsi.tokens = stfp->state.tokens;
 
    assert(!(key->bitmap && key->drawpixels));
 
@@ -1320,7 +1320,7 @@ st_create_fp_variant(struct st_context *st,
       tokens = tgsi_emulate(tgsi.tokens, flags);
 
       if (tokens) {
-         if (tgsi.tokens != stfp->tgsi.tokens)
+         if (tgsi.tokens != stfp->state.tokens)
             tgsi_free_tokens(tgsi.tokens);
          tgsi.tokens = tokens;
       } else
@@ -1341,7 +1341,7 @@ st_create_fp_variant(struct st_context *st,
                                     PIPE_FORMAT_R8_UNORM);
 
       if (tokens) {
-         if (tgsi.tokens != stfp->tgsi.tokens)
+         if (tgsi.tokens != stfp->state.tokens)
             tgsi_free_tokens(tgsi.tokens);
          tgsi.tokens = tokens;
       } else
@@ -1379,7 +1379,7 @@ st_create_fp_variant(struct st_context *st,
                                      texcoord_const, st->internal_target);
 
       if (tokens) {
-         if (tgsi.tokens != stfp->tgsi.tokens)
+         if (tgsi.tokens != stfp->state.tokens)
             tgsi_free_tokens(tgsi.tokens);
          tgsi.tokens = tokens;
       } else
@@ -1400,7 +1400,7 @@ st_create_fp_variant(struct st_context *st,
                                     key->external.lower_yx_xuxv,
                                  key->external.lower_iyuv);
       if (tokens) {
-         if (tgsi.tokens != stfp->tgsi.tokens)
+         if (tgsi.tokens != stfp->state.tokens)
             tgsi_free_tokens(tgsi.tokens);
          tgsi.tokens = tokens;
       } else {
@@ -1413,7 +1413,7 @@ st_create_fp_variant(struct st_context *st,
 
       const struct tgsi_token *tokens;
       tokens = st_tgsi_lower_depth_clamp_fs(tgsi.tokens, depth_range_const);
-      if (tgsi.tokens != stfp->tgsi.tokens)
+      if (tgsi.tokens != stfp->state.tokens)
          tgsi_free_tokens(tgsi.tokens);
       tgsi.tokens = tokens;
    }
@@ -1427,7 +1427,7 @@ st_create_fp_variant(struct st_context *st,
    variant->driver_shader = pipe->create_fs_state(pipe, &tgsi);
    variant->key = *key;
 
-   if (tgsi.tokens != stfp->tgsi.tokens)
+   if (tgsi.tokens != stfp->state.tokens)
       tgsi_free_tokens(tgsi.tokens);
    return variant;
 }
@@ -1555,7 +1555,7 @@ st_translate_common_program(struct st_context *st,
    memset(inputSlotToAttr, 0, sizeof(inputSlotToAttr));
    memset(inputMapping, 0, sizeof(inputMapping));
    memset(outputMapping, 0, sizeof(outputMapping));
-   memset(&stcp->tgsi, 0, sizeof(stcp->tgsi));
+   memset(&stcp->state, 0, sizeof(stcp->state));
 
    if (prog->info.clip_distance_array_size)
       ureg_property(ureg, TGSI_PROPERTY_NUM_CLIPDIST_ENABLED,
@@ -1650,7 +1650,7 @@ st_translate_common_program(struct st_context *st,
                         output_semantic_name,
                         output_semantic_index);
 
-   stcp->tgsi.tokens = ureg_get_tokens(ureg, &stcp->num_tgsi_tokens);
+   stcp->state.tokens = ureg_get_tokens(ureg, &stcp->num_tgsi_tokens);
 
    ureg_destroy(ureg);
 
@@ -1664,7 +1664,7 @@ st_translate_common_program(struct st_context *st,
    }
 
    if (ST_DEBUG & DEBUG_TGSI) {
-      tgsi_dump(stcp->tgsi.tokens, 0);
+      tgsi_dump(stcp->state.tokens, 0);
       debug_printf("\n");
    }
 
@@ -1698,14 +1698,14 @@ st_get_basic_variant(struct st_context *st,
       v = CALLOC_STRUCT(st_basic_variant);
       if (v) {
 
-	 if (prog->tgsi.type == PIPE_SHADER_IR_NIR) {
+	 if (prog->state.type == PIPE_SHADER_IR_NIR) {
 	    tgsi.type = PIPE_SHADER_IR_NIR;
-	    tgsi.ir.nir = nir_shader_clone(NULL, prog->tgsi.ir.nir);
+	    tgsi.ir.nir = nir_shader_clone(NULL, prog->state.ir.nir);
 
             if (key->clamp_color)
                NIR_PASS_V(tgsi.ir.nir, nir_lower_clamp_color_outputs);
 
-            tgsi.stream_output = prog->tgsi.stream_output;
+            tgsi.stream_output = prog->state.stream_output;
 
             st_finalize_nir(st, &prog->Base, prog->shader_program,
                             tgsi.ir.nir);
@@ -1718,17 +1718,17 @@ st_get_basic_variant(struct st_context *st,
 
                const struct tgsi_token *tokens;
                tokens =
-                     st_tgsi_lower_depth_clamp(prog->tgsi.tokens,
+                     st_tgsi_lower_depth_clamp(prog->state.tokens,
                                                depth_range_const,
                                                key->clip_negative_one_to_one);
 
-               if (tokens != prog->tgsi.tokens)
-                  tgsi_free_tokens(prog->tgsi.tokens);
+               if (tokens != prog->state.tokens)
+                  tgsi_free_tokens(prog->state.tokens);
 
-               prog->tgsi.tokens = tokens;
+               prog->state.tokens = tokens;
                prog->num_tgsi_tokens = tgsi_num_tokens(tokens);
             }
-	    tgsi = prog->tgsi;
+	    tgsi = prog->state;
          }
          /* fill in new variant */
          switch (prog->Base.info.stage) {
@@ -1943,7 +1943,7 @@ st_print_current_vertex_program(void)
 
       for (stv = stvp->variants; stv; stv = stv->next) {
          debug_printf("variant %p\n", stv);
-         tgsi_dump(stv->tgsi.tokens, 0);
+         tgsi_dump(stv->state.tokens, 0);
       }
    }
 }
diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h
index b26ae810937..2319115534d 100644
--- a/src/mesa/state_tracker/st_program.h
+++ b/src/mesa/state_tracker/st_program.h
@@ -168,7 +168,7 @@ struct st_fp_variant
 struct st_fragment_program
 {
    struct gl_program Base;
-   struct pipe_shader_state tgsi;
+   struct pipe_shader_state state;
    struct glsl_to_tgsi_visitor* glsl_to_tgsi;
    struct ati_fragment_shader *ati_fs;
    uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */
@@ -217,10 +217,10 @@ struct st_vp_variant
    struct st_vp_variant_key key;
 
    /**
-    * TGSI tokens (to later generate a 'draw' module shader for
-    * selection/feedback/rasterpos)
+    * The shader variant saved for the draw module to later emulate
+    * selection/feedback/rasterpos.
     */
-   struct pipe_shader_state tgsi;
+   struct pipe_shader_state state;
 
    /** Driver's compiled shader */
    void *driver_shader;
@@ -245,7 +245,7 @@ struct st_vp_variant
 struct st_vertex_program
 {
    struct gl_program Base;  /**< The Mesa vertex program */
-   struct pipe_shader_state tgsi;
+   struct pipe_shader_state state;
    struct glsl_to_tgsi_visitor* glsl_to_tgsi;
    uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */
 
@@ -309,7 +309,7 @@ struct st_basic_variant
 struct st_common_program
 {
    struct gl_program Base;
-   struct pipe_shader_state tgsi;
+   struct pipe_shader_state state;
    struct glsl_to_tgsi_visitor* glsl_to_tgsi;
    uint64_t affected_states; /**< ST_NEW_* flags to mark dirty when binding */
 
diff --git a/src/mesa/state_tracker/st_shader_cache.c b/src/mesa/state_tracker/st_shader_cache.c
index c149e2c14f0..eb0695c501a 100644
--- a/src/mesa/state_tracker/st_shader_cache.c
+++ b/src/mesa/state_tracker/st_shader_cache.c
@@ -93,12 +93,12 @@ st_serialise_ir_program(struct gl_context *ctx, struct gl_program *prog,
       blob_write_bytes(&blob, stvp->result_to_output,
                        sizeof(stvp->result_to_output));
 
-      write_stream_out_to_cache(&blob, &stvp->tgsi);
+      write_stream_out_to_cache(&blob, &stvp->state);
 
       if (nir)
          write_nir_to_cache(&blob, prog);
       else
-         write_tgsi_to_cache(&blob, stvp->tgsi.tokens, prog,
+         write_tgsi_to_cache(&blob, stvp->state.tokens, prog,
                              stvp->num_tgsi_tokens);
       break;
    }
@@ -110,12 +110,12 @@ st_serialise_ir_program(struct gl_context *ctx, struct gl_program *prog,
 
       if (prog->info.stage == MESA_SHADER_TESS_EVAL ||
           prog->info.stage == MESA_SHADER_GEOMETRY)
-         write_stream_out_to_cache(&blob, &stcp->tgsi);
+         write_stream_out_to_cache(&blob, &stcp->state);
 
       if (nir)
          write_nir_to_cache(&blob, prog);
       else
-         write_tgsi_to_cache(&blob, stcp->tgsi.tokens, prog,
+         write_tgsi_to_cache(&blob, stcp->state.tokens, prog,
                              stcp->num_tgsi_tokens);
       break;
    }
@@ -125,7 +125,7 @@ st_serialise_ir_program(struct gl_context *ctx, struct gl_program *prog,
       if (nir)
          write_nir_to_cache(&blob, prog);
       else
-         write_tgsi_to_cache(&blob, stfp->tgsi.tokens, prog,
+         write_tgsi_to_cache(&blob, stfp->state.tokens, prog,
                              stfp->num_tgsi_tokens);
       break;
    }
@@ -210,15 +210,15 @@ st_deserialise_ir_program(struct gl_context *ctx,
       blob_copy_bytes(&blob_reader, (uint8_t *) stvp->result_to_output,
                       sizeof(stvp->result_to_output));
 
-      read_stream_out_from_cache(&blob_reader, &stvp->tgsi);
+      read_stream_out_from_cache(&blob_reader, &stvp->state);
 
       if (nir) {
-         stvp->tgsi.type = PIPE_SHADER_IR_NIR;
+         stvp->state.type = PIPE_SHADER_IR_NIR;
          stvp->shader_program = shProg;
-         stvp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader);
-         prog->nir = stvp->tgsi.ir.nir;
+         stvp->state.ir.nir = nir_deserialize(NULL, options, &blob_reader);
+         prog->nir = stvp->state.ir.nir;
       } else {
-         read_tgsi_from_cache(&blob_reader, &stvp->tgsi.tokens,
+         read_tgsi_from_cache(&blob_reader, &stvp->state.tokens,
                               &stvp->num_tgsi_tokens);
       }
 
@@ -237,15 +237,15 @@ st_deserialise_ir_program(struct gl_context *ctx,
 
       if (prog->info.stage == MESA_SHADER_TESS_EVAL ||
           prog->info.stage == MESA_SHADER_GEOMETRY)
-         read_stream_out_from_cache(&blob_reader, &stcp->tgsi);
+         read_stream_out_from_cache(&blob_reader, &stcp->state);
 
       if (nir) {
-         stcp->tgsi.type = PIPE_SHADER_IR_NIR;
-         stcp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader);
+         stcp->state.type = PIPE_SHADER_IR_NIR;
+         stcp->state.ir.nir = nir_deserialize(NULL, options, &blob_reader);
          stcp->shader_program = shProg;
-         prog->nir = stcp->tgsi.ir.nir;
+         prog->nir = stcp->state.ir.nir;
       } else {
-         read_tgsi_from_cache(&blob_reader, &stcp->tgsi.tokens,
+         read_tgsi_from_cache(&blob_reader, &stcp->state.tokens,
                               &stcp->num_tgsi_tokens);
       }
 
@@ -262,12 +262,12 @@ st_deserialise_ir_program(struct gl_context *ctx,
       st_release_fp_variants(st, stfp);
 
       if (nir) {
-         stfp->tgsi.type = PIPE_SHADER_IR_NIR;
+         stfp->state.type = PIPE_SHADER_IR_NIR;
          stfp->shader_program = shProg;
-         stfp->tgsi.ir.nir = nir_deserialize(NULL, options, &blob_reader);
-         prog->nir = stfp->tgsi.ir.nir;
+         stfp->state.ir.nir = nir_deserialize(NULL, options, &blob_reader);
+         prog->nir = stfp->state.ir.nir;
       } else {
-         read_tgsi_from_cache(&blob_reader, &stfp->tgsi.tokens,
+         read_tgsi_from_cache(&blob_reader, &stfp->state.tokens,
                               &stfp->num_tgsi_tokens);
       }