Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video

[mesa.git] / src / gallium / drivers / softpipe / sp_texture.h

diff --git a/src/gallium/drivers/softpipe/sp_texture.h b/src/gallium/drivers/softpipe/sp_texture.h
index 500f42fb0fde70584a097fd1dc96e1f915a8ae3a..7e3249b46f01bdf83e5f139e0fd1ae19f13923b3 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_texture.h
+++ b/src/gallium/drivers/softpipe/sp_texture.h
@@ -41,6 +41,9 @@ struct pipe_screen;
 struct softpipe_context;
 
 
+/**
+ * Subclass of pipe_resource.
+ */
 struct softpipe_resource
 {
    struct pipe_resource base;
@@ -67,6 +70,10 @@ struct softpipe_resource
    unsigned timestamp;
 };
 
+
+/**
+ * Subclass of pipe_transfer.
+ */
 struct softpipe_transfer
 {
    struct pipe_transfer base;
@@ -75,7 +82,6 @@ struct softpipe_transfer
 };
 
 
-
 /** cast wrappers */
 static INLINE struct softpipe_resource *
 softpipe_resource(struct pipe_resource *pt)
@@ -93,7 +99,7 @@ softpipe_transfer(struct pipe_transfer *pt)
 extern void
 softpipe_init_screen_texture_funcs(struct pipe_screen *screen);
 
-void
+extern void
 softpipe_init_texture_funcs(struct pipe_context *pipe);