xserver and mesa git update 28-12-2010

1 files changed, 176 insertions, 336 deletions

diff --git a/mesalib/src/mesa/main/image.h b/mesalib/src/mesa/main/image.h
index 8b180d6bf..6fa93924c 100644
--- a/mesalib/src/mesa/main/image.h
+++ b/mesalib/src/mesa/main/image.h
@@ -1,336 +1,176 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.1
- *
- * Copyright (C) 1999-2008  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
- * 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.
- */
-
-
-#ifndef IMAGE_H
-#define IMAGE_H
-
-
-#include "mtypes.h"
-
-
-extern void
-_mesa_swap2( GLushort *p, GLuint n );
-
-extern void
-_mesa_swap4( GLuint *p, GLuint n );
-
-extern GLboolean
-_mesa_type_is_packed(GLenum type);
-
-extern GLint
-_mesa_sizeof_type( GLenum type );
-
-extern GLint
-_mesa_sizeof_packed_type( GLenum type );
-
-extern GLint
-_mesa_components_in_format( GLenum format );
-
-extern GLint
-_mesa_bytes_per_pixel( GLenum format, GLenum type );
-
-extern GLboolean
-_mesa_is_legal_format_and_type( GLcontext *ctx, GLenum format, GLenum type );
-
-extern GLboolean
-_mesa_is_color_format(GLenum format);
-
-extern GLboolean
-_mesa_is_index_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depth_format(GLenum format);
-
-extern GLboolean
-_mesa_is_stencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_ycbcr_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depthstencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_depth_or_stencil_format(GLenum format);
-
-extern GLboolean
-_mesa_is_dudv_format(GLenum format);
-
-extern GLboolean
-_mesa_is_integer_format(GLenum format);
-
-extern GLboolean
-_mesa_is_compressed_format(GLcontext *ctx, GLenum format);
-
-extern GLvoid *
-_mesa_image_address( GLuint dimensions,
-                     const struct gl_pixelstore_attrib *packing,
-                     const GLvoid *image,
-                     GLsizei width, GLsizei height,
-                     GLenum format, GLenum type,
-                     GLint img, GLint row, GLint column );
-
-extern GLvoid *
-_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width,
-                       GLenum format, GLenum type,
-                       GLint column );
-
-extern GLvoid *
-_mesa_image_address2d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width, GLsizei height,
-                       GLenum format, GLenum type,
-                       GLint row, GLint column );
-
-extern GLvoid *
-_mesa_image_address3d( const struct gl_pixelstore_attrib *packing,
-                       const GLvoid *image,
-                       GLsizei width, GLsizei height,
-                       GLenum format, GLenum type,
-                       GLint img, GLint row, GLint column );
-
-
-extern GLint
-_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,
-                        GLint width, GLenum format, GLenum type );
-
-
-extern GLint
-_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,
-                          GLint width, GLint height,
-                          GLenum format, GLenum type );
-
-extern void
-_mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
-                              const struct gl_pixelstore_attrib *unpacking );
-
-
-extern void
-_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_expand_bitmap(GLsizei width, GLsizei height,
-                    const struct gl_pixelstore_attrib *unpack,
-                    const GLubyte *bitmap,
-                    GLubyte *destBuffer, GLint destStride,
-                    GLubyte onValue);
-
-
-/** \name Pixel processing functions */
-/*@{*/
-
-extern void
-_mesa_scale_and_bias_rgba(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]);
-
-
-extern void
-_mesa_transform_rgba(const GLcontext *ctx, GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_lookup_rgba_float(const struct gl_color_table *table,
-                        GLuint n, GLfloat rgba[][4]);
-
-extern void
-_mesa_lookup_rgba_ubyte(const struct gl_color_table *table,
-                        GLuint n, GLubyte rgba[][4]);
-
-
-extern void
-_mesa_map_ci_to_rgba(const GLcontext *ctx,
-                     GLuint n, const GLuint index[], GLfloat rgba[][4]);
-
-
-extern void
-_mesa_map_ci8_to_rgba8(const GLcontext *ctx, GLuint n, const GLubyte index[],
-                       GLubyte rgba[][4]);
-
-
-extern void
-_mesa_scale_and_bias_depth(const GLcontext *ctx, GLuint n,
-                           GLfloat depthValues[]);
-
-extern void
-_mesa_scale_and_bias_depth_uint(const GLcontext *ctx, GLuint n,
-                                GLuint depthValues[]);
-
-extern void
-_mesa_apply_rgba_transfer_ops(GLcontext *ctx, GLbitfield transferOps,
-                              GLuint n, GLfloat rgba[][4]);
-
-
-extern void
-_mesa_apply_ci_transfer_ops(const GLcontext *ctx, GLbitfield transferOps,
-                            GLuint n, GLuint indexes[]);
-
-
-extern void
-_mesa_apply_stencil_transfer_ops(const GLcontext *ctx, GLuint n,
-                                 GLstencil stencil[]);
-
-
-extern void
-_mesa_pack_rgba_span_float( GLcontext *ctx, GLuint n, GLfloat rgba[][4],
-                            GLenum dstFormat, GLenum dstType, GLvoid *dstAddr,
-                            const struct gl_pixelstore_attrib *dstPacking,
-                            GLbitfield transferOps );
-
-
-extern void
-_mesa_unpack_color_span_chan( GLcontext *ctx,
-                              GLuint n, GLenum dstFormat, GLchan dest[],
-                              GLenum srcFormat, GLenum srcType,
-                              const GLvoid *source,
-                              const struct gl_pixelstore_attrib *srcPacking,
-                              GLbitfield transferOps );
-
-
-extern void
-_mesa_unpack_color_span_float( GLcontext *ctx,
-                               GLuint n, GLenum dstFormat, GLfloat dest[],
-                               GLenum srcFormat, GLenum srcType,
-                               const GLvoid *source,
-                               const struct gl_pixelstore_attrib *srcPacking,
-                               GLbitfield transferOps );
-
-extern void
-_mesa_unpack_dudv_span_byte( GLcontext *ctx,
-                             GLuint n, GLenum dstFormat, GLbyte dest[],
-                             GLenum srcFormat, GLenum srcType,
-                             const GLvoid *source,
-                             const struct gl_pixelstore_attrib *srcPacking,
-                             GLbitfield transferOps );
-
-extern void
-_mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking,
-                         GLbitfield transferOps );
-
-
-extern void
-_mesa_pack_index_span( const GLcontext *ctx, GLuint n,
-                       GLenum dstType, GLvoid *dest, const GLuint *source,
-                       const struct gl_pixelstore_attrib *dstPacking,
-                       GLbitfield transferOps );
-
-
-extern void
-_mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
-                           GLenum dstType, GLvoid *dest,
-                           GLenum srcType, const GLvoid *source,
-                           const struct gl_pixelstore_attrib *srcPacking,
-                           GLbitfield transferOps );
-
-extern void
-_mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, const GLstencil *source,
-                         const struct gl_pixelstore_attrib *dstPacking );
-
-
-extern void
-_mesa_unpack_depth_span( const GLcontext *ctx, GLuint n,
-                         GLenum dstType, GLvoid *dest, GLuint depthMax,
-                         GLenum srcType, const GLvoid *source,
-                         const struct gl_pixelstore_attrib *srcPacking );
-
-extern void
-_mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
-                       GLenum dstType, const GLfloat *depthSpan,
-                       const struct gl_pixelstore_attrib *dstPacking );
-
-
-extern void
-_mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
-                              const GLfloat *depthVals,
-                              const GLstencil *stencilVals,
-                              const struct gl_pixelstore_attrib *dstPacking);
-
-
-extern void *
-_mesa_unpack_image( GLuint dimensions,
-                    GLsizei width, GLsizei height, GLsizei depth,
-                    GLenum format, GLenum type, const GLvoid *pixels,
-                    const struct gl_pixelstore_attrib *unpack );
-
-
-extern void
-_mesa_convert_colors(GLenum srcType, const GLvoid *src,
-                     GLenum dstType, GLvoid *dst,
-                     GLuint count, const GLubyte mask[]);
-
-
-extern GLboolean
-_mesa_clip_drawpixels(const GLcontext *ctx,
-                      GLint *destX, GLint *destY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *unpack);
-
-
-extern GLboolean
-_mesa_clip_readpixels(const GLcontext *ctx,
-                      GLint *srcX, GLint *srcY,
-                      GLsizei *width, GLsizei *height,
-                      struct gl_pixelstore_attrib *pack);
-
-extern GLboolean
-_mesa_clip_copytexsubimage(const GLcontext *ctx,
-                           GLint *destX, GLint *destY,
-                           GLint *srcX, GLint *srcY,
-                           GLsizei *width, GLsizei *height);
-                           
-extern GLboolean
-_mesa_clip_to_region(GLint xmin, GLint ymin,
-                     GLint xmax, GLint ymax,
-                     GLint *x, GLint *y,
-                     GLsizei *width, GLsizei *height );
-
-extern GLboolean
-_mesa_clip_blit(GLcontext *ctx,
-                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,
-                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  7.1

+ *

+ * Copyright (C) 1999-2008  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

+ * 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.

+ */

+

+

+#ifndef IMAGE_H

+#define IMAGE_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+struct gl_pixelstore_attrib;

+

+extern void

+_mesa_swap2( GLushort *p, GLuint n );

+

+extern void

+_mesa_swap4( GLuint *p, GLuint n );

+

+extern GLboolean

+_mesa_type_is_packed(GLenum type);

+

+extern GLint

+_mesa_sizeof_type( GLenum type );

+

+extern GLint

+_mesa_sizeof_packed_type( GLenum type );

+

+extern GLint

+_mesa_components_in_format( GLenum format );

+

+extern GLint

+_mesa_bytes_per_pixel( GLenum format, GLenum type );

+

+extern GLboolean

+_mesa_is_legal_format_and_type(const struct gl_context *ctx,

+                               GLenum format, GLenum type);

+

+extern GLboolean

+_mesa_is_color_format(GLenum format);

+

+extern GLboolean

+_mesa_is_index_format(GLenum format);

+

+extern GLboolean

+_mesa_is_depth_format(GLenum format);

+

+extern GLboolean

+_mesa_is_stencil_format(GLenum format);

+

+extern GLboolean

+_mesa_is_ycbcr_format(GLenum format);

+

+extern GLboolean

+_mesa_is_depthstencil_format(GLenum format);

+

+extern GLboolean

+_mesa_is_depth_or_stencil_format(GLenum format);

+

+extern GLboolean

+_mesa_is_dudv_format(GLenum format);

+

+extern GLboolean

+_mesa_is_integer_format(GLenum format);

+

+extern GLboolean

+_mesa_is_compressed_format(struct gl_context *ctx, GLenum format);

+

+extern GLvoid *

+_mesa_image_address( GLuint dimensions,

+                     const struct gl_pixelstore_attrib *packing,

+                     const GLvoid *image,

+                     GLsizei width, GLsizei height,

+                     GLenum format, GLenum type,

+                     GLint img, GLint row, GLint column );

+

+extern GLvoid *

+_mesa_image_address1d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width,

+                       GLenum format, GLenum type,

+                       GLint column );

