replace _mesa_logbase2 with util_logbase2

[mesa.git] / src / mesa / state_tracker / st_cb_texture.h

diff --git a/src/mesa/state_tracker/st_cb_texture.h b/src/mesa/state_tracker/st_cb_texture.h
index c474d164659b342bece7ce49af59a490fce71573..ed6ed16fed896ff093a4b967cba44e1a9a9d2e8a 100644 (file)
--- a/src/mesa/state_tracker/st_cb_texture.h
+++ b/src/mesa/state_tracker/st_cb_texture.h
@@ -1,19 +1,58 @@
+/**************************************************************************
+ * 
+ * Copyright 2007 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, 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 VMWARE 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_TEXTURE_H
 #define ST_CB_TEXTURE_H
 
 
-extern GLuint
-st_finalize_mipmap_tree(GLcontext *ctx,
-                        struct pipe_context *pipe, GLuint unit,
-                        GLboolean *needFlush);
+#include "main/glheader.h"
 
+struct dd_function_table;
+struct gl_context;
+struct gl_texture_object;
+struct pipe_context;
+struct st_context;
+struct st_texture_object;
 
-extern void
-st_init_cb_texture( struct st_context *st );
+extern enum pipe_texture_target
+gl_target_to_pipe(GLenum target);
 
+unsigned
+st_get_blit_mask(GLenum srcFormat, GLenum dstFormat);
+
+extern GLboolean
+st_finalize_texture(struct gl_context *ctx,
+                   struct pipe_context *pipe, 
+                   struct gl_texture_object *tObj,
+                   GLuint cubeMapFace);
 
-extern void
-st_destroy_cb_texture( struct st_context *st );
 
+extern void
+st_init_texture_functions(struct dd_function_table *functions);
 
 #endif /* ST_CB_TEXTURE_H */