X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_debug.c;h=2da27fc4bd10d204b364ddd00411fd2317d157ce;hb=fef6e36e0736a68e24d7844bae65a01de8359214;hp=3009cde9d5181c44c08546330121381790570a74;hpb=57e3eb1b178e861dee7695c9a5e1c71a4333192d;p=mesa.git

diff --git a/src/mesa/state_tracker/st_debug.c b/src/mesa/state_tracker/st_debug.c
index 3009cde9d51..2da27fc4bd1 100644
--- a/src/mesa/state_tracker/st_debug.c
+++ b/src/mesa/state_tracker/st_debug.c
@@ -47,6 +47,7 @@ int ST_DEBUG = 0;
 static const struct debug_named_value st_debug_flags[] = {
    { "mesa",     DEBUG_MESA },
    { "tgsi",     DEBUG_TGSI },
+   { "constants",DEBUG_CONSTANTS },
    { "pipe",     DEBUG_PIPE },
    { "tex",      DEBUG_TEX },
    { "fallback", DEBUG_FALLBACK },
@@ -75,7 +76,7 @@ void
 st_print_current(void)
 {
    GET_CURRENT_CONTEXT(ctx);
-   struct st_context *st = ctx->st;
+   struct st_context *st = st_context(ctx);
 
 #if 0
    int i;
@@ -86,11 +87,12 @@ st_print_current(void)
    }
 #endif
 
-   tgsi_dump( st->vp->state.tokens, 0 );
+   if (st->vp->varients)
+      tgsi_dump( st->vp->varients[0].tgsi.tokens, 0 );
    if (st->vp->Base.Base.Parameters)
       _mesa_print_parameter_list(st->vp->Base.Base.Parameters);
 
-   tgsi_dump( st->fp->state.tokens, 0 );
+   tgsi_dump( st->fp->tgsi.tokens, 0 );
    if (st->fp->Base.Base.Parameters)
       _mesa_print_parameter_list(st->fp->Base.Base.Parameters);
 }