From be8eeb3b59abf18d6b706016c5fa05b746d88f65 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 7 May 2019 10:01:31 -0700 Subject: [PATCH] virgl: remove unused virgl_transfer_inline_write It currently has no user and is probably incorrect (resource_wait is required in some more cases). Remove it so that we can focus on transfers first. Signed-off-by: Chia-I Wu Reviewed-by: Alexandros Frantzis Reviewed-by: Gurchetan Singh --- src/gallium/drivers/virgl/virgl_context.c | 33 ----------------------- src/gallium/drivers/virgl/virgl_context.h | 9 ------- 2 files changed, 42 deletions(-) diff --git a/src/gallium/drivers/virgl/virgl_context.c b/src/gallium/drivers/virgl/virgl_context.c index b3119ee95cc..24775930d86 100644 --- a/src/gallium/drivers/virgl/virgl_context.c +++ b/src/gallium/drivers/virgl/virgl_context.c @@ -514,39 +514,6 @@ static void virgl_set_constant_buffer(struct pipe_context *ctx, } } -void virgl_transfer_inline_write(struct pipe_context *ctx, - struct pipe_resource *res, - unsigned level, - unsigned usage, - const struct pipe_box *box, - const void *data, - unsigned stride, - unsigned layer_stride) -{ - struct virgl_context *vctx = virgl_context(ctx); - struct virgl_screen *vs = virgl_screen(ctx->screen); - struct virgl_resource *grres = virgl_resource(res); - struct virgl_transfer trans = { 0 }; - - trans.base.resource = res; - trans.base.level = level; - trans.base.usage = usage; - trans.base.box = *box; - trans.base.stride = stride; - trans.base.layer_stride = layer_stride; - trans.offset = box->x; - - virgl_resource_dirty(grres, 0); - - if (virgl_res_needs_flush(vctx, &trans)) { - ctx->flush(ctx, NULL, 0); - vs->vws->resource_wait(vs->vws, grres->hw_res); - } - - virgl_encoder_inline_write(vctx, grres, level, usage, - box, data, stride, layer_stride); -} - static void *virgl_shader_encoder(struct pipe_context *ctx, const struct pipe_shader_state *shader, unsigned type) diff --git a/src/gallium/drivers/virgl/virgl_context.h b/src/gallium/drivers/virgl/virgl_context.h index 828e72514a4..38a39311215 100644 --- a/src/gallium/drivers/virgl/virgl_context.h +++ b/src/gallium/drivers/virgl/virgl_context.h @@ -115,15 +115,6 @@ void virgl_init_blit_functions(struct virgl_context *vctx); void virgl_init_query_functions(struct virgl_context *vctx); void virgl_init_so_functions(struct virgl_context *vctx); -void virgl_transfer_inline_write(struct pipe_context *ctx, - struct pipe_resource *res, - unsigned level, - unsigned usage, - const struct pipe_box *box, - const void *data, - unsigned stride, - unsigned layer_stride); - struct tgsi_token *virgl_tgsi_transform(struct virgl_context *vctx, const struct tgsi_token *tokens_in); #endif -- 2.30.2