diff options
| author | Marek Olšák <[email protected]> | 2017-09-29 22:31:21 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2017-09-30 19:03:07 +0200 |
| commit | da3cf0e20605af74c2a3da77e177152750a86455 (patch) | |
| tree | cd3ba971769fd935c7e0fac1e05087dbf6aca594 /src/gallium/drivers/radeonsi/si_uvd.c | |
| parent | e90a2ed88ef29f856ee1655975fc07d1ab0636e6 (diff) | |
radeonsi: don't use the template keyword
for C++ editors
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_uvd.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_uvd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c index 21582d130b4..8061f5b1fa4 100644 --- a/src/gallium/drivers/radeonsi/si_uvd.c +++ b/src/gallium/drivers/radeonsi/si_uvd.c @@ -48,7 +48,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, struct radeon_surf *surfaces[VL_NUM_COMPONENTS] = {}; struct pb_buffer **pbs[VL_NUM_COMPONENTS] = {}; const enum pipe_format *resource_formats; - struct pipe_video_buffer template; + struct pipe_video_buffer vidtemplate; struct pipe_resource templ; unsigned i, array_size; @@ -60,15 +60,15 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, return NULL; array_size = tmpl->interlaced ? 2 : 1; - template = *tmpl; - template.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); - template.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); + vidtemplate = *tmpl; + vidtemplate.width = align(tmpl->width, VL_MACROBLOCK_WIDTH); + vidtemplate.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT); assert(resource_formats[0] != PIPE_FORMAT_NONE); for (i = 0; i < VL_NUM_COMPONENTS; ++i) { if (resource_formats[i] != PIPE_FORMAT_NONE) { - vl_video_buffer_template(&templ, &template, + vl_video_buffer_template(&templ, &vidtemplate, resource_formats[i], 1, array_size, PIPE_USAGE_DEFAULT, i); /* Set PIPE_BIND_SHARED to avoid reallocation in r600_texture_get_handle, @@ -101,8 +101,8 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe, resources[i]->resource.buf); } - template.height *= array_size; - return vl_video_buffer_create_ex2(pipe, &template, (struct pipe_resource **)resources); + vidtemplate.height *= array_size; + return vl_video_buffer_create_ex2(pipe, &vidtemplate, (struct pipe_resource **)resources); error: for (i = 0; i < VL_NUM_COMPONENTS; ++i) |