nvc0: fixup video decoding with 2D_ARRAY

Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
This commit is contained in:
Maarten Lankhorst 2013-05-04 20:56:02 +02:00 committed by Maarten Lankhorst
parent 8c347d4e57
commit c4150123aa
2 changed files with 4 additions and 5 deletions

View file

@ -573,15 +573,14 @@ nvc0_video_buffer_create(struct pipe_context *pipe,
buffer->base.interlaced = true;
memset(&templ, 0, sizeof(templ));
templ.target = PIPE_TEXTURE_3D;
templ.depth0 = 2;
templ.target = PIPE_TEXTURE_2D_ARRAY;
templ.depth0 = 1;
templ.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET;
templ.format = PIPE_FORMAT_R8_UNORM;
templ.width0 = buffer->base.width;
templ.height0 = buffer->base.height/2;
templ.flags = NVC0_RESOURCE_FLAG_VIDEO;
templ.last_level = 0;
templ.array_size = 1;
templ.array_size = 2;
buffer->resources[0] = pipe->screen->resource_create(pipe->screen, &templ);
if (!buffer->resources[0])

View file

@ -69,7 +69,7 @@ nvc0_decoder_setup_ppp(struct nvc0_decoder *dec, struct nvc0_video_buffer *targe
struct nv50_miptree *mt = (struct nv50_miptree *)target->resources[i];
PUSH_DATA (push, mt->base.address >> 8);
PUSH_DATA (push, (mt->base.address + mt->total_size/2/mt->base.base.array_size) >> 8);
PUSH_DATA (push, (mt->base.address + mt->total_size/2) >> 8);
mt->base.status |= NOUVEAU_BUFFER_STATUS_GPU_WRITING;
}
}