X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fdrawpix.h;h=2a2d7de8d814d66bbfd1fd62ca3c92aff2e6f525;hb=aac367f48afc62176faf67aa6f329fbeae2004b4;hp=cb517ced03b76698f35e79e147b48e7ba72c88e8;hpb=afb833d4e89c312460a4ab9ed6a7a8ca4ebbfe1c;p=mesa.git

diff --git a/src/mesa/main/drawpix.h b/src/mesa/main/drawpix.h
index cb517ced03b..2a2d7de8d81 100644
--- a/src/mesa/main/drawpix.h
+++ b/src/mesa/main/drawpix.h
@@ -1,21 +1,20 @@
-/* $Id: drawpix.h,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  3.5
+ *
+ * Copyright (C) 1999-2001  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"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * 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
@@ -25,30 +24,32 @@
  */
 
 
-
-
-
 #ifndef DRAWPIXELS_H
 #define DRAWPIXELS_H
 
 
-#include "types.h"
+#include "mtypes.h"
 
 
-extern GLboolean
-gl_direct_DrawPixels( GLcontext *ctx, 
-                      const struct gl_pixelstore_attrib *unpack,
-                      GLsizei width, GLsizei height,
-                      GLenum format, GLenum type, const GLvoid *pixels );
+extern void GLAPIENTRY
+_mesa_DrawPixels( GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, const GLvoid *pixels );
 
 
-#if 000
-extern void gl_DrawPixels( GLcontext *ctx, GLsizei width, GLsizei height,
-                           GLenum format, GLenum type, const GLvoid *pixels );
-#endif
+extern void GLAPIENTRY
+_mesa_ReadPixels( GLint x, GLint y, GLsizei width, GLsizei height,
+                  GLenum format, GLenum type, GLvoid *pixels );
+
+
+extern void GLAPIENTRY
+_mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
+                  GLenum type );
 
 
-extern void gl_DrawPixels( GLcontext *ctx, struct gl_image *image );
+extern void GLAPIENTRY
+_mesa_Bitmap( GLsizei width, GLsizei height,
+              GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove,
+              const GLubyte *bitmap );
 
 
 #endif