From 5dcf62bb4344ab5276f252c07342a66b78f1d6fe Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 7 Jun 2018 01:25:35 -0700 Subject: [PATCH] iris: use u_transfer helpers for now --- src/gallium/drivers/iris/iris_resource.c | 26 +++--------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c index dde859ab795..aeed6ce5943 100644 --- a/src/gallium/drivers/iris/iris_resource.c +++ b/src/gallium/drivers/iris/iris_resource.c @@ -30,6 +30,7 @@ #include "util/u_cpu_detect.h" #include "util/u_inlines.h" #include "util/u_format.h" +#include "util/u_transfer.h" #include "util/u_upload_mgr.h" #include "util/ralloc.h" #include "iris_batch.h" @@ -564,27 +565,6 @@ iris_transfer_unmap(struct pipe_context *pipe, struct pipe_transfer *xfer) free(map); } -static void -iris_buffer_subdata(struct pipe_context *pipe, - struct pipe_resource *resource, - unsigned usage, unsigned offset, - unsigned size, const void *data) -{ -} - -static void -iris_texture_subdata(struct pipe_context *pipe, - struct pipe_resource *resource, - unsigned level, - unsigned usage, - const struct pipe_box *box, - const void *data, - unsigned stride, - unsigned layer_stride) -{ -} - - static void iris_resource_copy_region(struct pipe_context *ctx, struct pipe_resource *dst, @@ -631,7 +611,7 @@ iris_init_resource_functions(struct pipe_context *ctx) ctx->transfer_map = iris_transfer_map; ctx->transfer_flush_region = iris_transfer_flush_region; ctx->transfer_unmap = iris_transfer_unmap; - ctx->buffer_subdata = iris_buffer_subdata; - ctx->texture_subdata = iris_texture_subdata; + ctx->buffer_subdata = u_default_buffer_subdata; + ctx->texture_subdata = u_default_texture_subdata; ctx->resource_copy_region = iris_resource_copy_region; } -- 2.30.2