Sketch out new create/destroy context functions which create/wrap a Mesa context.

[mesa.git] / src / mesa / state_tracker / st_context.c

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 8ced3f504c2abfbe1863918d45902ba6e3ac0ba1..1d129ad077d6d3388ff14bd5ac6ccc1c5e0cd9cc 100644 (file)
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -26,8 +26,8 @@
  **************************************************************************/
 
 #include "main/imports.h"
+#include "main/context.h"
 #include "main/extensions.h"
-#include "tnl/tnl.h"
 #include "vbo/vbo.h"
 #include "st_public.h"
 #include "st_context.h"
@@ -51,12 +51,37 @@
 #include "pipe/cso_cache/cso_cache.h"
 
 
+/**
+ * Called via ctx->Driver.UpdateState()
+ */
 void st_invalidate_state(GLcontext * ctx, GLuint new_state)
 {
    struct st_context *st = st_context(ctx);
 
    st->dirty.mesa |= new_state;
    st->dirty.st |= ST_NEW_MESA;
+
+   /* This is the only core Mesa module we depend upon.
+    * No longer use swrast, swsetup, tnl.
+    */
+   _vbo_InvalidateState(ctx, new_state);
+}
+
+
+struct st_context *st_create_context2(struct pipe_context *pipe,
+                                      const GLvisual *visual,
+                                      struct st_context *share)
+{
+   GLcontext *ctx;
+   GLcontext *shareCtx = share ? share->ctx : NULL;
+   struct dd_function_table funcs;
+
+   memset(&funcs, 0, sizeof(funcs));
+   st_init_driver_functions(&funcs);
+
+   ctx = _mesa_create_context(visual, shareCtx, &funcs, NULL);
+
+   return st_create_context(ctx, pipe);
 }
 
 
@@ -70,6 +95,9 @@ struct st_context *st_create_context( GLcontext *ctx,
    st->ctx = ctx;
    st->pipe = pipe;
 
+   /* state tracker needs the VBO module */
+   _vbo_CreateContext(ctx);
+
    st->draw = draw_create(); /* for selection/feedback */
 
    st->dirty.mesa = ~0;
@@ -92,38 +120,36 @@ struct st_context *st_create_context( GLcontext *ctx,
 
    st->haveFramebufferRegions = GL_TRUE;
 
-#if 0
-   st_init_cb_clear( st );
-   st_init_cb_program( st );
-   st_init_cb_drawpixels( st );
-   st_init_cb_texture( st );
-#endif
+   st->pixel_xfer.cache = _mesa_new_program_cache();
 
    /* XXXX This is temporary! */
    _mesa_enable_sw_extensions(ctx);
 
-   /* we'll always do per-pixel fog in the fragment shader */
-   _tnl_allow_vertex_fog(ctx, GL_FALSE);
-
    return st;
 }
 
 
+void st_destroy_context2( struct st_context *st )
+{
+   GLcontext *ctx = st->ctx;
+   _mesa_free_context_data(ctx);
+   st_destroy_context(st);
+   free(ctx);
+}
+
+
 void st_destroy_context( struct st_context *st )
 {
    draw_destroy(st->draw);
    st_destroy_atoms( st );
    st_destroy_draw( st );
 
-#if 0
-   st_destroy_cb_clear( st );
-   st_destroy_cb_program( st );
-   st_destroy_cb_drawpixels( st );
-   /*st_destroy_cb_teximage( st );*/
-   st_destroy_cb_texture( st );
-#endif
+   _vbo_DestroyContext(st->ctx);
+
    cso_cache_delete( st->cache );
 
+   _mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);
+
    st->pipe->destroy( st->pipe );
    FREE( st );
 }
@@ -145,4 +171,6 @@ void st_init_driver_functions(struct dd_function_table *functions)
    st_init_texture_functions(functions);
    st_init_flush_functions(functions);
    st_init_string_functions(functions);
+
+   functions->UpdateState = st_invalidate_state;
 }