Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src build the nouveau gallium driver.



details:   https://anonhg.NetBSD.org/src/rev/be3c145b4771
branches:  trunk
changeset: 811352:be3c145b4771
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Oct 26 07:15:36 2015 +0000

description:
build the nouveau gallium driver.

diffstat:

 distrib/sets/lists/xserver/md.amd64    |    4 +-
 distrib/sets/lists/xserver/md.i386     |    4 +-
 external/mit/xorg/lib/gallium/Makefile |  119 ++++++++++++++++++++++++++++++++-
 3 files changed, 123 insertions(+), 4 deletions(-)

diffs (183 lines):

diff -r b5ff6a293d53 -r be3c145b4771 distrib/sets/lists/xserver/md.amd64
--- a/distrib/sets/lists/xserver/md.amd64       Mon Oct 26 07:13:01 2015 +0000
+++ b/distrib/sets/lists/xserver/md.amd64       Mon Oct 26 07:15:36 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.86 2015/10/13 10:33:17 pgoyette Exp $
+# $NetBSD: md.amd64,v 1.87 2015/10/26 07:15:36 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/gtf                                    -unknown-       x11
@@ -367,6 +367,8 @@
 ./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0      -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       obsolete
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       obsolete
+./usr/X11R7/lib/modules/dri/nouveau_dri.so             -unknown-       xorg
+./usr/X11R7/lib/modules/dri/nouveau_dri.so.0           -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       obsolete
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       obsolete
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
diff -r b5ff6a293d53 -r be3c145b4771 distrib/sets/lists/xserver/md.i386
--- a/distrib/sets/lists/xserver/md.i386        Mon Oct 26 07:13:01 2015 +0000
+++ b/distrib/sets/lists/xserver/md.i386        Mon Oct 26 07:15:36 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.104 2015/10/13 10:33:17 pgoyette Exp $
+# $NetBSD: md.i386,v 1.105 2015/10/26 07:15:36 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/gtf                                    -unknown-       x11
@@ -403,6 +403,8 @@
 ./usr/X11R7/lib/modules/dri/mesa_dri_drivers.so.0      -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       obsolete
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       obsolete
+./usr/X11R7/lib/modules/dri/nouveau_dri.so             -unknown-       xorg
+./usr/X11R7/lib/modules/dri/nouveau_dri.so.0           -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       obsolete
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       obsolete
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
diff -r b5ff6a293d53 -r be3c145b4771 external/mit/xorg/lib/gallium/Makefile
--- a/external/mit/xorg/lib/gallium/Makefile    Mon Oct 26 07:13:01 2015 +0000
+++ b/external/mit/xorg/lib/gallium/Makefile    Mon Oct 26 07:15:36 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/09/23 05:28:14 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2015/10/26 07:15:36 mrg Exp $
 
 # Link the gallium mega driver.
 
@@ -15,7 +15,7 @@
 
 DRIVERS=       kms_swrast swrast
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-DRIVERS+=      r600
+DRIVERS+=      r600 nouveau
 .endif
 
 CPPFLAGS+= \
@@ -47,6 +47,11 @@
        drivers/radeon \
        drivers/r600 \
        drivers/r600/sb \
+       drivers/nouveau \
+       drivers/nouveau/nv30 \
+       drivers/nouveau/nv50 \
+       drivers/nouveau/codegen \
+       drivers/nouveau/nvc0 \
        drivers/softpipe \
        winsys/radeon/drm \
        winsys/sw/null \
@@ -338,6 +343,116 @@
 CPPFLAGS.${_f} +=      -I${X11SRCDIR.MesaLib}/src/gallium/drivers/r600
 .endfor
 
