4 files changed, 12 insertions, 15 deletions
diff --git a/src/gallium/drivers/r300/r300_resource.c b/src/gallium/drivers/r300/r300_resource.c
index 0469b21b752..9b661a21246 100644
--- a/src/gallium/drivers/r300/r300_resource.c
+++ b/src/gallium/drivers/r300/r300_resource.c
@@ -22,6 +22,7 @@
  *
  * Authors: Dave Airlie
  */
+
 #include <stdio.h>
 
 #include "util/u_inlines.h"
@@ -34,32 +35,28 @@
 #include "r300_texture.h"
 #include "r300_screen.h"
 #include "r300_screen_buffer.h"
-
 #include "r300_winsys.h"
 
-
-
-
 static struct pipe_resource *
 r300_resource_create(struct pipe_screen *screen,
-                    const struct pipe_resource *template)
+                    const struct pipe_resource *templ)
 {
-   if (template->target == PIPE_BUFFER)
-      return r300_buffer_create(screen, template);
+   if (templ->target == PIPE_BUFFER)
+      return r300_buffer_create(screen, templ);
    else
-      return r300_texture_create(screen, template);
+      return r300_texture_create(screen, templ);
 
 }
 
 static struct pipe_resource *
 r300_resource_from_handle(struct pipe_screen * screen,
-			 const struct pipe_resource *template,
+			 const struct pipe_resource *templ,
 			 struct winsys_handle *whandle)
 {
-   if (template->target == PIPE_BUFFER)
+   if (templ->target == PIPE_BUFFER)
       return NULL;
    else
-      return r300_texture_from_handle(screen, template, whandle);
+      return r300_texture_from_handle(screen, templ, whandle);
 }
 
 
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.c b/src/gallium/drivers/r300/r300_screen_buffer.c
index cb47ba16882..b7b7a6eff27 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.c
+++ b/src/gallium/drivers/r300/r300_screen_buffer.c
@@ -306,7 +306,7 @@ struct u_resource_vtbl r300_buffer_vtbl =
 
 
 struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
-					 const struct pipe_resource *template)
+					 const struct pipe_resource *templ)
 {
     struct r300_screen *r300screen = r300_screen(screen);
     struct r300_buffer *rbuf;
@@ -318,7 +318,7 @@ struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
 
     rbuf->magic = R300_BUFFER_MAGIC;
 
-    rbuf->b.b = *template;
+    rbuf->b.b = *templ;
     rbuf->b.vtbl = &r300_buffer_vtbl;
     pipe_reference_init(&rbuf->b.b.reference, 1);
     rbuf->b.b.screen = screen;
diff --git a/src/gallium/drivers/r300/r300_screen_buffer.h b/src/gallium/drivers/r300/r300_screen_buffer.h
index 93009ea02fd..9409bf32b81 100644
--- a/src/gallium/drivers/r300/r300_screen_buffer.h
+++ b/src/gallium/drivers/r300/r300_screen_buffer.h
@@ -96,7 +96,7 @@ int r300_upload_index_buffer(struct r300_context *r300,
 
 
 struct pipe_resource *r300_buffer_create(struct pipe_screen *screen,
-					 const struct pipe_resource *template);
+					 const struct pipe_resource *templ);
 
 struct pipe_resource *r300_user_buffer_create(struct pipe_screen *screen,
 					      void *ptr,
diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index 7b8b40551da..453d42b188f 100644
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -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,