Merge branch 'gallium-noconstbuf'

[mesa.git] / include / GL / dmesa.h

diff --git a/include/GL/dmesa.h b/include/GL/dmesa.h
index 8d4c5bd645d643d503aecae7b5e275daee5b5170..358082e3ea1e1f509d3f0442749fc268558928c5 100644 (file)
--- a/include/GL/dmesa.h
+++ b/include/GL/dmesa.h
@@ -23,9 +23,9 @@
  */
 
 /*
- * DOS/DJGPP device driver v1.6 for Mesa
+ * DOS/DJGPP device driver for Mesa
  *
- *  Copyright (C) 2002 - Borca Daniel
+ *  Author: Daniel Borca
  *  Email : dborca@users.sourceforge.net
  *  Web   : http://www.geocities.com/dborca
  */
@@ -35,7 +35,7 @@
 #define DMESA_H_included
 
 #define DMESA_MAJOR_VERSION 6
-#define DMESA_MINOR_VERSION 1
+#define DMESA_MINOR_VERSION 5
 
 /* Sample Usage:
  *
@@ -90,7 +90,7 @@ void DMesaDestroyContext (DMesaContext c);
 /*
  * Return a handle to the current context.
  */
-void *DMesaGetCurrentContext (void);
+DMesaContext DMesaGetCurrentContext (void);
 
 
 
@@ -106,6 +106,11 @@ DMesaBuffer DMesaCreateBuffer (DMesaVisual visual,
  */
 void DMesaDestroyBuffer (DMesaBuffer b);
 
+/*
+ * Return a handle to the current buffer.
+ */
+DMesaBuffer DMesaGetCurrentBuffer (void);
+
 /*
  * Swap the front and back buffers for the given Buffer.
  * No action is taken if the buffer is not double buffered.
@@ -133,7 +138,8 @@ void DMesaSetCI (int ndx, GLfloat red, GLfloat green, GLfloat blue);
 /*
  * DMesa functions
  */
-void *DMesaGetProcAddress (const char *name);
+typedef void (*DMesaProc) ();
+DMesaProc DMesaGetProcAddress (const char *name);
 
 /*
  * DMesa state retrieval.
@@ -143,8 +149,8 @@ void *DMesaGetProcAddress (const char *name);
 #define DMESA_GET_VIDEO_MODES 0x0300
 #define DMESA_GET_BUFFER_ADDR 0x0400
 
-#define DMESA_DRIVER_SWDB_BIT 0x1 /* software double-buffered */
-#define DMESA_DRIVER_LLWO_BIT 0x2 /* lower-left window origin */
+#define DMESA_DRIVER_DBL_BIT 0x1 /* double-buffered */
+#define DMESA_DRIVER_YUP_BIT 0x2 /* lower-left window origin */
 int DMesaGetIntegerv (GLenum pname, GLint *params);
 
 #ifdef __cplusplus