**************************************************************************/
#include "main/imports.h"
+#include "main/context.h"
+#include "main/extensions.h"
#include "vbo/vbo.h"
#include "st_public.h"
#include "st_context.h"
+#include "st_cb_accum.h"
#include "st_cb_bufferobjects.h"
#include "st_cb_clear.h"
#include "st_cb_drawpixels.h"
#include "st_cb_fbo.h"
+#include "st_cb_feedback.h"
#include "st_cb_queryobj.h"
+#include "st_cb_rasterpos.h"
#include "st_cb_readpixels.h"
#include "st_cb_texture.h"
#include "st_cb_flush.h"
#include "st_draw.h"
#include "st_program.h"
#include "pipe/p_context.h"
+#include "pipe/draw/draw_context.h"
+#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);
}
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_init_atoms( st );
st_init_draw( st );
st->ctx->VertexProgram._MaintainTnlProgram = GL_TRUE;
+ st->haveFramebufferRegions = 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
+ /* XXXX This is temporary! */
+ _mesa_enable_sw_extensions(ctx);
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 );
void st_init_driver_functions(struct dd_function_table *functions)
{
+ st_init_accum_functions(functions);
st_init_bufferobject_functions(functions);
st_init_clear_functions(functions);
st_init_drawpixels_functions(functions);
st_init_fbo_functions(functions);
+ st_init_feedback_functions(functions);
st_init_program_functions(functions);
st_init_query_functions(functions);
+ st_init_rasterpos_functions(functions);
st_init_readpixels_functions(functions);
st_init_texture_functions(functions);
st_init_flush_functions(functions);
st_init_string_functions(functions);
+
+ functions->UpdateState = st_invalidate_state;
}