Mesa (main): mesa: add pointer to cso_context to gl_context

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Dec 15 14:02:49 UTC 2021


Module: Mesa
Branch: main
Commit: 8232cf1b4debe76307888e4db50fbc040f10374f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8232cf1b4debe76307888e4db50fbc040f10374f

Author: Dave Airlie <airlied at redhat.com>
Date:   Fri Dec 10 05:13:14 2021 +1000

mesa: add pointer to cso_context to gl_context

Makes migrating code easier

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14133>

---

 src/mesa/main/mtypes.h              | 2 +-
 src/mesa/state_tracker/st_context.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 289a3b7906a..7d361ce305e 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -5576,7 +5576,7 @@ struct gl_context
    struct st_context *st;
    struct pipe_context *pipe;
    struct st_config_options *st_opts;
-
+   struct cso_context *cso_context;
    /*@}*/
 
    /**
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 90902079441..6ef02b1aa8e 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -578,6 +578,7 @@ st_create_context_priv(struct gl_context *ctx, struct pipe_context *pipe,
    }
 
    st->cso_context = cso_create_context(pipe, cso_flags);
+   ctx->cso_context = st->cso_context;
 
    st_init_atoms(st);
    st_init_clear(st);



More information about the mesa-commit mailing list