Merge commit 'origin/master' into gallium-0.2

[mesa.git] / src / mesa / main / buffers.h

diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index f9369864b65492177e03e8a1dfe92cc197fbe573..8a7e7b5c1f0e56a21db1e959ffd3e01e5c58d84b 100644 (file)
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -5,9 +5,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  7.1
  *
- * Copyright (C) 1999-2001  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2007  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"),
@@ -36,38 +36,21 @@
 #include "mtypes.h"
 
 
-extern void GLAPIENTRY
-_mesa_ClearIndex( GLfloat c );
-
-extern void GLAPIENTRY
-_mesa_ClearColor( GLclampf red, GLclampf green,
-                  GLclampf blue, GLclampf alpha );
-
-extern void GLAPIENTRY
-_mesa_Clear( GLbitfield mask );
-
 extern void GLAPIENTRY
 _mesa_DrawBuffer( GLenum mode );
 
 extern void GLAPIENTRY
 _mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
 
-extern void GLAPIENTRY
-_mesa_ReadBuffer( GLenum mode );
-
-extern void GLAPIENTRY
-_mesa_ResizeBuffersMESA( void );
+extern void
+_mesa_drawbuffers(GLcontext *ctx, GLuint n, const GLenum *buffers,
+                  const GLbitfield *destMask);
 
-extern void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height );
+extern void
+_mesa_readbuffer(GLcontext *ctx, GLenum buffer, GLint bufferIndex);
 
 extern void GLAPIENTRY
-_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
-
-extern void 
-_mesa_init_buffers( GLcontext * ctx );
+_mesa_ReadBuffer( GLenum mode );
 
-extern void 
-_mesa_update_buffers( GLcontext *ctx );
 
 #endif