summaryrefslogtreecommitdiff
path: root/src/mesa/pipe/p_context.h
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/pipe/p_context.h
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/pipe/p_context.h')
-rw-r--r--src/mesa/pipe/p_context.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index ac6567f009..92670c7733 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -32,10 +32,6 @@
#include "p_state.h"
-/* Kludge:
- */
-extern struct pipe_context *softpipe_create( void );
-
/* Drawing currently kludged up via the existing tnl/ module.
*/
struct vertex_buffer;
@@ -161,7 +157,8 @@ struct pipe_context {
struct pipe_region *dest,
GLuint dest_offset,
GLuint destx, GLuint desty,
- const struct pipe_region *src,
+ struct pipe_region *src, /* don't make this const -
+ need to map/unmap */
GLuint src_offset,
GLuint srcx, GLuint srcy, GLuint width, GLuint height);
@@ -170,14 +167,11 @@ struct pipe_context {
GLuint dst_offset,
GLuint dstx, GLuint dsty,
GLuint width, GLuint height,
- GLuint value, GLuint mask);
+ GLuint value);
struct _DriBufferObject *(*region_buffer)(struct pipe_context *pipe,
struct pipe_region *region,
GLuint flag);
-
- void *screen; /**< temporary */
- void *glctx; /**< temporary */
};