[Mesa-dev] [PATCH] r600g, radeonsi: Don't set resource_create in r600_common_screen_init()

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Tue, Jan 28, 2014 at 4:01 PM, Tom Stellard <tom at stellard.net> wrote:
> From: Tom Stellard <thomas.stellard at amd.com>
>
> r600g and radeonsi have different implementations of resource_create.
>
> https://bugs.freedesktop.org/show_bug.cgi?id=74139
> ---
>  src/gallium/drivers/radeon/r600_pipe_common.c | 1 -
>  src/gallium/drivers/radeonsi/si_pipe.c        | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index f40adf2..98164f0 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -598,7 +598,6 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
>         rscreen->b.fence_finish = r600_fence_finish;
>         rscreen->b.fence_reference = r600_fence_reference;
>         rscreen->b.fence_signalled = r600_fence_signalled;
> -       rscreen->b.resource_create = r600_resource_create_common;
>         rscreen->b.resource_destroy = u_resource_destroy_vtbl;
>
>         if (rscreen->info.has_uvd) {
> diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
> index 2249f79..5182ec1 100644
> --- a/src/gallium/drivers/radeonsi/si_pipe.c
> +++ b/src/gallium/drivers/radeonsi/si_pipe.c
> @@ -413,6 +413,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws)
>         sscreen->b.b.get_param = si_get_param;
>         sscreen->b.b.get_shader_param = si_get_shader_param;
>         sscreen->b.b.is_format_supported = si_is_format_supported;
> +       sscreen->b.b.resource_create = r600_resource_create_common;
>
>         if (!r600_common_screen_init(&sscreen->b, ws)) {
>                 FREE(sscreen);
> --
> 1.8.1.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev