nv30, nv40: move last files to nvfx/ and rm -rf nv30 nv40

This is the last nvfx unification patch.

nv[34]0_fragtex.c are moved to the common directory
nv[34]0_shader.h are renamed to nv[34]0_vertprog.h and moved to
the common directory

The separate nv30 and nv40 directories are removed from the build
system

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 nvfx nv30 nv40 nv50"
+    GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS nouveau nvfx nv50"
 fi
 
 dnl

src/gallium/drivers/nv30/Makefile

@@ -1,11 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nv30
-
-C_SOURCES = \
-	nv30_fragtex.c
-
-LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/nvfx
-
-include ../../Makefile.template

src/gallium/drivers/nv40/Makefile

@@ -1,11 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nv40
-
-C_SOURCES = \
-	nv40_fragtex.c
-
-LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/nvfx
-
-include ../../Makefile.template

src/gallium/drivers/nvfx/Makefile

@@ -9,6 +9,8 @@ C_SOURCES = \
 	nvfx_draw.c \
 	nvfx_fragprog.c \
 	nvfx_fragtex.c \
+	nv30_fragtex.c \
+	nv40_fragtex.c \
 	nvfx_miptree.c \
 	nvfx_query.c \
 	nvfx_screen.c \

src/gallium/drivers/nvfx/nv30_fragtex.c

@@ -145,4 +145,3 @@ nv30_fragtex_build(struct nvfx_context *nvfx, int unit)
 
 	return so;
 }
-

src/gallium/drivers/nvfx/nv30_vertprog.h

@@ -10,7 +10,7 @@
  *   POW - EX2 + MUL + LG2
  *   SUB - ADD, second source negated
  *   SWZ - MOV
- *   XPD -  
+ *   XPD -
  *
  * Register access
  *   - Only one INPUT can be accessed per-instruction (move extras into TEMPs)

src/gallium/drivers/nvfx/nv40_vertprog.h

@@ -175,4 +175,3 @@
 #include "nvfx_shader.h"
 
 #endif
-

src/gallium/drivers/nvfx/nvfx_draw.c

@@ -9,8 +9,8 @@
 
 #include "nvfx_context.h"
 #define NVFX_SHADER_NO_FUCKEDNESS
-#include "nv30/nv30_shader.h"
-#include "nv40/nv40_shader.h"
+#include "nv30_vertprog.h"
+#include "nv40_vertprog.h"
 
 /* Simple, but crappy, swtnl path, hopefully we wont need to hit this very
  * often at all.  Uses "quadro style" vertex submission + a fixed vertex

src/gallium/drivers/nvfx/nvfx_vertprog.c

@@ -33,8 +33,8 @@
 #define MASK_ALL (MASK_X|MASK_Y|MASK_Z|MASK_W)
 #define DEF_SCALE 0
 #define DEF_CTEST 0
-#include "nv30/nv30_shader.h"
-#include "nv40/nv40_shader.h"
+#include "nv30_vertprog.h"
+#include "nv40_vertprog.h"
 
 #define swz(s,x,y,z,w) nvfx_sr_swz((s), SWZ_##x, SWZ_##y, SWZ_##z, SWZ_##w)
 #define neg(s) nvfx_sr_neg((s))

src/gallium/winsys/drm/nouveau/dri/Makefile

@@ -3,18 +3,10 @@ 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
 

src/gallium/winsys/drm/nouveau/egl/Makefile

@@ -5,17 +5,9 @@ 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/nvfx/libnvfx.a \
 	$(TOP)/src/gallium/drivers/nv50/libnv50.a \
 	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a

src/gallium/winsys/drm/nouveau/xorg/Makefile

@@ -15,18 +15,10 @@ 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/nvfx/libnvfx.a \
 	$(TOP)/src/gallium/drivers/nv50/libnv50.a \
 	$(TOP)/src/gallium/drivers/nouveau/libnouveau.a \
 	$(GALLIUM_AUXILIARIES)