Minor tweaks to help out at a driver level.

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

diff --git a/src/mesa/main/pixel.h b/src/mesa/main/pixel.h
index 7eb0741aea1d33857a372b69eb8905636bdd1362..a3efcf5666ea7cc4937321640896232e373b215c 100644 (file)
--- a/src/mesa/main/pixel.h
+++ b/src/mesa/main/pixel.h
@@ -1,21 +1,24 @@
-/* $Id: pixel.h,v 1.6 2000/10/29 18:12:15 brianp Exp $ */
+/**
+ * \file pixel.h
+ * Pixel operations.
+ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
- * 
- * Copyright (C) 1999-2000  Brian Paul   All Rights Reserved.
- * 
+ * Version:  5.1
+ *
+ * Copyright (C) 1999-2003  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
@@ -29,56 +32,58 @@
 #define PIXEL_H
 
 
-#include "types.h"
-
+#include "mtypes.h"
 
-/*
- * API functions
- */
 
+/** \name API functions */
+/*@*/
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetPixelMapfv( GLenum map, GLfloat *values );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetPixelMapuiv( GLenum map, GLuint *values );
 
-extern void
+extern void GLAPIENTRY
 _mesa_GetPixelMapusv( GLenum map, GLushort *values );
 
-extern void
-_mesa_PixelMapfv( GLenum map, GLint mapsize, const GLfloat *values );
+extern void GLAPIENTRY
+_mesa_PixelMapfv( GLenum map, GLsizei mapsize, const GLfloat *values );
 
-extern void
-_mesa_PixelMapuiv(GLenum map, GLint mapsize, const GLuint *values );
+extern void GLAPIENTRY
+_mesa_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint *values );
 
-extern void
-_mesa_PixelMapusv(GLenum map, GLint mapsize, const GLushort *values );
+extern void GLAPIENTRY
+_mesa_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort *values );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelStoref( GLenum pname, GLfloat param );
 
-extern void
+
+extern void GLAPIENTRY
 _mesa_PixelStorei( GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTransferf( GLenum pname, GLfloat param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelTransferi( GLenum pname, GLint param );
 
-extern void
+extern void GLAPIENTRY
 _mesa_PixelZoom( GLfloat xfactor, GLfloat yfactor );
 
+/*@}*/
 
 
-/*
- * Pixel processing functions
- */
+/** \name Pixel processing functions */
+/*@{*/
 
 extern void
-_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
+_mesa_scale_and_bias_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4],
+                          GLfloat rScale, GLfloat gScale,
+                          GLfloat bScale, GLfloat aScale,
+                          GLfloat rBias, GLfloat gBias,
+                          GLfloat bBias, GLfloat aBias);
 
 extern void
 _mesa_map_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
@@ -128,4 +133,17 @@ extern void
 _mesa_map_stencil(const GLcontext *ctx, GLuint n, GLstencil index[]);
 
 
+extern void
+_mesa_chan_to_float_span(const GLcontext *ctx, GLuint n,
+                         CONST GLchan rgba[][4], GLfloat rgbaf[][4]);
+
+
+extern void 
+_mesa_update_pixel( GLcontext *ctx, GLuint newstate );
+
+extern void 
+_mesa_init_pixel( GLcontext * ctx );
+
+/*@}*/
+
 #endif