xserver and mesa git update 28-12-2010

1 files changed, 73 insertions, 74 deletions

diff --git a/mesalib/src/mesa/tnl/t_pipeline.h b/mesalib/src/mesa/tnl/t_pipeline.h
index d110010f0..579207889 100644
--- a/mesalib/src/mesa/tnl/t_pipeline.h
+++ b/mesalib/src/mesa/tnl/t_pipeline.h
@@ -1,74 +1,73 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.5.3
- *
- * Copyright (C) 1999-2007  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.
- *
- * Authors:
- *    Keith Whitwell <keith@tungstengraphics.com>
- */
-
-
-
-#ifndef _T_PIPELINE_H_
-#define _T_PIPELINE_H_
-
-#include "main/mtypes.h"
-#include "t_context.h"
-
-extern void _tnl_run_pipeline( GLcontext *ctx );
-
-extern void _tnl_destroy_pipeline( GLcontext *ctx );
-
-extern void _tnl_install_pipeline( GLcontext *ctx,
-				   const struct tnl_pipeline_stage **stages );
-
-
-/* These are implemented in the t_vb_*.c files:
- */
-extern const struct tnl_pipeline_stage _tnl_vertex_transform_stage;
-extern const struct tnl_pipeline_stage _tnl_vertex_cull_stage;
-extern const struct tnl_pipeline_stage _tnl_normal_transform_stage;
-extern const struct tnl_pipeline_stage _tnl_lighting_stage;
-extern const struct tnl_pipeline_stage _tnl_fog_coordinate_stage;
-extern const struct tnl_pipeline_stage _tnl_texgen_stage;
-extern const struct tnl_pipeline_stage _tnl_texture_transform_stage;
-extern const struct tnl_pipeline_stage _tnl_point_attenuation_stage;
-extern const struct tnl_pipeline_stage _tnl_vertex_program_stage;
-extern const struct tnl_pipeline_stage _tnl_render_stage;
-
-/* Shorthand to plug in the default pipeline:
- */
-extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];
-extern const struct tnl_pipeline_stage *_tnl_vp_pipeline[];
-
-
-/* Convenience routines provided by t_vb_render.c:
- */
-extern tnl_render_func _tnl_render_tab_elts[];
-extern tnl_render_func _tnl_render_tab_verts[];
-
-extern void _tnl_RenderClippedPolygon( GLcontext *ctx, 
-				       const GLuint *elts, GLuint n );
-
-extern void _tnl_RenderClippedLine( GLcontext *ctx, GLuint ii, GLuint jj );
-
-
-#endif
+/*

+ * Mesa 3-D graphics library

+ * Version:  6.5.3

+ *

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

+ *

+ * Authors:

+ *    Keith Whitwell <keith@tungstengraphics.com>

+ */

+

+

+

+#ifndef _T_PIPELINE_H_

+#define _T_PIPELINE_H_

+

+#include "main/mtypes.h"

+#include "t_context.h"

+

+extern void _tnl_run_pipeline( struct gl_context *ctx );

+

+extern void _tnl_destroy_pipeline( struct gl_context *ctx );

+

+extern void _tnl_install_pipeline( struct gl_context *ctx,

+				   const struct tnl_pipeline_stage **stages );

+

+

+/* These are implemented in the t_vb_*.c files:

+ */

+extern const struct tnl_pipeline_stage _tnl_vertex_transform_stage;

+extern const struct tnl_pipeline_stage _tnl_normal_transform_stage;

+extern const struct tnl_pipeline_stage _tnl_lighting_stage;

+extern const struct tnl_pipeline_stage _tnl_fog_coordinate_stage;

+extern const struct tnl_pipeline_stage _tnl_texgen_stage;

+extern const struct tnl_pipeline_stage _tnl_texture_transform_stage;

+extern const struct tnl_pipeline_stage _tnl_point_attenuation_stage;

+extern const struct tnl_pipeline_stage _tnl_vertex_program_stage;

+extern const struct tnl_pipeline_stage _tnl_render_stage;

+

+/* Shorthand to plug in the default pipeline:

+ */

+extern const struct tnl_pipeline_stage *_tnl_default_pipeline[];

+extern const struct tnl_pipeline_stage *_tnl_vp_pipeline[];

+

+

+/* Convenience routines provided by t_vb_render.c:

+ */

+extern tnl_render_func _tnl_render_tab_elts[];

+extern tnl_render_func _tnl_render_tab_verts[];

+

+extern void _tnl_RenderClippedPolygon( struct gl_context *ctx, 

+				       const GLuint *elts, GLuint n );

+

+extern void _tnl_RenderClippedLine( struct gl_context *ctx, GLuint ii, GLuint jj );

+

+

+#endif