fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

[g3dvl] fix buffer handling in mc code

Browse source
This commit is contained in:
Christian König 2010-12-09 22:28:31 +01:00
parent 7c4887f5ae
commit 25cdc79f32
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/auxiliary/vl/vl_mpeg12_mc_renderer.c
View file

@ -1054,6 +1054,10 @@ vl_mpeg12_mc_renderer_render_macroblocks(struct vl_mpeg12_mc_renderer *renderer,
pipe_surface_reference(&buffer->past, past);
pipe_surface_reference(&buffer->future, future);
buffer->fence = fence;
} else {
/* If the surface we're rendering hasn't changed the ref frames shouldn't change. */
assert(buffer->past == past);
assert(buffer->future == future);
}
while (num_macroblocks) {
@ -1071,6 +1075,9 @@ vl_mpeg12_mc_renderer_render_macroblocks(struct vl_mpeg12_mc_renderer *renderer,
if (buffer->num_macroblocks == renderer->macroblocks_per_batch) {
vl_mpeg12_mc_unmap_buffer(renderer, buffer);
vl_mpeg12_mc_renderer_flush(renderer, buffer);
pipe_surface_reference(&buffer->surface, surface);
pipe_surface_reference(&buffer->past, past);
pipe_surface_reference(&buffer->future, future);
vl_mpeg12_mc_map_buffer(renderer, buffer);
}
}
@ -1121,12 +1128,19 @@ vl_mpeg12_mc_renderer_flush(struct vl_mpeg12_mc_renderer *renderer, struct vl_mp
if (buffer->past) {
buffer->textures.individual.ref[0] = buffer->past->texture;
buffer->sampler_views.individual.ref[0] = find_or_create_sampler_view(renderer, buffer->past);
} else {
buffer->textures.individual.ref[0] = buffer->surface->texture;
buffer->sampler_views.individual.ref[0] = find_or_create_sampler_view(renderer, buffer->surface);
}
if (buffer->future) {
buffer->textures.individual.ref[1] = buffer->future->texture;
buffer->sampler_views.individual.ref[1] = find_or_create_sampler_view(renderer, buffer->future);
} else {
buffer->textures.individual.ref[1] = buffer->surface->texture;
buffer->sampler_views.individual.ref[1] = find_or_create_sampler_view(renderer, buffer->surface);
}
renderer->pipe->set_fragment_sampler_views(renderer->pipe, 5, buffer->sampler_views.all);
renderer->pipe->bind_fragment_sampler_states(renderer->pipe, 5, renderer->samplers.all);
@ -1136,5 +1150,10 @@ vl_mpeg12_mc_renderer_flush(struct vl_mpeg12_mc_renderer *renderer, struct vl_mp
renderer->pipe->flush(renderer->pipe, PIPE_FLUSH_RENDER_CACHE, buffer->fence);
/* Next time we get this surface it may have new ref frames */
pipe_surface_reference(&buffer->surface, NULL);
pipe_surface_reference(&buffer->past, NULL);
pipe_surface_reference(&buffer->future, NULL);
buffer->num_macroblocks = 0;
}