With all the users converted to __driGetExtensions_* we can
have only a single inclusion of the required header + define.
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
.../auxiliary/target-helpers/inline_drm_helper.h | 11 +++-----
src/gallium/targets/dri/Makefile.am | 31 +---------------------
2 files changed, 4 insertions(+), 38 deletions(-)
diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
index 1a0fb5f..99b8de5 100644
--- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
@@ -4,6 +4,9 @@
#include "state_tracker/drm_driver.h"
#include "target-helpers/inline_debug_helper.h"
#include "loader.h"
+#if defined(DRI_TARGET)
+#include "dri_screen.h"
+#endif
#if GALLIUM_I915
#include "target-helpers/inline_wrapper_sw_helper.h"
@@ -54,7 +57,6 @@ static char* driver_name = NULL;
#if defined(GALLIUM_I915)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_i915(void);
@@ -87,7 +89,6 @@ pipe_i915_create_screen(int fd)
#if defined(GALLIUM_ILO)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_i965(void);
@@ -115,7 +116,6 @@ pipe_ilo_create_screen(int fd)
#if defined(GALLIUM_NOUVEAU)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_nouveau(void);
@@ -138,7 +138,6 @@ pipe_nouveau_create_screen(int fd)
#if defined(GALLIUM_R300)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_r300(void);
@@ -161,7 +160,6 @@ pipe_r300_create_screen(int fd)
#if defined(GALLIUM_R600)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_r600(void);
@@ -184,7 +182,6 @@ pipe_r600_create_screen(int fd)
#if defined(GALLIUM_RADEONSI)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_radeonsi(void);
@@ -207,7 +204,6 @@ pipe_radeonsi_create_screen(int fd)
#if defined(GALLIUM_VMWGFX)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_vmwgfx(void);
@@ -240,7 +236,6 @@ pipe_vmwgfx_create_screen(int fd)
#if defined(GALLIUM_FREEDRENO)
#if defined(DRI_TARGET)
-#include "dri_screen.h"
const __DRIextension **__driDriverGetExtensions_freedreno(void);
diff --git a/src/gallium/targets/dri/Makefile.am
b/src/gallium/targets/dri/Makefile.am
index a9f3b66..ac5e12c 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -8,41 +8,12 @@ AM_CFLAGS = \
$(GALLIUM_TARGET_CFLAGS)
AM_CPPFLAGS = \
+ -DDRI_TARGET \
-DGALLIUM_GALAHAD \
-DGALLIUM_NOOP \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE
-if HAVE_GALLIUM_I915
-AM_CPPFLAGS += \
- -DDRI_TARGET
-endif
-
-if HAVE_GALLIUM_ILO
-AM_CPPFLAGS += \
- -DDRI_TARGET
-endif
-
-if HAVE_GALLIUM_NOUVEAU
-AM_CPPFLAGS += \
- -DDRI_TARGET
-endif
-
-if NEED_RADEON_DRM_WINSYS
-AM_CPPFLAGS += \
- -DDRI_TARGET
-endif
-
-if HAVE_GALLIUM_SVGA
-AM_CPPFLAGS += \
- -DDRI_TARGET
-endif
-
-if HAVE_GALLIUM_FREEDRENO
-AM_CPPFLAGS += \
- -DDRI_TARGET
-endif
-
dridir = $(DRI_DRIVER_INSTALL_DIR)
dri_LTLIBRARIES = gallium_dri.la
--
2.0.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
