Implemented support for the HP occlusion test extension (osmesa and X)

2 files changed, 26 insertions, 21 deletions

diff --git a/include/GL/gl.h b/include/GL/gl.h
index b211ebd88a..b22295ec33 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -1,4 +1,4 @@
-/* $Id: gl.h,v 1.35 2000/03/23 16:54:50 brianp Exp $ */
+/* $Id: gl.h,v 1.36 2000/03/28 16:59:39 rjfrank Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -2095,6 +2095,16 @@ GLAPI void GLAPIENTRY glUnlockArraysEXT( void );
 
 #endif /* GL_EXT_compiled_vertex_array */
 
+/*
+ * 137. GL_HP_occlusion_test
+ */
+#ifndef GL_HP_occlusion_test
+#define GL_HP_occlusion_test 1
+
+#define GL_OCCLUSION_TEST_HP                    0x8165
+#define GL_OCCLUSION_TEST_RESULT_HP             0x8166
+
+#endif /* GL_HP_occlusion_test */
 
 
 /*
diff --git a/include/GL/osmesa.h b/include/GL/osmesa.h
index ac66e77e85..9746d74f91 100644
--- a/include/GL/osmesa.h
+++ b/include/GL/osmesa.h
@@ -1,4 +1,4 @@
-/* $Id: osmesa.h,v 1.4 2000/01/18 17:29:18 brianp Exp $ */
+/* $Id: osmesa.h,v 1.5 2000/03/28 16:59:39 rjfrank Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -96,15 +96,6 @@ extern "C" {
 #define OSMESA_TYPE		0x23
 
 
-/*
- * Accepted by OSMesaGetBooleanv:
- * New in version 3.3
- */
-/* This is based on the HP proposed extension */
-#define OSMESA_OCCLUSION_TEST_RESULT_HP	0x30
-
-
-
 typedef struct osmesa_context *OSMesaContext;
 
 
@@ -212,16 +203,6 @@ GLAPI void GLAPIENTRY OSMesaGetIntegerv( GLint pname, GLint *value );
 
 
 /*
- * Return a boolean value like glGetBooleanv.
- * Input:  pname -
- *                 OSMESA_OCCLUSION_TEST_RESULT_HP  return current test result
- *         value - pointer to boolean in which to return result.
- */
-GLAPI void GLAPIENTRY OSMesaGetBooleanv( GLint pname, GLboolean *value );
-
-
-
-/*
  * Return the depth buffer associated with an OSMesa context.
  * Input:  c - the OSMesa context
  * Output:  width, height - size of buffer in pixels
@@ -237,6 +218,20 @@ GLAPI GLboolean GLAPIENTRY OSMesaGetDepthBuffer( OSMesaContext c,
                                                  void **buffer );
 
 
+/*
+ * Return the color buffer associated with an OSMesa context.
+ * Input:  c - the OSMesa context
+ * Output:  width, height - size of buffer in pixels
+ *          format - buffer format (OSMESA_FORMAT)
+ *          buffer - pointer to depth buffer values
+ * Return:  GL_TRUE or GL_FALSE to indicate success or failure.
+ *
+ * New in Mesa 3.3.
+ */
+GLAPI GLboolean GLAPIENTRY OSMesaGetColorBuffer( OSMesaContext c,
+                                                 GLint *width, GLint *height,
+                                                 GLint *format,
+                                                 void **buffer );
 
 
 #if defined(__BEOS__) || defined(__QUICKDRAW__)