+

+extern GLvoid *

+_mesa_image_address2d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width, GLsizei height,

+                       GLenum format, GLenum type,

+                       GLint row, GLint column );

+

+extern GLvoid *

+_mesa_image_address3d( const struct gl_pixelstore_attrib *packing,

+                       const GLvoid *image,

+                       GLsizei width, GLsizei height,

+                       GLenum format, GLenum type,

+                       GLint img, GLint row, GLint column );

+

+

+extern GLint

+_mesa_image_row_stride( const struct gl_pixelstore_attrib *packing,

+                        GLint width, GLenum format, GLenum type );

+

+

+extern GLint

+_mesa_image_image_stride( const struct gl_pixelstore_attrib *packing,

+                          GLint width, GLint height,

+                          GLenum format, GLenum type );

+

+

+extern void

+_mesa_expand_bitmap(GLsizei width, GLsizei height,

+                    const struct gl_pixelstore_attrib *unpack,

+                    const GLubyte *bitmap,

+                    GLubyte *destBuffer, GLint destStride,

+                    GLubyte onValue);

+

+

+extern void

+_mesa_convert_colors(GLenum srcType, const GLvoid *src,

+                     GLenum dstType, GLvoid *dst,

+                     GLuint count, const GLubyte mask[]);

+

+

+extern GLboolean

+_mesa_clip_drawpixels(const struct gl_context *ctx,

+                      GLint *destX, GLint *destY,

+                      GLsizei *width, GLsizei *height,

+                      struct gl_pixelstore_attrib *unpack);

+

+

+extern GLboolean

+_mesa_clip_readpixels(const struct gl_context *ctx,

+                      GLint *srcX, GLint *srcY,

+                      GLsizei *width, GLsizei *height,

+                      struct gl_pixelstore_attrib *pack);

+

+extern GLboolean

+_mesa_clip_copytexsubimage(const struct gl_context *ctx,

+                           GLint *destX, GLint *destY,

+                           GLint *srcX, GLint *srcY,

+                           GLsizei *width, GLsizei *height);

+                           

+extern GLboolean

+_mesa_clip_to_region(GLint xmin, GLint ymin,

+                     GLint xmax, GLint ymax,

+                     GLint *x, GLint *y,

+                     GLsizei *width, GLsizei *height );

+

+extern GLboolean

+_mesa_clip_blit(struct gl_context *ctx,

+                GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1,

+                GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1);

+

+

+#endif