X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_texture.h;h=ba79ec068a13e7c3f2727e89a6da9a61d1014b8c;hb=5cdedaaf295acae13ac10feeb3143d83bc53d314;hp=7b8b40551dafca2f8a293f567a09946a66f6e62e;hpb=0203136e69bfa711edd69a4f69c4539cd877b5cb;p=mesa.git

diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index 7b8b40551da..ba79ec068a1 100644
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -28,7 +28,7 @@
 struct r300_texture;
 
 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 +56,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,