Mesa (master): targets/dri: cleanup conversion leftovers

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 3b7c120be3fd0d979e2e36e87f0ceca7290ea078
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3b7c120be3fd0d979e2e36e87f0ceca7290ea078

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Jun 17 00:16:46 2014 +0100

targets/dri: cleanup conversion leftovers

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.velikov at gmail.com>
Tested-by: Rob Clark <robclark at freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard at amd.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 d9c65bd..bdd8669 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 "i915/drm/i915_drm_public.h"
@@ -52,7 +55,6 @@ static char* driver_name = NULL;
 
 #if defined(GALLIUM_I915)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_i915(void);
 
@@ -80,7 +82,6 @@ pipe_i915_create_screen(int fd)
 
 #if defined(GALLIUM_ILO)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_i965(void);
 
@@ -108,7 +109,6 @@ pipe_ilo_create_screen(int fd)
 
 #if defined(GALLIUM_NOUVEAU)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_nouveau(void);
 
@@ -131,7 +131,6 @@ pipe_nouveau_create_screen(int fd)
 
 #if defined(GALLIUM_R300)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_r300(void);
 
@@ -154,7 +153,6 @@ pipe_r300_create_screen(int fd)
 
 #if defined(GALLIUM_R600)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_r600(void);
 
@@ -177,7 +175,6 @@ pipe_r600_create_screen(int fd)
 
 #if defined(GALLIUM_RADEONSI)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_radeonsi(void);
 
@@ -200,7 +197,6 @@ pipe_radeonsi_create_screen(int fd)
 
 #if defined(GALLIUM_VMWGFX)
 #if defined(DRI_TARGET)
-#include "dri_screen.h"
 
 const __DRIextension **__driDriverGetExtensions_vmwgfx(void);
 
@@ -228,7 +224,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 bb10e8d..090103e 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