diff --git a/src/gallium/auxiliary/util/u_compute.c b/src/gallium/auxiliary/util/u_compute.c index bc884b6ae62..171cea86adf 100644 --- a/src/gallium/auxiliary/util/u_compute.c +++ b/src/gallium/auxiliary/util/u_compute.c @@ -92,8 +92,8 @@ void util_compute_blit(struct pipe_context *ctx, struct pipe_blit_info *blit_inf float y_scale = blit_info->src.box.height / (float)blit_info->dst.box.height; float z_scale = blit_info->src.box.depth / (float)blit_info->dst.box.depth; - unsigned data[] = {u_bitcast_f2u((blit_info->src.box.x + 0.5) / (float)src->width0), - u_bitcast_f2u((blit_info->src.box.y + 0.5) / (float)src->height0), + unsigned data[] = {u_bitcast_f2u(blit_info->src.box.x / (float)src->width0), + u_bitcast_f2u(blit_info->src.box.y / (float)src->height0), u_bitcast_f2u(blit_info->src.box.z), u_bitcast_f2u(0), u_bitcast_f2u(x_scale / src->width0), diff --git a/src/gallium/frontends/va/postproc.c b/src/gallium/frontends/va/postproc.c index 946761be312..7ab56b5f4c2 100644 --- a/src/gallium/frontends/va/postproc.c +++ b/src/gallium/frontends/va/postproc.c @@ -204,7 +204,6 @@ static VAStatus vlVaPostProcBlit(vlVaDriver *drv, vlVaContext *context, memset(&blit, 0, sizeof(blit)); blit.src.resource = from->texture; - blit.src.resource->height0 = src_region->height; blit.src.format = from->format; blit.src.level = 0; blit.src.box.z = from->u.tex.first_layer; @@ -212,7 +211,6 @@ static VAStatus vlVaPostProcBlit(vlVaDriver *drv, vlVaContext *context, vlVaGetBox(src, i, &blit.src.box, src_region); blit.dst.resource = dst_surfaces[i]->texture; - blit.dst.resource->height0 = dst_region->height; blit.dst.format = dst_surfaces[i]->format; blit.dst.level = 0; blit.dst.box.z = dst_surfaces[i]->u.tex.first_layer; @@ -311,7 +309,7 @@ vlVaHandleVAProcPipelineParameterBufferType(vlVaDriver *drv, vlVaContext *contex src = src_surface->buffer; dst = dst_surface->buffer; - /* convert the destination buffer to progressive if we're deinterlacing + /* convert the destination buffer to progressive if we're deinterlacing otherwise we might end up deinterlacing twice */ if (param->num_filters && dst->interlaced) { vlVaSurface *surf;