xserver and mesa git update 28-12-2010

1 files changed, 122 insertions, 118 deletions

diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index 9bfebd45c..09c738fda 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -1,118 +1,122 @@
-/**
- * \file texobj.h
- * Texture object management.
- */
-
-/*
- * 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 TEXTOBJ_H
-#define TEXTOBJ_H
-
-
-#include "mtypes.h"
-
-
-/**
- * \name Internal functions
- */
-/*@{*/
-
-extern struct gl_texture_object *
-_mesa_lookup_texture(GLcontext *ctx, GLuint id);
-
-extern struct gl_texture_object *
-_mesa_new_texture_object( GLcontext *ctx, GLuint name, GLenum target );
-
-extern void
-_mesa_initialize_texture_object( struct gl_texture_object *obj,
-                                 GLuint name, GLenum target );
-
-extern void
-_mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *obj );
-
-extern void
-_mesa_copy_texture_object( struct gl_texture_object *dest,
-                           const struct gl_texture_object *src );
-
-extern void
-_mesa_clear_texture_object(GLcontext *ctx, struct gl_texture_object *obj);
-
-extern void
-_mesa_reference_texobj(struct gl_texture_object **ptr,
-                       struct gl_texture_object *tex);
-
-extern void
-_mesa_test_texobj_completeness( const GLcontext *ctx,
-                                struct gl_texture_object *obj );
-
-extern void
-_mesa_dirty_texobj(GLcontext *ctx, struct gl_texture_object *texObj,
-                   GLboolean invalidate_state);
-
-extern struct gl_texture_object *
-_mesa_get_fallback_texture(GLcontext *ctx);
-
-extern void
-_mesa_unlock_context_textures( GLcontext *ctx );
-
-extern void
-_mesa_lock_context_textures( GLcontext *ctx );
-
-/*@}*/
-
-/**
- * \name API functions
- */
-/*@{*/
-
-extern void GLAPIENTRY
-_mesa_GenTextures( GLsizei n, GLuint *textures );
-
-
-extern void GLAPIENTRY
-_mesa_DeleteTextures( GLsizei n, const GLuint *textures );
-
-
-extern void GLAPIENTRY
-_mesa_BindTexture( GLenum target, GLuint texture );
-
-
-extern void GLAPIENTRY
-_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,
-                          const GLclampf *priorities );
-
-
-extern GLboolean GLAPIENTRY
-_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,
-                           GLboolean *residences );
-
-extern GLboolean GLAPIENTRY
-_mesa_IsTexture( GLuint texture );
-
-/*@}*/
-
-
-#endif
+/**

+ * \file texobj.h

+ * Texture object management.

+ */

+

+/*

+ * 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 TEXTOBJ_H

+#define TEXTOBJ_H

+

+

+#include "glheader.h"

+

+struct gl_context;

+

+/**

+ * \name Internal functions

+ */

+/*@{*/

+

+extern struct gl_texture_object *

+_mesa_lookup_texture(struct gl_context *ctx, GLuint id);

+

+extern struct gl_texture_object *

+_mesa_new_texture_object( struct gl_context *ctx, GLuint name, GLenum target );

+

+extern void

+_mesa_initialize_texture_object( struct gl_texture_object *obj,

+                                 GLuint name, GLenum target );

+

+extern void

+_mesa_delete_texture_object( struct gl_context *ctx, struct gl_texture_object *obj );

+

+extern void

+_mesa_copy_texture_object( struct gl_texture_object *dest,

+                           const struct gl_texture_object *src );

+

+extern void

+_mesa_clear_texture_object(struct gl_context *ctx, struct gl_texture_object *obj);

+

+extern void

+_mesa_reference_texobj(struct gl_texture_object **ptr,

+                       struct gl_texture_object *tex);

+

+extern void

+_mesa_test_texobj_completeness( const struct gl_context *ctx,

+                                struct gl_texture_object *obj );

+

+extern GLboolean

+_mesa_cube_complete(const struct gl_texture_object *texObj);

+

+extern void

+_mesa_dirty_texobj(struct gl_context *ctx, struct gl_texture_object *texObj,

+                   GLboolean invalidate_state);

+

+extern struct gl_texture_object *

+_mesa_get_fallback_texture(struct gl_context *ctx);

+

+extern void

+_mesa_unlock_context_textures( struct gl_context *ctx );

+

+extern void

+_mesa_lock_context_textures( struct gl_context *ctx );

+

+/*@}*/

+

+/**

+ * \name API functions

+ */

+/*@{*/

+

+extern void GLAPIENTRY

+_mesa_GenTextures( GLsizei n, GLuint *textures );

+

+

+extern void GLAPIENTRY

+_mesa_DeleteTextures( GLsizei n, const GLuint *textures );

+

+

+extern void GLAPIENTRY

+_mesa_BindTexture( GLenum target, GLuint texture );

+

+

+extern void GLAPIENTRY

+_mesa_PrioritizeTextures( GLsizei n, const GLuint *textures,

+                          const GLclampf *priorities );

+

+

+extern GLboolean GLAPIENTRY

+_mesa_AreTexturesResident( GLsizei n, const GLuint *textures,

+                           GLboolean *residences );

+

+extern GLboolean GLAPIENTRY

+_mesa_IsTexture( GLuint texture );

+

+/*@}*/

+

+

+#endif