X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_context.c;h=d9e8722976444e028f727366c90ce9c3c074f48d;hb=f6cd3778c54c0329c3f497a7368a158087d653d3;hp=c7398233d8a28b1e7d1485bd48fb3bfc5cd1552a;hpb=d6a739f6b0658414a81715bf690159f7cfdb4961;p=mesa.git

diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index c7398233d8a..d9e87229764 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,12 +26,17 @@
  **************************************************************************/
 
 #include "main/imports.h"
+#include "main/context.h"
 #include "main/extensions.h"
-#include "tnl/tnl.h"
+#include "main/matrix.h"
+#include "main/buffers.h"
 #include "vbo/vbo.h"
+#include "shader/shader_api.h"
 #include "st_public.h"
 #include "st_context.h"
 #include "st_cb_accum.h"
+#include "st_cb_bitmap.h"
+#include "st_cb_blit.h"
 #include "st_cb_bufferobjects.h"
 #include "st_cb_clear.h"
 #include "st_cb_drawpixels.h"
@@ -45,24 +50,38 @@
 #include "st_cb_strings.h"
 #include "st_atom.h"
 #include "st_draw.h"
+#include "st_extensions.h"
+#include "st_gen_mipmap.h"
 #include "st_program.h"
 #include "pipe/p_context.h"
-#include "pipe/draw/draw_context.h"
-#include "pipe/cso_cache/cso_cache.h"
+#include "pipe/p_winsys.h"
+#include "pipe/p_inlines.h"
+#include "draw/draw_context.h"
+#include "cso_cache/cso_cache.h"
+#include "cso_cache/cso_context.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_context( GLcontext *ctx,
-				      struct pipe_context *pipe )
+static struct st_context *
+st_create_context_priv( GLcontext *ctx, struct pipe_context *pipe )
 {
+   uint i;
    struct st_context *st = CALLOC_STRUCT( st_context );
    
    ctx->st = st;
@@ -70,15 +89,23 @@ 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;
    st->dirty.st = ~0;
 
-   st->cache = cso_cache_create();
+   st->cso_context = cso_create_context(pipe);
 
    st_init_atoms( st );
    st_init_draw( st );
+   st_init_generate_mipmap(st);
+   st_init_blit(st);
+
+   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
+      st->state.sampler_list[i] = &st->state.samplers[i];
 
    /* we want all vertex data to be placed in buffer objects */
    vbo_use_buffer_objects(ctx);
@@ -90,53 +117,114 @@ struct st_context *st_create_context( GLcontext *ctx,
 
    st->ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
 
-   st->haveFramebufferRegions = GL_TRUE;
+   st->haveFramebufferSurfaces = GL_TRUE;
 
    st->pixel_xfer.cache = _mesa_new_program_cache();
 
-#if 0
-   st_init_cb_clear( st );
-   st_init_cb_program( st );
-   st_init_cb_drawpixels( st );
-   st_init_cb_texture( st );
-#endif
+   /* GL limits and extensions */
+   st_init_limits(st);
+   st_init_extensions(st);
 
-   /* XXXX This is temporary! */
-   _mesa_enable_sw_extensions(ctx);
+   return st;
+}
 
-   /* we'll always do per-pixel fog in the fragment shader */
-   _tnl_allow_vertex_fog(ctx, GL_FALSE);
 
-   return st;
+struct st_context *st_create_context(struct pipe_context *pipe,
+                                     const __GLcontextModes *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_priv(ctx, pipe);
 }
 
 
-void st_destroy_context( struct st_context *st )
+static void st_destroy_context_priv( struct st_context *st )
 {
+   struct pipe_winsys *ws = st->pipe->winsys;
+   uint i;
+
    draw_destroy(st->draw);
    st_destroy_atoms( st );
    st_destroy_draw( st );
+   st_destroy_generate_mipmap(st);
+   st_destroy_bitmap(st);
+   st_destroy_blit(st);
+   st_destroy_clear(st);
+
+   _vbo_DestroyContext(st->ctx);
 
-#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
-   cso_cache_delete( st->cache );
+   cso_destroy_context(st->cso_context);
 
    _mesa_delete_program_cache(st->ctx, st->pixel_xfer.cache);
 
+   for (i = 0; i < Elements(st->state.constants); i++) {
+      if (st->state.constants[i].buffer) {
+         pipe_buffer_reference(ws, &st->state.constants[i].buffer, NULL);
+      }
+   }
+
    st->pipe->destroy( st->pipe );
-   FREE( st );
+   free( st );
 }
 
  
+void st_destroy_context( struct st_context *st )
+{
+   GLcontext *ctx = st->ctx;
+   _mesa_free_context_data(ctx);
+   st_destroy_context_priv(st);
+   free(ctx);
+}
+
+
+void st_make_current(struct st_context *st,
+                     struct st_framebuffer *draw,
+                     struct st_framebuffer *read)
+{
+   if (st) {
+      GLboolean firstTime = st->ctx->FirstTimeCurrent;
+      _mesa_make_current(st->ctx, &draw->Base, &read->Base);
+      /* Need to initialize viewport here since draw->Base->Width/Height
+       * will still be zero at this point.
+       * This could be improved, but would require rather extensive work
+       * elsewhere (allocate rb surface storage sooner)
+       */
+      if (firstTime) {
+         GLuint w = draw->InitWidth, h = draw->InitHeight;
+         _mesa_set_viewport(st->ctx, 0, 0, w, h);
+         _mesa_set_scissor(st->ctx, 0, 0, w, h);
+
+      }
+   }
+   else {
+      _mesa_make_current(NULL, NULL, NULL);
+   }
+}
+
+
+void st_copy_context_state(struct st_context *dst,
+                           struct st_context *src,
+                           uint mask)
+{
+   _mesa_copy_context(dst->ctx, src->ctx, mask);
+}
+
 
 void st_init_driver_functions(struct dd_function_table *functions)
 {
+   _mesa_init_glsl_driver_functions(functions);
+
    st_init_accum_functions(functions);
+   st_init_bitmap_functions(functions);
+   st_init_blit_functions(functions);
    st_init_bufferobject_functions(functions);
    st_init_clear_functions(functions);
    st_init_drawpixels_functions(functions);
@@ -149,4 +237,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;
 }