diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 24cbd5f7197..289a3b7906a 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -5575,6 +5575,8 @@ struct gl_context
    struct vbo_context vbo_context;
    struct st_context *st;
    struct pipe_context *pipe;
+   struct st_config_options *st_opts;
+
    /*@}*/
 
    /**
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 06f6e1868dc..90902079441 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -546,6 +546,7 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
 
    st->options = *options;
 
+   ctx->st_opts = &st->options;
    ctx->st = st;
 
    st->ctx = ctx;