Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/docs/relnotes.html
	mesalib/scons/gallium.py
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/main/colortab.c
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/enable.c
	mesalib/src/mesa/main/formats.c
	mesalib/src/mesa/main/framebuffer.c
	mesalib/src/mesa/main/get.c
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pack.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texobj.c
	mesalib/src/mesa/main/texparam.c
	mesalib/src/mesa/main/texstate.c
	mesalib/src/mesa/swrast/s_drawpix.c
	mesalib/src/mesa/vbo/vbo_attrib_tmp.h

1 files changed, 84 insertions, 96 deletions

diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.h b/mesalib/src/mesa/state_tracker/st_cb_fbo.h
index 228be8fed..1afa3fe6e 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.h
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.h
@@ -1,96 +1,84 @@
-/**************************************************************************

- * 

- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.

- * 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, sub license, 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 (including the

- * next paragraph) 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 NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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 ST_CB_FBO_H

-#define ST_CB_FBO_H

-

-#include "main/compiler.h"

-#include "main/glheader.h"

-#include "main/mtypes.h"

-

-#include "pipe/p_compiler.h"

-#include "pipe/p_format.h"

-

-struct dd_function_table;

-struct pipe_context;

-

-/**

- * Derived renderbuffer class.  Just need to add a pointer to the

- * pipe surface.

- */

-struct st_renderbuffer

-{

-   struct gl_renderbuffer Base;

-   struct pipe_resource *texture;

-   struct pipe_surface *surface; /* temporary view into texture */

-   struct pipe_sampler_view *sampler_view;

-   enum pipe_format format;  /** preferred format, or PIPE_FORMAT_NONE */

-   GLboolean defined;        /**< defined contents? */

-

-   /**

-    * Used only when hardware accumulation buffers are not supported.

-    */

-   boolean software;

-   size_t stride;

-   void *data;

-   

-   struct st_texture_object *rtt;  /**< GL render to texture's texture */

-   int rtt_level, rtt_face, rtt_slice;

-

-   /** Render to texture state */

-   struct pipe_resource *texture_save;

-   struct pipe_surface *surface_save;

-   struct pipe_sampler_view *sampler_view_save;

-};

-

-

-static INLINE struct st_renderbuffer *

-st_renderbuffer(struct gl_renderbuffer *rb)

-{

-   return (struct st_renderbuffer *) rb;

-}

-

-

-extern struct gl_renderbuffer *

-st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);

-

-extern void

-st_init_fbo_functions(struct dd_function_table *functions);

-

-/* XXX unused ? */

-extern struct pipe_sampler_view *

-st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,

-                                 struct pipe_context *pipe);

-

-

-extern GLboolean

-st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,

-                             const struct gl_renderbuffer_attachment *stencil);

-

-

-#endif /* ST_CB_FBO_H */

+/**************************************************************************
+ * 
+ * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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 ST_CB_FBO_H
+#define ST_CB_FBO_H
+
+#include "main/compiler.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_format.h"
+
+struct dd_function_table;
+struct pipe_context;
+
+/**
+ * Derived renderbuffer class.  Just need to add a pointer to the
+ * pipe surface.
+ */
+struct st_renderbuffer
+{
+   struct gl_renderbuffer Base;
+   struct pipe_resource *texture;
+   struct pipe_surface *surface; /* temporary view into texture */
+   enum pipe_format format;  /** preferred format, or PIPE_FORMAT_NONE */
+   GLboolean defined;        /**< defined contents? */
+
+   /**
+    * Used only when hardware accumulation buffers are not supported.
+    */
+   boolean software;
+   size_t stride;
+   void *data;
+
+   struct st_texture_object *rtt;  /**< GL render to texture's texture */
+   int rtt_level, rtt_face, rtt_slice;
+};
+
+
+static INLINE struct st_renderbuffer *
+st_renderbuffer(struct gl_renderbuffer *rb)
+{
+   return (struct st_renderbuffer *) rb;
+}
+
+
+extern struct gl_renderbuffer *
+st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
+
+extern void
+st_init_fbo_functions(struct dd_function_table *functions);
+
+extern GLboolean
+st_is_depth_stencil_combined(const struct gl_renderbuffer_attachment *depth,
+                             const struct gl_renderbuffer_attachment *stencil);
+
+
+#endif /* ST_CB_FBO_H */