summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorLuca Barbieri <[email protected]>2010-02-21 15:13:12 +0100
committerYounes Manton <[email protected]>2010-03-15 00:03:04 -0400
commitf9d09a2e7859a2cf025d71b7c3cb189edb6688c4 (patch)
treee53f6e5ff88aeb1bb8796822c02f20225b7e01ca /src/gallium
parent7d210fa05f286eb19398ac2f8c8f631f6f83c859 (diff)
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
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/nv30/Makefile11
-rw-r--r--src/gallium/drivers/nv40/Makefile11
-rw-r--r--src/gallium/drivers/nvfx/Makefile2
-rw-r--r--src/gallium/drivers/nvfx/nv30_fragtex.c (renamed from src/gallium/drivers/nv30/nv30_fragtex.c)1
-rw-r--r--src/gallium/drivers/nvfx/nv30_vertprog.h (renamed from src/gallium/drivers/nv30/nv30_shader.h)2
-rw-r--r--src/gallium/drivers/nvfx/nv40_fragtex.c (renamed from src/gallium/drivers/nv40/nv40_fragtex.c)0
-rw-r--r--src/gallium/drivers/nvfx/nv40_vertprog.h (renamed from src/gallium/drivers/nv40/nv40_shader.h)1
-rw-r--r--src/gallium/drivers/nvfx/nvfx_draw.c4
-rw-r--r--src/gallium/drivers/nvfx/nvfx_vertprog.c4
-rw-r--r--src/gallium/winsys/drm/nouveau/dri/Makefile8
-rw-r--r--src/gallium/winsys/drm/nouveau/egl/Makefile10
-rw-r--r--src/gallium/winsys/drm/nouveau/xorg/Makefile10
12 files changed, 9 insertions, 55 deletions
diff --git a/src/gallium/drivers/nv30/Makefile b/src/gallium/drivers/nv30/Makefile
deleted file mode 100644
index 70741101d65..00000000000
--- a/src/gallium/drivers/nv30/Makefile
+++ /dev/null
@@ -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
diff --git a/src/gallium/drivers/nv40/Makefile b/src/gallium/drivers/nv40/Makefile
deleted file mode 100644
index 8b69f9432d1..00000000000
--- a/src/gallium/drivers/nv40/Makefile
+++ /dev/null
@@ -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
diff --git a/src/gallium/drivers/nvfx/Makefile b/src/gallium/drivers/nvfx/Makefile
index 51fa34cfad2..e912177b211 100644
--- a/src/gallium/drivers/nvfx/Makefile
+++ b/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 \
diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c b/src/gallium/drivers/nvfx/nv30_fragtex.c
index 081362d1509..2b56f454921 100644
--- a/src/gallium/drivers/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nvfx/nv30_fragtex.c
@@ -145,4 +145,3 @@ nv30_fragtex_build(struct nvfx_context *nvfx, int unit)
return so;
}
-
diff --git a/src/gallium/drivers/nv30/nv30_shader.h b/src/gallium/drivers/nvfx/nv30_vertprog.h
index f19efb5aa4d..ec0444c07f8 100644
--- a/src/gallium/drivers/nv30/nv30_shader.h
+++ b/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)
diff --git a/src/gallium/drivers/nv40/nv40_fragtex.c b/src/gallium/drivers/nvfx/nv40_fragtex.c
index 5889b5e40d5..5889b5e40d5 100644
--- a/src/gallium/drivers/nv40/nv40_fragtex.c
+++ b/src/gallium/drivers/nvfx/nv40_fragtex.c
diff --git a/src/gallium/drivers/nv40/nv40_shader.h b/src/gallium/drivers/nvfx/nv40_vertprog.h
index 8d28137e9de..7337293babc 100644
--- a/src/gallium/drivers/nv40/nv40_shader.h
+++ b/src/gallium/drivers/nvfx/nv40_vertprog.h
@@ -175,4 +175,3 @@
#include "nvfx_shader.h"
#endif
-
diff --git a/src/gallium/drivers/nvfx/nvfx_draw.c b/src/gallium/drivers/nvfx/nvfx_draw.c
index 8700e143297..7308f0667c7 100644
--- a/src/gallium/drivers/nvfx/nvfx_draw.c
+++ b/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
diff --git a/src/gallium/drivers/nvfx/nvfx_vertprog.c b/src/gallium/drivers/nvfx/nvfx_vertprog.c
index 730361a9827..3d0e8c23a15 100644
--- a/src/gallium/drivers/nvfx/nvfx_vertprog.c
+++ b/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))
diff --git a/src/gallium/winsys/drm/nouveau/dri/Makefile b/src/gallium/winsys/drm/nouveau/dri/Makefile
index 0cc60395ffe..50ac3f203e5 100644
--- a/src/gallium/winsys/drm/nouveau/dri/Makefile
+++ b/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
diff --git a/src/gallium/winsys/drm/nouveau/egl/Makefile b/src/gallium/winsys/drm/nouveau/egl/Makefile
index 0f5e6d64aa4..47d11276155 100644
--- a/src/gallium/winsys/drm/nouveau/egl/Makefile
+++ b/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
diff --git a/src/gallium/winsys/drm/nouveau/xorg/Makefile b/src/gallium/winsys/drm/nouveau/xorg/Makefile
index 0607d82a6e4..f7f6fe17dd6 100644
--- a/src/gallium/winsys/drm/nouveau/xorg/Makefile
+++ b/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)