diff options
| author | Emil Velikov <[email protected]> | 2014-06-16 23:30:44 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-07-10 01:06:47 +0100 |
| commit | 5b7e43aea89847100b929989c21d23da124d4936 (patch) | |
| tree | 60a9d72688f989c730f87c4051250f1102e280a9 /src/gallium/targets | |
| parent | 532eb72be3894329eb751813f84882cf82478b8c (diff) | |
targets/dri: Add __driDriverGetExtensions_nouveau symbol
The symbol is introduced by the mesa megadrivers, and adding
gallium support for it will allow us to merge st/dri/drm and
st/dri/sw. Resulting in a single dri library across gallium.
v2: Rebase on top of gallium dri3.
Signed-off-by: Emil Velikov <[email protected]>
Tested-by: Rob Clark <[email protected]>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri/Makefile.am | 9 | ||||
| -rw-r--r-- | src/gallium/targets/dri/dri.sym | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am index cb1206452e4..f9d34828452 100644 --- a/src/gallium/targets/dri/Makefile.am +++ b/src/gallium/targets/dri/Makefile.am @@ -1,6 +1,10 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ + -I$(top_srcdir)/src/mapi \ + -I$(top_srcdir)/src/mesa \ + -I$(top_srcdir)/src/mesa/drivers/dri/common \ + -I$(top_srcdir)/src/gallium/state_trackers/dri/common \ $(GALLIUM_TARGET_CFLAGS) AM_CPPFLAGS = \ @@ -9,6 +13,11 @@ AM_CPPFLAGS = \ -DGALLIUM_RBUG \ -DGALLIUM_TRACE +if HAVE_GALLIUM_NOUVEAU +AM_CPPFLAGS += \ + -DDRI_TARGET +endif + dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = gallium_dri.la diff --git a/src/gallium/targets/dri/dri.sym b/src/gallium/targets/dri/dri.sym index c99aa09b4d9..49a2cc9fcf2 100644 --- a/src/gallium/targets/dri/dri.sym +++ b/src/gallium/targets/dri/dri.sym @@ -1,6 +1,7 @@ { global: __driDriverExtensions; + __driDriverGetExtensions*; nouveau_drm_screen_create; radeon_drm_winsys_create; local: |