X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_cb_texture.h;h=1b685298c5f7daba45cbb6f97a67416d35473668;hb=fbebd5e4a5ccb44ae005a8be18c85ea45c66307f;hp=f1fe0339cdd72ff0e1f9b492a11c7b3252e5a51c;hpb=7158203b081ad34c03382f07e0df748eae235e9b;p=mesa.git

diff --git a/src/mesa/state_tracker/st_cb_texture.h b/src/mesa/state_tracker/st_cb_texture.h
index f1fe0339cdd..1b685298c5f 100644
--- a/src/mesa/state_tracker/st_cb_texture.h
+++ b/src/mesa/state_tracker/st_cb_texture.h
@@ -1,6 +1,6 @@
 /**************************************************************************
  * 
- * Copyright 2007 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright 2007 VMware, Inc.
  * All Rights Reserved.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,7 +18,7 @@
  * 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 TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
+ * 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.
@@ -30,15 +30,24 @@
 #define ST_CB_TEXTURE_H
 
 
-extern GLboolean
-st_finalize_texture(GLcontext *ctx,
-		    struct pipe_context *pipe, 
-		    struct gl_texture_object *tObj,
-		    GLboolean *needFlush);
+#include "main/glheader.h"
+
+struct dd_function_table;
+struct gl_context;
+struct gl_texture_object;
+struct pipe_context;
+struct st_context;
 
+extern enum pipe_texture_target
+gl_target_to_pipe(GLenum target);
 
-extern struct gl_texture_object *
-st_get_default_texture(struct st_context *st);
+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);
 
 
 extern void