summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/vl
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2017-09-29 22:31:21 +0200
committerMarek Olšák <[email protected]>2017-09-30 19:03:07 +0200
commit9592c43a966ff97b4d6303efbbecd396b832c03e (patch)
tree2ec02f13d1662dab9bd861d747994b7ba37259bf /src/gallium/auxiliary/vl
parent874db83e24fb5195dea69094a58afb8b88e2a7f7 (diff)
gallium/vl: don't use the template keyword
for C++ editors Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/vl')
-rw-r--r--src/gallium/auxiliary/vl/vl_winsys_dri.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/gallium/auxiliary/vl/vl_winsys_dri.c b/src/gallium/auxiliary/vl/vl_winsys_dri.c
index b4fb47ea8e4..79ebf750cdb 100644
--- a/src/gallium/auxiliary/vl/vl_winsys_dri.c
+++ b/src/gallium/auxiliary/vl/vl_winsys_dri.c
@@ -181,7 +181,7 @@ vl_dri2_screen_texture_from_drawable(struct vl_screen *vscreen, void *drawable)
struct vl_dri_screen *scrn = (struct vl_dri_screen *)vscreen;
struct winsys_handle dri2_handle;
- struct pipe_resource template, *tex;
+ struct pipe_resource templ, *tex;
xcb_dri2_get_buffers_reply_t *reply;
xcb_dri2_dri2_buffer_t *buffers, *back_left;
@@ -235,19 +235,19 @@ vl_dri2_screen_texture_from_drawable(struct vl_screen *vscreen, void *drawable)
dri2_handle.handle = back_left->name;
dri2_handle.stride = back_left->pitch;
- memset(&template, 0, sizeof(template));
- template.target = PIPE_TEXTURE_2D;
- template.format = PIPE_FORMAT_B8G8R8X8_UNORM;
- template.last_level = 0;
- template.width0 = reply->width;
- template.height0 = reply->height;
- template.depth0 = 1;
- template.array_size = 1;
- template.usage = PIPE_USAGE_DEFAULT;
- template.bind = PIPE_BIND_RENDER_TARGET;
- template.flags = 0;
-
- tex = scrn->base.pscreen->resource_from_handle(scrn->base.pscreen, &template,
+ memset(&templ, 0, sizeof(templ));
+ templ.target = PIPE_TEXTURE_2D;
+ templ.format = PIPE_FORMAT_B8G8R8X8_UNORM;
+ templ.last_level = 0;
+ templ.width0 = reply->width;
+ templ.height0 = reply->height;
+ templ.depth0 = 1;
+ templ.array_size = 1;
+ templ.usage = PIPE_USAGE_DEFAULT;
+ templ.bind = PIPE_BIND_RENDER_TARGET;
+ templ.flags = 0;
+
+ tex = scrn->base.pscreen->resource_from_handle(scrn->base.pscreen, &templ,
&dri2_handle,
PIPE_HANDLE_USAGE_READ_WRITE);
free(reply);