[Mesa-dev] [PATCH] egl-static: Fix build with only r600 or radeonsi

Tobias Droste tdroste at gmx.de
Fri Apr 11 18:21:39 PDT 2014


radeon/drm/radeon_winsys.h and radeon/drm/radeon_drm_public.h
are needed for r300, r600 and radeonsi so include them
as soon as one of them is selected.
Also fix the comment which was probably the cause of
the problem in the first place.

Signed-off-by: Tobias Droste <tdroste at gmx.de>
---
 src/gallium/targets/egl-static/egl_pipe.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c
index 1c36919..1f28fa2 100644
--- a/src/gallium/targets/egl-static/egl_pipe.c
+++ b/src/gallium/targets/egl-static/egl_pipe.c
@@ -43,10 +43,13 @@
 #if _EGL_PIPE_NOUVEAU
 #include "nouveau/drm/nouveau_drm_public.h"
 #endif
-/* for r300 */
-#if _EGL_PIPE_R300
-#include "radeon/drm/radeon_winsys.h"
+/* for r300, r600 and radeonsi */
+#if _EGL_PIPE_R300 || _EGL_PIPE_R600 || _EGL_PIPE_RADEONSI
 #include "radeon/drm/radeon_drm_public.h"
+#include "radeon/drm/radeon_winsys.h"
+#endif
+/* for r300 */
+#if _EGL_PIPE_R600
 #include "r300/r300_public.h"
 #endif
 /* for r600 */
-- 
1.9.1



More information about the mesa-dev mailing list