diff options
| author | Brian Paul <[email protected]> | 2000-10-29 18:12:14 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2000-10-29 18:12:14 +0000 |
| commit | 699bc7b73d2fede77d3290f66c1ec355afd0373e (patch) | |
| tree | e4db02b4dd9aa40fadf922c094014ed6541726c4 /src/mesa/main/image.h | |
| parent | c893a015d8a50a38cd3f727d99835e7e7e2ccea9 (diff) | |
More GLchan color channel changes.
Some header file re-org:
Move matrix, vertex buffer structs to types.h to fix #include mess.
Remove typedef, extern declarations from config.h
Diffstat (limited to 'src/mesa/main/image.h')
| -rw-r--r-- | src/mesa/main/image.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mesa/main/image.h b/src/mesa/main/image.h index e86e36f3293..bd28ed4197c 100644 --- a/src/mesa/main/image.h +++ b/src/mesa/main/image.h @@ -1,4 +1,4 @@ -/* $Id: image.h,v 1.12 2000/08/31 15:24:07 brianp Exp $ */ +/* $Id: image.h,v 1.13 2000/10/29 18:12:15 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -79,6 +79,15 @@ _mesa_pack_polygon_stipple( const GLuint pattern[32], GLubyte *dest, const struct gl_pixelstore_attrib *packing ); +extern GLvoid * +_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels, + const struct gl_pixelstore_attrib *packing ); + +extern void +_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source, + GLubyte *dest, const struct gl_pixelstore_attrib *packing ); + + extern void _mesa_pack_float_rgba_span( GLcontext *ctx, GLuint n, CONST GLfloat rgba[][4], @@ -89,19 +98,19 @@ _mesa_pack_float_rgba_span( GLcontext *ctx, extern void _mesa_pack_rgba_span( GLcontext *ctx, - GLuint n, CONST GLubyte rgba[][4], + GLuint n, CONST GLchan rgba[][4], GLenum dstFormat, GLenum dstType, GLvoid *dstAddr, const struct gl_pixelstore_attrib *dstPacking, GLuint transferOps ); extern void -_mesa_unpack_ubyte_color_span( GLcontext *ctx, - GLuint n, GLenum dstFormat, GLubyte dest[], - GLenum srcFormat, GLenum srcType, - const GLvoid *source, - const struct gl_pixelstore_attrib *srcPacking, - GLuint transferOps ); +_mesa_unpack_chan_color_span( GLcontext *ctx, + GLuint n, GLenum dstFormat, GLchan dest[], + GLenum srcFormat, GLenum srcType, + const GLvoid *source, + const struct gl_pixelstore_attrib *srcPacking, + GLuint transferOps ); extern void @@ -142,13 +151,4 @@ _mesa_unpack_image( GLsizei width, GLsizei height, GLsizei depth, const struct gl_pixelstore_attrib *unpack ); -extern GLvoid * -_mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels, - const struct gl_pixelstore_attrib *packing ); - -extern void -_mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source, - GLubyte *dest, const struct gl_pixelstore_attrib *packing ); - - #endif |