aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_texture.c
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2010-04-04 03:54:09 +0200
committerMarek Olšák <[email protected]>2010-04-04 03:54:09 +0200
commit6eb892cc12047af36f4eb42050f1d2e57b0f3a3c (patch)
treece22888bf346ac739c342dfcb5e4592ccc95ccef /src/gallium/drivers/r300/r300_texture.c
parente0848bd90378ba633cfa57013c650e892d931f74 (diff)
r300g: do not use the c++ template keyword
It makes life for some code browsing utilites easier.
Diffstat (limited to 'src/gallium/drivers/r300/r300_texture.c')
-rw-r--r--src/gallium/drivers/r300/r300_texture.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 72e14bd8922..57f2766d2e0 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -785,7 +785,7 @@ static void r300_setup_tiling(struct pipe_screen *screen,
/* Create a new texture. */
static struct pipe_texture* r300_texture_create(struct pipe_screen* screen,
- const struct pipe_texture* template)
+ const struct pipe_texture* base)
{
struct r300_texture* tex = CALLOC_STRUCT(r300_texture);
struct r300_screen* rscreen = r300_screen(screen);
@@ -795,12 +795,12 @@ static struct pipe_texture* r300_texture_create(struct pipe_screen* screen,
return NULL;
}
- tex->tex = *template;
+ tex->tex = *base;
pipe_reference_init(&tex->tex.reference, 1);
tex->tex.screen = screen;
r300_setup_flags(tex);
- if (!(template->tex_usage & R300_TEXTURE_USAGE_TRANSFER)) {
+ if (!(base->tex_usage & R300_TEXTURE_USAGE_TRANSFER)) {
r300_setup_tiling(screen, tex);
}
r300_setup_miptree(rscreen, tex);
@@ -938,7 +938,7 @@ r300_video_surface_create(struct pipe_screen *screen,
unsigned width, unsigned height)
{
struct r300_video_surface *r300_vsfc;
- struct pipe_texture template;
+ struct pipe_texture base;
assert(screen);
assert(width && height);
@@ -953,17 +953,17 @@ r300_video_surface_create(struct pipe_screen *screen,
r300_vsfc->base.width = width;
r300_vsfc->base.height = height;
- memset(&template, 0, sizeof(struct pipe_texture));
- template.target = PIPE_TEXTURE_2D;
- template.format = PIPE_FORMAT_B8G8R8X8_UNORM;
- template.last_level = 0;
- template.width0 = util_next_power_of_two(width);
- template.height0 = util_next_power_of_two(height);
- template.depth0 = 1;
- template.tex_usage = PIPE_TEXTURE_USAGE_SAMPLER |
- PIPE_TEXTURE_USAGE_RENDER_TARGET;
-
- r300_vsfc->tex = screen->texture_create(screen, &template);
+ memset(&base, 0, sizeof(struct pipe_texture));
+ base.target = PIPE_TEXTURE_2D;
+ base.format = PIPE_FORMAT_B8G8R8X8_UNORM;
+ base.last_level = 0;
+ base.width0 = util_next_power_of_two(width);
+ base.height0 = util_next_power_of_two(height);
+ base.depth0 = 1;
+ base.tex_usage = PIPE_TEXTURE_USAGE_SAMPLER |
+ PIPE_TEXTURE_USAGE_RENDER_TARGET;
+
+ r300_vsfc->tex = screen->texture_create(screen, &base);
if (!r300_vsfc->tex)
{
FREE(r300_vsfc);