summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i915pipe/intel_context.c
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2007-08-05 17:23:38 +0100
committerKeith Whitwell <keith@tungstengraphics.com>2007-08-05 17:25:36 +0100
commit1d1b9e6be45e75ad12a01c82e3c0d55ff9da4183 (patch)
treece6fc42afb3c1bdc9224309052f444776cf56ad5 /src/mesa/drivers/dri/i915pipe/intel_context.c
parent5e7921b77874ce0142f0ab032c710a379d86ff09 (diff)
Add a new interface between softpipe and the window system / buffer manager.
This interface is defined by softpipe and any window system (eg i915pipe) wishing to use softpipe is required to implement the interface. Currently the interface is all about buffer management. Generalizing, each pipe driver will advertise an interface in a similar spirit to this, and again any window system driver wishing to use that rendering pipeline will have to implement the interface it defines. It clearly isn't a one-way street however, as softpipe could just do its own buffer management with malloc. The interaction with a buffer manager is desired to allow us to exercise the hardware swapbuffers functionality of the i915pipe driver, and also to get a feel for the way hardware drivers which really need a buffer manager will work.
Diffstat (limited to 'src/mesa/drivers/dri/i915pipe/intel_context.c')
-rw-r--r--src/mesa/drivers/dri/i915pipe/intel_context.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/i915pipe/intel_context.c
index ac04d4e8c2..d43b784112 100644
--- a/src/mesa/drivers/dri/i915pipe/intel_context.c
+++ b/src/mesa/drivers/dri/i915pipe/intel_context.c
@@ -54,11 +54,9 @@
#include "intel_buffer_objects.h"
#include "intel_fbo.h"
-#include "pipe/softpipe/sp_context.h"
#include "state_tracker/st_public.h"
#include "state_tracker/st_context.h"
-
#include "drirenderbuffer.h"
#include "vblank.h"
#include "utils.h"
@@ -366,7 +364,7 @@ intelCreateContext(const __GLcontextModes * mesaVis,
* Pipe-related setup
*/
st_create_context( &intel->ctx,
- softpipe_create() );
+ intel_create_softpipe( intel ) );
/* KW: Not sure I like this - we should only be talking to the
* state_tracker. The pipe code will need some way of talking to
@@ -375,9 +373,9 @@ intelCreateContext(const __GLcontextModes * mesaVis,
* BP: Yes, a temporary hack so we can make jumps between old/new code.
*/
intel->pipe = intel->ctx.st->pipe;
- intel->pipe->screen = intelScreen;
- intel->pipe->glctx = ctx;
- intel_init_region_functions(intel->pipe);
+// intel->pipe->screen = intelScreen;
+// intel->pipe->glctx = ctx;
+// intel_init_region_functions(intel->pipe);
/*
* memory pools