summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2010-04-18 00:09:19 +0200
committerMarek Olšák <maraeo@gmail.com>2010-04-18 02:56:09 +0200
commitbb4f5fff0c782f35353e8bfc1b1227e3cc3d5986 (patch)
treee54796050c913f81fcfe0059a4056ee6953c18f3 /src/gallium/drivers/r300
parentc383defdaacab0fe7f35e7a4ae5b57228cf5310c (diff)
r300g: remove use of c++ keywords
Diffstat (limited to 'src/gallium/drivers/r300')
-rw-r--r--src/gallium/drivers/r300/r300_resource.c19
-rw-r--r--src/gallium/drivers/r300/r300_screen_buffer.c4
-rw-r--r--src/gallium/drivers/r300/r300_screen_buffer.h2
-rw-r--r--src/gallium/drivers/r300/r300_texture.h2
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 0469b21b75..9b661a2124 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 cb47ba1688..b7b7a6eff2 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 93009ea02f..9409bf32b8 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 7b8b40551d..453d42b188 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,