nvfx: add nvfx directory to build system

Will be used to hold source files unified between nv30 and nv40.

Eventually all nv30 and nv40 code will be moved there and the
nv30 and nv40 directories will be removed.

diff --git a/configure.ac b/configure.ac
index 35fbcd9..eb271e9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1360,7 +1360,7 @@ AC_ARG_ENABLE([gallium-nouveau],
     [enable_gallium_nouveau=no])
 if test "x$enable_gallium_nouveau" = xyes; then
     GALLIUM_WINSYS_DRM_DIRS="$GALLIUM_WINSYS_DRM_DIRS nouveau"
-    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nv30 nv40 nv50"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv30 nv40 nv50"
 fi
 
 dnl

diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
new file mode 100644 (file)
index 0000000..05cdda0
--- /dev/null
+++ b/src/gallium/drivers/nvfx/Makefile
@@ -0,0 +1,11 @@
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = nvfx
+
+nvfx_dummy.c:
+       touch nvfx_dummy.c
+
+C_SOURCES = nvfx_dummy.c
+
+include ../../Makefile.template

diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile
index 7e95f79..0cc6039 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/dri/Makefile
+++ b/src/gallium/winsys/drm/nouveau/dri/Makefile
@@ -3,11 +3,18 @@ include $(TOP)/configs/current
 
 LIBNAME = nouveau_dri.so
 
+# hideous hack
+-Wl,--start-group:
+-Wl,--end-group:
+
 PIPE_DRIVERS = \
        $(TOP)/src/gallium/state_trackers/dri/libdridrm.a \
        $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
+       -Wl,--start-group \
        $(TOP)/src/gallium/drivers/nv30/libnv30.a \
        $(TOP)/src/gallium/drivers/nv40/libnv40.a \
+       $(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
+       -Wl,--end-group \
        $(TOP)/src/gallium/drivers/nv50/libnv50.a \
        $(TOP)/src/gallium/drivers/nouveau/libnouveau.a
 

diff --git a/src/gallium/winsys/drm/nouveau/egl/Makefile b/src/gallium/winsys/drm/nouveau/egl/Makefile
index 2c35260..0f5e6d6 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/egl/Makefile
+++ b/src/gallium/winsys/drm/nouveau/egl/Makefile
@@ -5,10 +5,17 @@ EGL_DRIVER_NAME = nouveau
 EGL_DRIVER_SOURCES = dummy.c
 EGL_DRIVER_LIBS = -ldrm_nouveau
 
+# hideous hack
+-Wl,--start-group:
+-Wl,--end-group:
+
 EGL_DRIVER_PIPES = \
        $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
+       -Wl,--start-group \
        $(TOP)/src/gallium/drivers/nv30/libnv30.a \
        $(TOP)/src/gallium/drivers/nv40/libnv40.a \
+       $(TOP)/src/gallium/drivers/nv40/libnvfx.a \
+       -Wl,--end-group \
        $(TOP)/src/gallium/drivers/nv50/libnv50.a \
        $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
        $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a

diff --git a/src/gallium/winsys/drm/nouveau/xorg/Makefile b/src/gallium/winsys/drm/nouveau/xorg/Makefile
index 179b502..0607d82 100644 (file)
--- a/src/gallium/winsys/drm/nouveau/xorg/Makefile
+++ b/src/gallium/winsys/drm/nouveau/xorg/Makefile
@@ -15,11 +15,18 @@ INCLUDES = \
        -I$(TOP)/include \
        -I$(TOP)/src/egl/main
 
+# hideous hack
+-Wl,--start-group:
+-Wl,--end-group:
+
 LIBS = \
        $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \
        $(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
+       --Wl,--start-group \
        $(TOP)/src/gallium/drivers/nv30/libnv30.a \
        $(TOP)/src/gallium/drivers/nv40/libnv40.a \
+       $(TOP)/src/gallium/drivers/nv40/libnvfx.a \
+       --Wl,--end-group \
        $(TOP)/src/gallium/drivers/nv50/libnv50.a \
        $(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
        $(GALLIUM_AUXILIARIES)