r300g: fix glean/pointSprite using lodbias correction

[mesa.git] / src / gallium / drivers / r300 / r300_resource.c

diff --git a/src/gallium/drivers/r300/r300_resource.c b/src/gallium/drivers/r300/r300_resource.c
index 84e3fdd1379c1f02eb50c05ca6b7abe9e3a9276f..7ed47eaa6056c103d8a97b5ec8efd5c75d019948 100644 (file)
--- 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"
@@ -32,42 +33,33 @@
 
 #include "r300_context.h"
 #include "r300_texture.h"
-#include "r300_transfer.h"
 #include "r300_screen.h"
-#include "r300_state_inlines.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);
 }
 
-
-
-void
-r300_init_resource_functions(struct r300_context *r300)
+void r300_init_resource_functions(struct r300_context *r300)
 {
    r300->context.get_transfer = u_get_transfer_vtbl;
    r300->context.transfer_map = u_transfer_map_vtbl;
@@ -78,8 +70,7 @@ r300_init_resource_functions(struct r300_context *r300)
    r300->context.is_resource_referenced = u_is_resource_referenced_vtbl;
 }
 
-void
-r300_init_screen_resource_functions(struct r300_screen *r300screen)
+void r300_init_screen_resource_functions(struct r300_screen *r300screen)
 {
    r300screen->screen.resource_create = r300_resource_create;
    r300screen->screen.resource_from_handle = r300_resource_from_handle;