Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/GL3.txt
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/main/depthstencil.c
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/formats.h
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/readpix.c
	mesalib/src/mesa/main/renderbuffer.c
	mesalib/src/mesa/main/samplerobj.c
	mesalib/src/mesa/main/shaderapi.c
	mesalib/src/mesa/main/texenv.c
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/state_tracker/st_cb_clear.c
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_readpixels.c
	mesalib/src/mesa/state_tracker/st_extensions.c
	mesalib/src/mesa/state_tracker/st_format.c
	mesalib/src/mesa/swrast/s_readpix.c

1 files changed, 62 insertions, 57 deletions

diff --git a/mesalib/src/mesa/main/depthstencil.h b/mesalib/src/mesa/main/depthstencil.h
index a86f54d96..b47a2e482 100644
--- a/mesalib/src/mesa/main/depthstencil.h
+++ b/mesalib/src/mesa/main/depthstencil.h
@@ -1,57 +1,62 @@
-/*

- * Mesa 3-D graphics library

- * Version:  6.5

- *

- * Copyright (C) 1999-2006  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 DEPTHSTENCIL_H

-#define DEPTHSTENCIL_H

-

-struct gl_context;

-

-extern struct gl_renderbuffer *

-_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,

-                                   struct gl_renderbuffer *dsrb);

-

-

-extern struct gl_renderbuffer *

-_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx,

-                                  struct gl_renderbuffer *dsrb);

-

-

-extern void

-_mesa_extract_stencil(struct gl_context *ctx,

-                      struct gl_renderbuffer *dsRb,

-                      struct gl_renderbuffer *stencilRb);

-

-

-extern void

-_mesa_insert_stencil(struct gl_context *ctx,

-                     struct gl_renderbuffer *dsRb,

-                     struct gl_renderbuffer *stencilRb);

-

-

-extern void

-_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb);

-

-

-#endif /* DEPTHSTENCIL_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  6.5
+ *
+ * Copyright (C) 1999-2006  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 DEPTHSTENCIL_H
+#define DEPTHSTENCIL_H
+
+struct gl_context;
+
+extern struct gl_renderbuffer *
+_mesa_new_z24_renderbuffer_wrapper(struct gl_context *ctx,
+                                   struct gl_renderbuffer *dsrb);
+
+
+extern struct gl_renderbuffer *
+_mesa_new_z32f_renderbuffer_wrapper(struct gl_context *ctx,
+                                    struct gl_renderbuffer *dsrb);
+
+
+extern struct gl_renderbuffer *
+_mesa_new_s8_renderbuffer_wrapper(struct gl_context *ctx,
+                                  struct gl_renderbuffer *dsrb);
+
+
+extern void
+_mesa_extract_stencil(struct gl_context *ctx,
+                      struct gl_renderbuffer *dsRb,
+                      struct gl_renderbuffer *stencilRb);
+
+
+extern void
+_mesa_insert_stencil(struct gl_context *ctx,
+                     struct gl_renderbuffer *dsRb,
+                     struct gl_renderbuffer *stencilRb);
+
+
+extern void
+_mesa_promote_stencil(struct gl_context *ctx, struct gl_renderbuffer *stencilRb);
+
+
+#endif /* DEPTHSTENCIL_H */