DRI2: report swap events correctly in direct rendered case

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

diff --git a/include/GL/osmesa.h b/include/GL/osmesa.h
index a002dcdacba7795cbee1f40850b1072156bb94e1..56fa23ce81f812cfd956049050769647a3f1640e 100644 (file)
--- a/include/GL/osmesa.h
+++ b/include/GL/osmesa.h
@@ -1,10 +1,8 @@
-/* $Id: osmesa.h,v 1.8 2001/08/28 23:12:37 brianp Exp $ */
-
 /*
  * Mesa 3-D graphics library
- * Version:  3.5.1
+ * Version:  6.5
  * 
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -62,9 +60,9 @@ extern "C" {
 #include <GL/gl.h>
 
 
-#define OSMESA_MAJOR_VERSION 3
+#define OSMESA_MAJOR_VERSION 6
 #define OSMESA_MINOR_VERSION 5
-#define OSMESA_PATCH_VERSION 1
+#define OSMESA_PATCH_VERSION 0
 
 
 
@@ -96,8 +94,8 @@ extern "C" {
 #define OSMESA_HEIGHT          0x21
 #define OSMESA_FORMAT          0x22
 #define OSMESA_TYPE            0x23
-#define OSMESA_MAX_WIDTH       0x24  /* new in 3.5.1 */
-#define OSMESA_MAX_HEIGHT      0x25  /* new in 3.5.1 */
+#define OSMESA_MAX_WIDTH       0x24  /* new in 4.0 */
+#define OSMESA_MAX_HEIGHT      0x25  /* new in 4.0 */
 
 
 typedef struct osmesa_context *OSMesaContext;
@@ -254,6 +252,30 @@ OSMesaGetColorBuffer( OSMesaContext c, GLint *width, GLint *height,
 
 
 
+/**
+ * This typedef is new in Mesa 6.3.
+ */
+typedef void (*OSMESAproc)();
+
+
+/*
+ * Return pointer to the named function.
+ * New in Mesa 4.1
+ * Return OSMESAproc in 6.3.
+ */
+GLAPI OSMESAproc GLAPIENTRY
+OSMesaGetProcAddress( const char *funcName );
+
+
+
+/**
+ * Enable/disable color clamping, off by default.
+ * New in Mesa 6.4.2
+ */
+GLAPI void GLAPIENTRY
+OSMesaColorClamp(GLboolean enable);
+
+
 #if defined(__BEOS__) || defined(__QUICKDRAW__)
 #pragma export off
 #endif