Merge remote branch 'origin/master' into radeon-rewrite

[mesa.git] / src / gallium / drivers / r300 / r300_texture.h

diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index 7964229a94f7f4a64b09e70811cf4e1a2fad4122..98fb5c9a08ff10fbf471f38260ca80f1369c3fc7 100644 (file)
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -28,7 +28,16 @@
 #include "util/u_math.h"
 
 #include "r300_context.h"
+#include "r300_reg.h"
 
 void r300_init_screen_texture_functions(struct pipe_screen* screen);
 
+#ifndef R300_WINSYS_H
+
+boolean r300_get_texture_buffer(struct pipe_texture* texture,
+                                struct pipe_buffer** buffer,
+                                unsigned* stride);
+
+#endif /* R300_WINSYS_H */
+
 #endif /* R300_TEXTURE_H */