X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fpixel.h;h=c12ef97b8fd3a7193d99ef7b4e6c3ca79bccb896;hb=457d40e9e880b410bf9f43b15c1927000ab3f440;hp=cb6c5262a396f55803c36cc5eea451b16f9cf5c2;hpb=dd90d304f2751cbd3ca9a961c8e54d37aaa47d91;p=mesa.git

diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index cb6c5262a39..c12ef97b8fd 100644
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -1,6 +1,5 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.1
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
@@ -17,9 +16,10 @@
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
- * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
  */
 
 
@@ -33,48 +33,44 @@
 #define PIXEL_H
 
 
-#include "mtypes.h"
+#include "compiler.h"
+#include "glheader.h"
 
+struct _glapi_table;
+struct gl_context;
 
-/** \name API functions */
-/*@{*/
 
-extern void GLAPIENTRY
-_mesa_GetPixelMapfv( GLenum map, GLfloat *values );
-
-extern void GLAPIENTRY
-_mesa_GetPixelMapuiv( GLenum map, GLuint *values );
-
-extern void GLAPIENTRY
-_mesa_GetPixelMapusv( GLenum map, GLushort *values );
-
-extern void GLAPIENTRY
+void GLAPIENTRY
+_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
+void GLAPIENTRY
 _mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values );
-
-extern void GLAPIENTRY
+void GLAPIENTRY
 _mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values );
-
-extern void GLAPIENTRY
+void GLAPIENTRY
 _mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values );
-
-extern void GLAPIENTRY
-_mesa_PixelTransferf( GLenum pname, GLfloat param );
-
-extern void GLAPIENTRY
+void GLAPIENTRY
+_mesa_GetnPixelMapfvARB( GLenum map, GLsizei bufSize, GLfloat *values );
+void GLAPIENTRY
+_mesa_GetPixelMapfv( GLenum map, GLfloat *values );
+void GLAPIENTRY
+_mesa_GetnPixelMapuivARB( GLenum map, GLsizei bufSize, GLuint *values );
+void GLAPIENTRY
+_mesa_GetPixelMapuiv( GLenum map, GLuint *values );
+void GLAPIENTRY
+_mesa_GetnPixelMapusvARB( GLenum map, GLsizei bufSize, GLushort *values );
+void GLAPIENTRY
+_mesa_GetPixelMapusv( GLenum map, GLushort *values );
+void GLAPIENTRY
+_mesa_PixelTransferf(GLenum pname, GLfloat param);
+void GLAPIENTRY
 _mesa_PixelTransferi( GLenum pname, GLint param );
 
-extern void GLAPIENTRY
-_mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
-
-/*@}*/
-
-
 extern void 
-_mesa_update_pixel( GLcontext *ctx, GLuint newstate );
+_mesa_update_pixel( struct gl_context *ctx, GLuint newstate );
 
 extern void 
-_mesa_init_pixel( GLcontext * ctx );
+_mesa_init_pixel( struct gl_context * ctx );
 
 /*@}*/
 
-#endif
+#endif /* PIXEL_H */