From cc4f8c933c0f7c6396ce75e73b1ae18624ad95d7 Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@chromium.org>
Date: Mon, 3 Dec 2018 15:27:40 -0800
Subject: [PATCH] vrend: add a common decoding function

This can be shared by VIRGL_CCMD_TRANSFER3D and
VIRGL_CCMD_RESOURCE_INLINE_WRITE.

Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
---
 src/vrend_decode.c   | 41 ++++++++++++++++++++---------------------
 src/vrend_renderer.h |  1 +
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/vrend_decode.c b/src/vrend_decode.c
index 351f86c..105f0c8 100644
--- a/src/vrend_decode.c
+++ b/src/vrend_decode.c
@@ -336,12 +336,26 @@ static int vrend_decode_set_sampler_views(struct vrend_decode_ctx *ctx, uint16_t
    return 0;
 }
 
+static void vrend_decode_transfer_common(struct vrend_decode_ctx *ctx, struct vrend_transfer_info *info)
+{
+   info->handle = get_buf_entry(ctx, VIRGL_RESOURCE_IW_RES_HANDLE);
+   info->level = get_buf_entry(ctx, VIRGL_RESOURCE_IW_LEVEL);
+   info->usage = get_buf_entry(ctx, VIRGL_RESOURCE_IW_USAGE);
+   info->stride = get_buf_entry(ctx, VIRGL_RESOURCE_IW_STRIDE);
+   info->layer_stride = get_buf_entry(ctx, VIRGL_RESOURCE_IW_LAYER_STRIDE);
+   info->box->x = get_buf_entry(ctx, VIRGL_RESOURCE_IW_X);
+   info->box->y = get_buf_entry(ctx, VIRGL_RESOURCE_IW_Y);
+   info->box->z = get_buf_entry(ctx, VIRGL_RESOURCE_IW_Z);
+   info->box->width = get_buf_entry(ctx, VIRGL_RESOURCE_IW_W);
+   info->box->height = get_buf_entry(ctx, VIRGL_RESOURCE_IW_H);
+   info->box->depth = get_buf_entry(ctx, VIRGL_RESOURCE_IW_D);
+}
+
 static int vrend_decode_resource_inline_write(struct vrend_decode_ctx *ctx, uint16_t length)
 {
-   struct vrend_transfer_info info;
    struct pipe_box box;
-   uint32_t res_handle;
-   uint32_t level, usage, stride, layer_stride, data_len;
+   struct vrend_transfer_info info;
+   uint32_t data_len;
    struct iovec dataiovec;
    void *data;
 
@@ -351,27 +365,12 @@ static int vrend_decode_resource_inline_write(struct vrend_decode_ctx *ctx, uint
    if (length + ctx->ds->buf_offset > ctx->ds->buf_total)
       return EINVAL;
 
-   res_handle = get_buf_entry(ctx, VIRGL_RESOURCE_IW_RES_HANDLE);
+   info.box = &box;
+   vrend_decode_transfer_common(ctx, &info);
    data_len = (length - 11) * 4;
-   level = get_buf_entry(ctx, VIRGL_RESOURCE_IW_LEVEL);
-   usage = get_buf_entry(ctx, VIRGL_RESOURCE_IW_USAGE);
-   stride = get_buf_entry(ctx, VIRGL_RESOURCE_IW_STRIDE);
-   layer_stride = get_buf_entry(ctx, VIRGL_RESOURCE_IW_LAYER_STRIDE);
-   box.x = get_buf_entry(ctx, VIRGL_RESOURCE_IW_X);
-   box.y = get_buf_entry(ctx, VIRGL_RESOURCE_IW_Y);
-   box.z = get_buf_entry(ctx, VIRGL_RESOURCE_IW_Z);
-   box.width = get_buf_entry(ctx, VIRGL_RESOURCE_IW_W);
-   box.height = get_buf_entry(ctx, VIRGL_RESOURCE_IW_H);
-   box.depth = get_buf_entry(ctx, VIRGL_RESOURCE_IW_D);
-
    data = get_buf_ptr(ctx, VIRGL_RESOURCE_IW_DATA_START);
 
-   info.handle = res_handle;
    info.ctx_id = 0;
-   info.level = level;
-   info.stride = stride;
-   info.layer_stride = layer_stride;
-   info.box = &box;
    info.offset = 0;
 
    dataiovec.iov_base = data;
@@ -379,7 +378,7 @@ static int vrend_decode_resource_inline_write(struct vrend_decode_ctx *ctx, uint
 
    info.iovec = &dataiovec;
    info.iovec_cnt = 1;
-   return vrend_transfer_inline_write(ctx->grctx, &info, usage);
+   return vrend_transfer_inline_write(ctx->grctx, &info, info.usage);
 }
 
 static int vrend_decode_draw_vbo(struct vrend_decode_ctx *ctx, int length)
diff --git a/src/vrend_renderer.h b/src/vrend_renderer.h
index b9c912d..321c7eb 100644
--- a/src/vrend_renderer.h
+++ b/src/vrend_renderer.h
@@ -91,6 +91,7 @@ struct vrend_transfer_info {
    int level;
    uint32_t stride;
    uint32_t layer_stride;
+   uint32_t usage;
    unsigned int iovec_cnt;
    struct iovec *iovec;
    uint64_t offset;