winsys/radeon: fold cs_set_flush_callback into cs_create

[mesa.git] / src / gallium / drivers / radeonsi / si_uvd.c

diff --git a/src/gallium/drivers/radeonsi/si_uvd.c b/src/gallium/drivers/radeonsi/si_uvd.c
index 241288f08bdda6f7eb8cc1f321ef290bca4d9050..9f25cd6b09a273e27c785c408595b5f7eeb5878b 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_uvd.c
+++ b/src/gallium/drivers/radeonsi/si_uvd.c
@@ -34,6 +34,7 @@
 #include "si_pipe.h"
 #include "radeon/radeon_video.h"
 #include "radeon/radeon_uvd.h"
+#include "radeon/radeon_vce.h"
 
 /**
  * creates an video buffer with an UVD compatible memory layout
@@ -130,11 +131,30 @@ static struct radeon_winsys_cs_handle* si_uvd_set_dtb(struct ruvd_msg *msg, stru
        return luma->resource.cs_buf;
 }
 
+/* get the radeon resources for VCE */
+static void si_vce_get_buffer(struct pipe_resource *resource,
+                             struct radeon_winsys_cs_handle **handle,
+                             struct radeon_surface **surface)
+{
+       struct r600_texture *res = (struct r600_texture *)resource;
+
+       if (handle)
+               *handle = res->resource.cs_buf;
+
+       if (surface)
+               *surface = &res->surface;
+}
+
 /**
  * creates an UVD compatible decoder
  */
 struct pipe_video_codec *si_uvd_create_decoder(struct pipe_context *context,
                                               const struct pipe_video_codec *templ)
 {
+       struct si_context *ctx = (struct si_context *)context;
+
+        if (templ->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE)
+                return rvce_create_encoder(context, templ, ctx->b.ws, si_vce_get_buffer);
+
        return ruvd_create_decoder(context, templ, si_uvd_set_dtb);
 }