src/gallium/targets/egl-static/egl_pipe.c | 17 +++++++++++++++++ src/gallium/targets/pipe-loader/pipe_r300.c | 2 +- src/gallium/targets/pipe-loader/pipe_r600.c | 1 + src/gallium/targets/pipe-loader/pipe_radeonsi.c | 1 + 4 files changed, 20 insertions(+), 1 deletion(-)
New commits: commit 9d36a8d4d27230dd91d4c4002a781edeec22d044 Author: José Fonseca <jfons...@vmware.com> Date: Fri Apr 11 16:46:02 2014 +0100 egl-static: Fix missing radeon_surface.h includes. Fixes fatal error: radeon_surface.h: No such file or directory when libdrm is not present, or non-Linux OSes. Trivial. diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index a61cde8..1c36919 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -29,27 +29,43 @@ #include "egl_pipe.h" /* for i915 */ +#if _EGL_PIPE_I915 #include "i915/drm/i915_drm_public.h" #include "i915/i915_public.h" #include "target-helpers/inline_wrapper_sw_helper.h" +#endif /* for ilo */ +#if _EGL_PIPE_ILO #include "intel/intel_winsys.h" #include "ilo/ilo_public.h" +#endif /* for nouveau */ +#if _EGL_PIPE_NOUVEAU #include "nouveau/drm/nouveau_drm_public.h" +#endif /* for r300 */ +#if _EGL_PIPE_R300 #include "radeon/drm/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "r300/r300_public.h" +#endif /* for r600 */ +#if _EGL_PIPE_R600 #include "r600/r600_public.h" +#endif /* for radeonsi */ +#if _EGL_PIPE_RADEONSI #include "radeonsi/si_public.h" +#endif /* for vmwgfx */ +#if _EGL_PIPE_VMWGFX #include "svga/drm/svga_drm_public.h" #include "svga/svga_public.h" +#endif /* for freedreno */ +#if _EGL_PIPE_FREEDRENO #include "freedreno/drm/freedreno_drm_public.h" +#endif static struct pipe_screen * pipe_i915_create_screen(int fd) commit 5ac3435a47c616286c5a5ee16148f829493c2127 Author: Knut Andre Tidemann <knut.andre.tidem...@jotron.com> Date: Fri Apr 11 08:59:11 2014 +0200 gallium/radeon: fix missing winsys include in pipe-loader. The commit 3b0b44f7def0acb4f7a7aef086c0bece321418a6 introduced a build error: error: dereferencing pointer to incomplete type This patch fixes this issue in all the affected files. Reviewed-by: Tom Stellard <thomas.stell...@amd.com> diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index ce734fb..a61cde8 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -38,6 +38,7 @@ /* for nouveau */ #include "nouveau/drm/nouveau_drm_public.h" /* for r300 */ +#include "radeon/drm/radeon_winsys.h" #include "radeon/drm/radeon_drm_public.h" #include "r300/r300_public.h" /* for r600 */ diff --git a/src/gallium/targets/pipe-loader/pipe_r300.c b/src/gallium/targets/pipe-loader/pipe_r300.c index 388b091..6ab7e74 100644 --- a/src/gallium/targets/pipe-loader/pipe_r300.c +++ b/src/gallium/targets/pipe-loader/pipe_r300.c @@ -1,7 +1,7 @@ - #include "target-helpers/inline_debug_helper.h" #include "state_tracker/drm_driver.h" #include "radeon/drm/radeon_drm_public.h" +#include "radeon/drm/radeon_winsys.h" #include "r300/r300_public.h" static struct pipe_screen * diff --git a/src/gallium/targets/pipe-loader/pipe_r600.c b/src/gallium/targets/pipe-loader/pipe_r600.c index 0c59087..2e6bd42 100644 --- a/src/gallium/targets/pipe-loader/pipe_r600.c +++ b/src/gallium/targets/pipe-loader/pipe_r600.c @@ -1,6 +1,7 @@ #include "state_tracker/drm_driver.h" #include "target-helpers/inline_debug_helper.h" #include "radeon/drm/radeon_drm_public.h" +#include "radeon/drm/radeon_winsys.h" #include "r600/r600_public.h" static struct pipe_screen * diff --git a/src/gallium/targets/pipe-loader/pipe_radeonsi.c b/src/gallium/targets/pipe-loader/pipe_radeonsi.c index 406ba1e..9a8feae 100644 --- a/src/gallium/targets/pipe-loader/pipe_radeonsi.c +++ b/src/gallium/targets/pipe-loader/pipe_radeonsi.c @@ -1,6 +1,7 @@ #include "state_tracker/drm_driver.h" #include "target-helpers/inline_debug_helper.h" #include "radeon/drm/radeon_drm_public.h" +#include "radeon/drm/radeon_winsys.h" #include "radeonsi/si_public.h" static struct pipe_screen * -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/e1wyefk-0002r9...@moszumanska.debian.org