etnaviv: update Android build files

[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 b6cb4cb69e23749c94a3dbf8a159bfbd17e5d431..5511c2d7ad2a6a361840f31baba92b680a0934f4 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_uvd.c
+++ b/src/gallium/drivers/radeonsi/si_uvd.c
@@ -40,80 +40,19 @@
 struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
                                                 const struct pipe_video_buffer *tmpl)
 {
-       struct si_context *ctx = (struct si_context *)pipe;
-       struct r600_texture *resources[VL_NUM_COMPONENTS] = {};
-       struct radeon_surf *surfaces[VL_NUM_COMPONENTS] = {};
-       struct pb_buffer **pbs[VL_NUM_COMPONENTS] = {};
-       const enum pipe_format *resource_formats;
-       struct pipe_video_buffer vidtemplate;
-       struct pipe_resource templ;
-       unsigned i, array_size;
+       struct pipe_video_buffer vidbuf = *tmpl;
+       /* TODO: get tiling working */
+       vidbuf.bind |= PIPE_BIND_LINEAR;
 
-       assert(pipe);
-
-       /* first create the needed resources as "normal" textures */
-       resource_formats = vl_video_buffer_formats(pipe->screen, tmpl->buffer_format);
-       if (!resource_formats)
-               return NULL;
-
-       array_size = tmpl->interlaced ? 2 : 1;
-       vidtemplate = *tmpl;
-       vidtemplate.width = align(tmpl->width, VL_MACROBLOCK_WIDTH);
-       vidtemplate.height = align(tmpl->height / array_size, VL_MACROBLOCK_HEIGHT);
-
-       assert(resource_formats[0] != PIPE_FORMAT_NONE);
-
-       for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
-               if (resource_formats[i] != PIPE_FORMAT_NONE) {
-                       vl_video_buffer_template(&templ, &vidtemplate,
-                                                resource_formats[i], 1,
-                                                array_size, PIPE_USAGE_DEFAULT, i);
-                       /* Set PIPE_BIND_SHARED to avoid reallocation in r600_texture_get_handle,
-                        * which can't handle joined surfaces. */
-                       /* TODO: get tiling working */
-                       templ.bind = PIPE_BIND_LINEAR | PIPE_BIND_SHARED;
-                       resources[i] = (struct r600_texture *)
-                                       pipe->screen->resource_create(pipe->screen, &templ);
-                       if (!resources[i])
-                               goto error;
-               }
-       }
-
-       for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
-               if (!resources[i])
-                       continue;
-
-               surfaces[i] = & resources[i]->surface;
-               pbs[i] = &resources[i]->resource.buf;
-       }
-
-       si_vid_join_surfaces(&ctx->b, pbs, surfaces);
-
-       for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
-               if (!resources[i])
-                       continue;
-
-               /* reset the address */
-               resources[i]->resource.gpu_address = ctx->b.ws->buffer_get_virtual_address(
-                       resources[i]->resource.buf);
-       }
-
-       vidtemplate.height *= array_size;
-       return vl_video_buffer_create_ex2(pipe, &vidtemplate, (struct pipe_resource **)resources);
-
-error:
-       for (i = 0; i < VL_NUM_COMPONENTS; ++i)
-               r600_texture_reference(&resources[i], NULL);
-
-       return NULL;
+       return vl_video_buffer_create_as_resource(pipe, &vidbuf);
 }
 
 /* set the decoding target buffer offsets */
 static struct pb_buffer* si_uvd_set_dtb(struct ruvd_msg *msg, struct vl_video_buffer *buf)
 {
        struct si_screen *sscreen = (struct si_screen*)buf->base.context->screen;
-       struct r600_texture *luma = (struct r600_texture *)buf->resources[0];
-       struct r600_texture *chroma = (struct r600_texture *)buf->resources[1];
+       struct si_texture *luma = (struct si_texture *)buf->resources[0];
+       struct si_texture *chroma = (struct si_texture *)buf->resources[1];
        enum ruvd_surface_type type =  (sscreen->info.chip_class >= GFX9) ?
                                        RUVD_SURFACE_TYPE_GFX9 :
                                        RUVD_SURFACE_TYPE_LEGACY;
@@ -122,7 +61,7 @@ static struct pb_buffer* si_uvd_set_dtb(struct ruvd_msg *msg, struct vl_video_bu
 
        si_uvd_set_dt_surfaces(msg, &luma->surface, (chroma) ? &chroma->surface : NULL, type);
 
-       return luma->resource.buf;
+       return luma->buffer.buf;
 }
 
 /* get the radeon resources for VCE */
@@ -130,10 +69,10 @@ static void si_vce_get_buffer(struct pipe_resource *resource,
                              struct pb_buffer **handle,
                              struct radeon_surf **surface)
 {
-       struct r600_texture *res = (struct r600_texture *)resource;
+       struct si_texture *res = (struct si_texture *)resource;
 
        if (handle)
-               *handle = res->resource.buf;
+               *handle = res->buffer.buf;
 
        if (surface)
                *surface = &res->surface;
@@ -146,16 +85,16 @@ 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;
-       bool vcn = (ctx->b.family == CHIP_RAVEN) ? true : false;
+       bool vcn = ctx->family >= CHIP_RAVEN;
 
        if (templ->entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
                if (vcn) {
-                       return radeon_create_encoder(context, templ, ctx->b.ws, si_vce_get_buffer);
+                       return radeon_create_encoder(context, templ, ctx->ws, si_vce_get_buffer);
                } else {
                        if (u_reduce_video_profile(templ->profile) == PIPE_VIDEO_FORMAT_HEVC)
-                               return radeon_uvd_create_encoder(context, templ, ctx->b.ws, si_vce_get_buffer);
+                               return radeon_uvd_create_encoder(context, templ, ctx->ws, si_vce_get_buffer);
                        else
-                               return si_vce_create_encoder(context, templ, ctx->b.ws, si_vce_get_buffer);
+                               return si_vce_create_encoder(context, templ, ctx->ws, si_vce_get_buffer);
                }
        }