r300g: fix warnings

[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 7b8b40551dafca2f8a293f567a09946a66f6e62e..99e7694254e071d5daac13e92545c1a33711e6e4 100644 (file)
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -23,12 +23,19 @@
 #ifndef R300_TEXTURE_H
 #define R300_TEXTURE_H
 
-#include "util/u_format.h"
+#include "pipe/p_format.h"
 
+struct pipe_screen;
+struct pipe_resource;
+struct winsys_handle;
 struct r300_texture;
+struct r300_screen;
+
+unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format,
+                                   const unsigned char *swizzle_view);
 
 uint32_t r300_translate_texformat(enum pipe_format format,
-                                  const unsigned char *swizzle);
+                                  const unsigned char *swizzle_view);
 
 uint32_t r500_tx_format_msb_bit(enum pipe_format format);
 
@@ -56,7 +63,7 @@ r300_texture_from_handle(struct pipe_screen* screen,
 
 struct pipe_resource*
 r300_texture_create(struct pipe_screen* screen,
-                   const struct pipe_resource* template);
+                   const struct pipe_resource* templ);
 
 
 struct pipe_surface* r300_get_tex_surface(struct pipe_screen* screen,