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

1 files changed, 92 insertions, 92 deletions

diff --git a/mesalib/src/mesa/main/texstate.h b/mesalib/src/mesa/main/texstate.h
index 1258a0705..7dc6dc6a2 100644
--- a/mesalib/src/mesa/main/texstate.h
+++ b/mesalib/src/mesa/main/texstate.h
@@ -1,92 +1,92 @@
-/**

- * \file texstate.h

- * Texture state management.

- */

-

-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

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

- */

-

-

-#ifndef TEXSTATE_H

-#define TEXSTATE_H

-

-

-#include "compiler.h"

-#include "mtypes.h"

-

-

-/**

- * Return pointer to current texture unit.

- * This the texture unit set by glActiveTexture(), not glClientActiveTexture().

- */

-static INLINE struct gl_texture_unit *

-_mesa_get_current_tex_unit(struct gl_context *ctx)

-{

-   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));

-   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);

-}

-

-

-extern void

-_mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst );

-

-extern void

-_mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );

-

-

-

-/**

- * \name Called from API

- */

-/*@{*/

-

-extern void GLAPIENTRY

-_mesa_ActiveTextureARB( GLenum target );

-

-extern void GLAPIENTRY

-_mesa_ClientActiveTextureARB( GLenum target );

-

-/*@}*/

-

-

-/**

- * \name Initialization, state maintenance

- */

-/*@{*/

-

-extern void 

-_mesa_update_texture( struct gl_context *ctx, GLuint new_state );

-

-extern GLboolean

-_mesa_init_texture( struct gl_context *ctx );

-

-extern void 

-_mesa_free_texture_data( struct gl_context *ctx );

-

-extern void

-_mesa_update_default_objects_texture(struct gl_context *ctx);

-

-/*@}*/

-

-#endif

+/**
+ * \file texstate.h
+ * Texture state management.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * 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.
+ */
+
+
+#ifndef TEXSTATE_H
+#define TEXSTATE_H
+
+
+#include "compiler.h"
+#include "mtypes.h"
+
+
+/**
+ * Return pointer to current texture unit.
+ * This the texture unit set by glActiveTexture(), not glClientActiveTexture().
+ */
+static inline struct gl_texture_unit *
+_mesa_get_current_tex_unit(struct gl_context *ctx)
+{
+   ASSERT(ctx->Texture.CurrentUnit < Elements(ctx->Texture.Unit));
+   return &(ctx->Texture.Unit[ctx->Texture.CurrentUnit]);
+}
+
+
+extern void
+_mesa_copy_texture_state( const struct gl_context *src, struct gl_context *dst );
+
+extern void
+_mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
+
+
+
+/**
+ * \name Called from API
+ */
+/*@{*/
+
+extern void GLAPIENTRY
+_mesa_ActiveTextureARB( GLenum target );
+
+extern void GLAPIENTRY
+_mesa_ClientActiveTextureARB( GLenum target );
+
+/*@}*/
+
+
+/**
+ * \name Initialization, state maintenance
+ */
+/*@{*/
+
+extern void 
+_mesa_update_texture( struct gl_context *ctx, GLuint new_state );
+
+extern GLboolean
+_mesa_init_texture( struct gl_context *ctx );
+
+extern void 
+_mesa_free_texture_data( struct gl_context *ctx );
+
+extern void
+_mesa_update_default_objects_texture(struct gl_context *ctx);
+
+/*@}*/
+
+#endif