vrend: attach/detach virgl_resource rather than pipe_resource

An untyped virgl_resource does not have a pipe_resource.

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Acked-by: Gert Wollny <gert.wollny@collabora.com>

src/vrend_decode.c

@@ -1469,12 +1469,7 @@ static void vrend_decode_ctx_attach_resource(struct virgl_context *ctx,
 {
    TRACE_FUNC();
    struct vrend_decode_ctx *dctx = (struct vrend_decode_ctx *)ctx;
-   /* in the future, we should import to create the pipe resource */
+   vrend_renderer_attach_res_ctx(dctx->grctx, res);
-   if (!res->pipe_resource)
-      return;
-
-   vrend_renderer_attach_res_ctx(dctx->grctx, res->res_id,
-                                 res->pipe_resource);
 }
 
 static void vrend_decode_ctx_detach_resource(struct virgl_context *ctx,
@@ -1482,7 +1477,7 @@ static void vrend_decode_ctx_detach_resource(struct virgl_context *ctx,
 {
    TRACE_FUNC();
    struct vrend_decode_ctx *dctx = (struct vrend_decode_ctx *)ctx;
-   vrend_renderer_detach_res_ctx(dctx->grctx, res->res_id);
+   vrend_renderer_detach_res_ctx(dctx->grctx, res);
 }
 
 static int vrend_decode_ctx_transfer_3d(struct virgl_context *ctx,

src/vrend_renderer.c

@@ -10421,17 +10421,21 @@ void vrend_renderer_get_rect(struct pipe_resource *pres,
 }
 
 void vrend_renderer_attach_res_ctx(struct vrend_context *ctx,
-                                   uint32_t res_id,
+                                   struct virgl_resource *res)
-                                   struct pipe_resource *pres)
 {
-   struct vrend_resource *res = (struct vrend_resource *)pres;
+   /* in the future, we should import to create the pipe resource */
-   vrend_ctx_resource_insert(ctx->res_hash, res_id, res);
+   if (!res->pipe_resource)
+      return;
+
+   vrend_ctx_resource_insert(ctx->res_hash,
+                             res->res_id,
+                             (struct vrend_resource *)res->pipe_resource);
 }
 
 void vrend_renderer_detach_res_ctx(struct vrend_context *ctx,
-                                   uint32_t res_id)
+                                   struct virgl_resource *res)
 {
-   vrend_ctx_resource_remove(ctx->res_hash, res_id);
+   vrend_ctx_resource_remove(ctx->res_hash, res->res_id);
 }
 
 static struct vrend_resource *vrend_renderer_ctx_res_lookup(struct vrend_context *ctx, int res_handle)

src/vrend_renderer.h

@@ -46,6 +46,7 @@ struct virgl_gl_ctx_param {
 };
 
 struct virgl_context;
+struct virgl_resource;
 struct vrend_context;
 
 /* Number of mipmap levels for which to keep the backing iov offsets.
@@ -405,10 +406,9 @@ void vrend_renderer_get_rect(struct pipe_resource *pres,
                              int x, int y, int width, int height);
 
 void vrend_renderer_attach_res_ctx(struct vrend_context *ctx,
-                                   uint32_t res_id,
+                                   struct virgl_resource *res);
-                                   struct pipe_resource *pres);
 void vrend_renderer_detach_res_ctx(struct vrend_context *ctx,
-                                   uint32_t res_id);
+                                   struct virgl_resource *res);
 
 struct vrend_context_tweaks *vrend_get_context_tweaks(struct vrend_context *ctx);