fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 15:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: reduce the scope of sampler_view in try_pbo_upload_common

Browse source 
We can get rid of our reference immediately, since the driver will hold
onto it for us.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Nicolai Hähnle 2016-02-03 17:58:40 +01:00
parent 13e21e3ec5
commit b27c79bd81
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/state_tracker/st_cb_texture.c
View file

@ -1296,7 +1296,6 @@ try_pbo_upload_common(struct gl_context *ctx,
{ {
struct st_context *st = st_context(ctx); struct st_context *st = st_context(ctx);
struct pipe_context *pipe = st->pipe; struct pipe_context *pipe = st->pipe;
struct pipe_sampler_view *sampler_view = NULL;
unsigned depth = surface->u.tex.last_layer - surface->u.tex.first_layer + 1; unsigned depth = surface->u.tex.last_layer - surface->u.tex.first_layer + 1;
unsigned skip_pixels = 0; unsigned skip_pixels = 0;
@ -1337,6 +1336,7 @@ try_pbo_upload_common(struct gl_context *ctx,
unsigned last_element = buf_offset + skip_pixels + upload_width - 1 unsigned last_element = buf_offset + skip_pixels + upload_width - 1
+ (upload_height - 1 + (depth - 1) * image_height) * stride; + (upload_height - 1 + (depth - 1) * image_height) * stride;
struct pipe_sampler_view templ; struct pipe_sampler_view templ;
struct pipe_sampler_view *sampler_view;
/* This should be ensured by Mesa before calling our callbacks */ /* This should be ensured by Mesa before calling our callbacks */
assert((last_element + 1) * bytes_per_pixel <= buffer->width0); assert((last_element + 1) * bytes_per_pixel <= buffer->width0);
@ -1360,6 +1360,8 @@ try_pbo_upload_common(struct gl_context *ctx,
cso_save_fragment_sampler_views(st->cso_context); cso_save_fragment_sampler_views(st->cso_context);
cso_set_sampler_views(st->cso_context, PIPE_SHADER_FRAGMENT, 1, cso_set_sampler_views(st->cso_context, PIPE_SHADER_FRAGMENT, 1,
&sampler_view); &sampler_view);
pipe_sampler_view_reference(&sampler_view, NULL);
} }
/* Upload vertices */ /* Upload vertices */
@ -1519,8 +1521,6 @@ try_pbo_upload_common(struct gl_context *ctx,
cso_restore_aux_vertex_buffer_slot(st->cso_context); cso_restore_aux_vertex_buffer_slot(st->cso_context);
cso_restore_fragment_sampler_views(st->cso_context); cso_restore_fragment_sampler_views(st->cso_context);
pipe_sampler_view_reference(&sampler_view, NULL);
return true; return true;
} }