[g3dvl] move alignment of buffers to mb size into context

This commit is contained in:
Christian König 2011-05-15 13:08:38 +02:00
parent 6c731191c0
commit 56457ffe11
2 changed files with 4 additions and 7 deletions

View file

@ -195,8 +195,8 @@ vl_context_create_decoder(struct pipe_video_context *context,
assert(context);
assert(width > 0 && height > 0);
buffer_width = ctx->pot_buffers ? util_next_power_of_two(width) : width;
buffer_height = ctx->pot_buffers ? util_next_power_of_two(height) : height;
buffer_width = ctx->pot_buffers ? util_next_power_of_two(width) : align(width, MACROBLOCK_WIDTH);
buffer_height = ctx->pot_buffers ? util_next_power_of_two(height) : align(height, MACROBLOCK_HEIGHT);
switch (u_reduce_video_profile(profile)) {
case PIPE_VIDEO_CODEC_MPEG12:
@ -237,8 +237,8 @@ vl_context_create_buffer(struct pipe_video_context *context,
return NULL;
}
buffer_width = ctx->pot_buffers ? util_next_power_of_two(width) : width;
buffer_height = ctx->pot_buffers ? util_next_power_of_two(height) : height;
buffer_width = ctx->pot_buffers ? util_next_power_of_two(width) : align(width, MACROBLOCK_WIDTH);
buffer_height = ctx->pot_buffers ? util_next_power_of_two(height) : align(height, MACROBLOCK_HEIGHT);
result = vl_video_buffer_init(context, ctx->pipe,
buffer_width, buffer_height, 1,

View file

@ -877,9 +877,6 @@ vl_create_mpeg12_decoder(struct pipe_video_context *context,
dec->base.create_buffer = vl_mpeg12_create_buffer;
dec->base.flush_buffer = vl_mpeg12_decoder_flush_buffer;
dec->base.width = align(width, MACROBLOCK_WIDTH);
dec->base.height = align(height, MACROBLOCK_HEIGHT);
dec->pipe = pipe;
dec->quads = vl_vb_upload_quads(dec->pipe);