+GALLIUM_SOURCES.drivers/nouveau = \
+       nouveau_screen.c \
+       nouveau_fence.c \
+       nouveau_mm.c \
+       nouveau_buffer.c \
+       nouveau_heap.c \
+       nouveau_video.c \
+       nouveau_vp3_video.c \
+       nouveau_vp3_video_bsp.c \
+       nouveau_vp3_video_vp.c
+
+GALLIUM_SOURCES.drivers/nouveau/nv30 = \
+       nv30_screen.c \
+       nv30_context.c \
+       nv30_format.c \
+       nv30_resource.c \
+       nv30_transfer.c \
+       nv30_miptree.c \
+       nv30_state.c \
+       nv30_state_validate.c \
+       nv30_texture.c \
+       nv30_fragtex.c \
+       nv40_verttex.c \
+       nv30_fragprog.c \
+       nv30_vertprog.c \
+       nv30_clear.c \
+       nv30_vbo.c \
+       nv30_push.c \
+       nv30_draw.c \
+       nv30_query.c \
+       nvfx_vertprog.c \
+       nvfx_fragprog.c
+
+GALLIUM_SOURCES.drivers/nouveau/nv50 = \
+       nv50_context.c \
+       nv50_formats.c \
+       nv50_miptree.c \
+       nv50_resource.c \
+       nv50_screen.c \
+       nv50_state.c \
+       nv50_state_validate.c \
+       nv50_surface.c \
+       nv50_tex.c \
+       nv50_transfer.c \
+       nv50_vbo.c \
+       nv50_program.c \
+       nv50_shader_state.c \
+       nv50_push.c \
+       nv50_query.c \
+       nv84_video.c \
+       nv84_video_bsp.c \
+       nv84_video_vp.c \
+       nv98_video.c \
+       nv98_video_bsp.c \
+       nv98_video_vp.c \
+       nv98_video_ppp.c
+
+GALLIUM_SOURCES.drivers/nouveau/codegen = \
+       nv50_ir.cpp \
+       nv50_ir_bb.cpp \
+       nv50_ir_build_util.cpp \
+       nv50_ir_emit_nv50.cpp \
+       nv50_ir_from_tgsi.cpp \
+       nv50_ir_graph.cpp \
+       nv50_ir_lowering_nv50.cpp \
+       nv50_ir_peephole.cpp \
+       nv50_ir_print.cpp \
+       nv50_ir_ra.cpp \
+       nv50_ir_ssa.cpp \
+       nv50_ir_target.cpp \
+       nv50_ir_target_nv50.cpp \
+       nv50_ir_util.cpp \
+       nv50_ir_emit_nvc0.cpp \
+       nv50_ir_emit_gk110.cpp \
+       nv50_ir_emit_gm107.cpp \
+       nv50_ir_lowering_nvc0.cpp \
+       nv50_ir_lowering_gm107.cpp \
+       nv50_ir_target_nvc0.cpp \
+       nv50_ir_target_gm107.cpp
+
+GALLIUM_SOURCES.drivers/nouveau/nvc0 = \
+       nvc0_compute.c \
+       nvc0_context.c \
+       nvc0_formats.c \
+       nvc0_miptree.c \
+       nvc0_resource.c \
+       nvc0_screen.c \
+       nvc0_state.c \
+       nvc0_state_validate.c \
+       nvc0_surface.c \
+       nvc0_tex.c \
+       nvc0_transfer.c \
+       nvc0_vbo.c \
+       nvc0_vbo_translate.c \
+       nvc0_program.c \
+       nvc0_shader_state.c \
+       nvc0_query.c \
+       nve4_compute.c \
+       nvc0_video.c \
+       nvc0_video_bsp.c \
+       nvc0_video_vp.c \
+       nvc0_video_ppp.c
+
+.for _f in ${GALLIUM_SOURCES.drivers/nouveau} \
+          ${GALLIUM_SOURCES.drivers/nouveau/nv30} \
+          ${GALLIUM_SOURCES.drivers/nouveau/nv50} \
+          ${GALLIUM_SOURCES.drivers/nouveau/codegen} \
+          ${GALLIUM_SOURCES.drivers/nouveau/nvc0}
+CPPFLAGS.${_f} +=      -I${X11SRCDIR.MesaLib}/src/gallium/drivers/nouveau
+.endfor
 
 
 GALLIUM_SOURCES.winsys/radeon/drm = \



Home | Main Index | Thread Index | Old Index