Attachment 133223 Details for Bug 102014 – Fixes build for current Mesa-git

[patch] Fixes build for current Mesa-git

bug-102014.patch (text/plain), 2.36 KB, created by Marko on 2017-08-03 08:23:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marko

Created: 2017-08-03 08:23:29 UTC

Size: 2.36 KB

patch

obsolete

>diff --git a/src/gallium/targets/pipe-loader/Makefile.am b/src/gallium/targets/pipe-loader/Makefile.am
>index 400b198fe2..c58fa4e169 100644
>--- a/src/gallium/targets/pipe-loader/Makefile.am
>+++ b/src/gallium/targets/pipe-loader/Makefile.am
>@@ -146,6 +146,7 @@ pipe_radeonsi_la_LIBADD = \
> 	$(top_builddir)/src/gallium/drivers/radeon/libradeon.la \
> 	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
> 	$(top_builddir)/src/amd/common/libamd_common.la \
>+	$(top_builddir)/src/util/libxmlconfig.la \  
> 	$(LIBDRM_LIBS) \
> 	$(RADEON_LIBS) \
> 	$(AMDGPU_LIBS)
>diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c
>index 0dcc0191df..8aa1ba8735 100644
>--- a/src/gallium/targets/pipe-loader/pipe_r300.c
>+++ b/src/gallium/targets/pipe-loader/pipe_r300.c
>@@ -9,7 +9,7 @@ create_screen(int fd, const struct pipe_screen_config *config)
> {
>    struct radeon_winsys *sws;
> 
>-   sws = radeon_drm_winsys_create(fd, flags, r300_screen_create);
>+   sws = radeon_drm_winsys_create(fd, config, r300_screen_create);
>    return sws ? debug_screen_wrap(sws->screen) : NULL;
> }
> 
>diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c
>index 0eedde76be..a6051aa225 100644
>--- a/src/gallium/targets/pipe-loader/pipe_r600.c
>+++ b/src/gallium/targets/pipe-loader/pipe_r600.c
>@@ -9,7 +9,7 @@ create_screen(int fd, const struct pipe_screen_config *config)
> {
>    struct radeon_winsys *rw;
> 
>-   rw = radeon_drm_winsys_create(fd, flags, r600_screen_create);
>+   rw = radeon_drm_winsys_create(fd, config, r600_screen_create);
>    return rw ? debug_screen_wrap(rw->screen) : NULL;
> }
> 
>diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
>index 2d33d0e336..2defc521b2 100644
>--- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c
>+++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c
>@@ -12,10 +12,10 @@ create_screen(int fd, const struct pipe_screen_config *config)
>    struct radeon_winsys *rw;
> 
>    /* First, try amdgpu. */
>-   rw = amdgpu_winsys_create(fd, flags, radeonsi_screen_create);
>+   rw = amdgpu_winsys_create(fd, config, radeonsi_screen_create);
> 
>    if (!rw)
>-      rw = radeon_drm_winsys_create(fd, flags, radeonsi_screen_create);
>+      rw = radeon_drm_winsys_create(fd, config, radeonsi_screen_create);
> 
>    return rw ? debug_screen_wrap(rw->screen) : NULL;
> }

Actions: View | Splinter Review

Attachments on bug 102014: 133196 | 133197 | 133198 | 133223

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.