summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2014-06-16 23:51:12 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2014-07-10 01:06:48 +0100
commit3591acacf9579033aeaf3ccade59ad02288236e9 (patch)
tree3f474f1a9d46a3a7f5d11e5ea58527329b5d301c
parentf48b06f89d62e4b7db3048a778d409f05d3dfc7b (diff)
targets/dri: Add __driDriverGetExtensions_i915 symbol
Identical to previous commits - will bring us a step closer to megadrivers. Cc: Stephane Marchesin <stephane.marchesin@gmail.com> Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Tested-by: Rob Clark <robclark@freedesktop.org> Tested-by: Thomas Helland <thomashelland90 at gmail.com> Acked-by: Tom Stellard <thomas.stellard@amd.com>
-rw-r--r--src/gallium/auxiliary/target-helpers/inline_drm_helper.h12
-rw-r--r--src/gallium/targets/dri/Makefile.am5
2 files changed, 17 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
index 6c9f15a830e..48753a63f9d 100644
--- a/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/inline_drm_helper.h
@@ -51,6 +51,18 @@ static char* driver_name = NULL;
/* XXX: We need to teardown the winsys if *screen_create() fails. */
#if defined(GALLIUM_I915)
+#if defined(DRI_TARGET)
+#include "dri_screen.h"
+
+const __DRIextension **__driDriverGetExtensions_i915(void);
+
+PUBLIC const __DRIextension **__driDriverGetExtensions_i915(void)
+{
+ globalDriverAPI = &galliumdrm_driver_api;
+ return galliumdrm_driver_extensions;
+}
+#endif
+
static struct pipe_screen *
pipe_i915_create_screen(int fd)
{
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index d5cbae57cc9..a09883388a7 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -13,6 +13,11 @@ AM_CPPFLAGS = \
-DGALLIUM_RBUG \
-DGALLIUM_TRACE
+if HAVE_GALLIUM_I915
+AM_CPPFLAGS += \
+ -DDRI_TARGET
+endif
+
if HAVE_GALLIUM_NOUVEAU
AM_CPPFLAGS += \
-DDRI_TARGET