mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git update 5 oct 2011

1 files changed, 99 insertions, 99 deletions

diff --git a/mesalib/src/mesa/main/feedback.h b/mesalib/src/mesa/main/feedback.h
index 24ce53af4..6d256ee8f 100644
--- a/mesalib/src/mesa/main/feedback.h
+++ b/mesalib/src/mesa/main/feedback.h
@@ -1,99 +1,99 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.5

- *

- * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

- * Copyright (C) 2009  VMware, Inc.  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 FEEDBACK_H

-#define FEEDBACK_H

-

-

-#include "main/mfeatures.h"

-#include "main/mtypes.h"

-

-

-#if FEATURE_feedback

-

-extern void

-_mesa_feedback_vertex( struct gl_context *ctx,

-                       const GLfloat win[4],

-                       const GLfloat color[4],

-                       const GLfloat texcoord[4] );

-

-

-static INLINE void

-_mesa_feedback_token( struct gl_context *ctx, GLfloat token )

-{

-   if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {

-      ctx->Feedback.Buffer[ctx->Feedback.Count] = token;

-   }

-   ctx->Feedback.Count++;

-}

-

-

-extern void

-_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );

-

-

-extern void

-_mesa_init_feedback_dispatch(struct _glapi_table *disp);

-

-#else /* FEATURE_feedback */

-

-#include "main/compiler.h"

-

-static INLINE void

-_mesa_feedback_vertex( struct gl_context *ctx,

-                       const GLfloat win[4],

-                       const GLfloat color[4],

-                       const GLfloat texcoord[4] )

-{

-   /* render mode is always GL_RENDER */

-   ASSERT_NO_FEATURE();

-}

-

-

-static INLINE void

-_mesa_feedback_token( struct gl_context *ctx, GLfloat token )

-{

-   /* render mode is always GL_RENDER */

-   ASSERT_NO_FEATURE();

-}

-

-static INLINE void

-_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )

-{

-   /* render mode is always GL_RENDER */

-   ASSERT_NO_FEATURE();

-}

-

-static INLINE void

-_mesa_init_feedback_dispatch(struct _glapi_table *disp)

-{

-}

-

-#endif /* FEATURE_feedback */

-

-extern void

-_mesa_init_feedback( struct gl_context *ctx );

-

-#endif /* FEEDBACK_H */

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ * Copyright (C) 2009  VMware, Inc.  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 FEEDBACK_H
+#define FEEDBACK_H
+
+
+#include "main/mfeatures.h"
+#include "main/mtypes.h"
+
+
+#if FEATURE_feedback
+
+extern void
+_mesa_feedback_vertex( struct gl_context *ctx,
+                       const GLfloat win[4],
+                       const GLfloat color[4],
+                       const GLfloat texcoord[4] );
+
+
+static inline void
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
+{
+   if (ctx->Feedback.Count < ctx->Feedback.BufferSize) {
+      ctx->Feedback.Buffer[ctx->Feedback.Count] = token;
+   }
+   ctx->Feedback.Count++;
+}
+
+
+extern void
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z );
+
+
+extern void
+_mesa_init_feedback_dispatch(struct _glapi_table *disp);
+
+#else /* FEATURE_feedback */
+
+#include "main/compiler.h"
+
+static inline void
+_mesa_feedback_vertex( struct gl_context *ctx,
+                       const GLfloat win[4],
+                       const GLfloat color[4],
+                       const GLfloat texcoord[4] )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+
+static inline void
+_mesa_feedback_token( struct gl_context *ctx, GLfloat token )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+static inline void
+_mesa_update_hitflag( struct gl_context *ctx, GLfloat z )
+{
+   /* render mode is always GL_RENDER */
+   ASSERT_NO_FEATURE();
+}
+
+static inline void
+_mesa_init_feedback_dispatch(struct _glapi_table *disp)
+{
+}
+
+#endif /* FEATURE_feedback */
+
+extern void
+_mesa_init_feedback( struct gl_context *ctx );
+
+#endif /* FEEDBACK_H */