head	1.5;
access;
symbols
	netbsd-7-2-RELEASE:1.4.2.1
	netbsd-7-1-2-RELEASE:1.4.2.1
	netbsd-7-1-1-RELEASE:1.4.2.1
	netbsd-7-1:1.4.2.1.0.4
	netbsd-7-1-RELEASE:1.4.2.1
	netbsd-7-1-RC2:1.4.2.1
	netbsd-7-1-RC1:1.4.2.1
	netbsd-7-0-2-RELEASE:1.4.2.1
	netbsd-7-0-1-RELEASE:1.4.2.1
	netbsd-7-0:1.4.2.1.0.2
	netbsd-7-0-RELEASE:1.4.2.1
	netbsd-7-0-RC3:1.4.2.1
	netbsd-7-0-RC2:1.4.2.1
	netbsd-7-0-RC1:1.4.2.1
	netbsd-5-2-3-RELEASE:1.1.1.1.2.1
	netbsd-5-1-5-RELEASE:1.1.1.1.2.1
	netbsd-6-0-6-RELEASE:1.3
	netbsd-6-1-5-RELEASE:1.3
	netbsd-7:1.4.0.2
	netbsd-7-base:1.4
	MesaLib-7-11-2:1.1.1.3
	netbsd-6-1-4-RELEASE:1.3
	netbsd-6-0-5-RELEASE:1.3
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.3
	riastradh-drm2:1.3.0.8
	riastradh-drm2-base:1.3
	netbsd-6-1-3-RELEASE:1.3
	netbsd-6-0-4-RELEASE:1.3
	netbsd-5-2-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-4-RELEASE:1.1.1.1.2.1
	netbsd-6-1-2-RELEASE:1.3
	netbsd-6-0-3-RELEASE:1.3
	netbsd-5-2-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-3-RELEASE:1.1.1.1.2.1
	netbsd-6-1-1-RELEASE:1.3
	netbsd-6-1:1.3.0.6
	netbsd-6-0-2-RELEASE:1.3
	netbsd-6-1-RELEASE:1.3
	netbsd-6-1-RC4:1.3
	netbsd-6-1-RC3:1.3
	netbsd-6-1-RC2:1.3
	netbsd-6-1-RC1:1.3
	netbsd-5-2:1.1.1.1.2.1.0.4
	netbsd-6-0-1-RELEASE:1.3
	netbsd-5-2-RELEASE:1.1.1.1.2.1
	netbsd-5-2-RC1:1.1.1.1.2.1
	netbsd-6-0:1.3.0.4
	netbsd-6-0-RELEASE:1.3
	netbsd-6-0-RC2:1.3
	netbsd-6-0-RC1:1.3
	netbsd-6:1.3.0.2
	netbsd-6-base:1.3
	netbsd-5-1-2-RELEASE:1.1.1.1.2.1
	netbsd-5-1-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1:1.1.1.1.2.1.0.2
	netbsd-5-1-RELEASE:1.1.1.1.2.1
	netbsd-5-1-RC4:1.1.1.1.2.1
	MesaLib-7-8-2:1.1.1.2
	netbsd-5-1-RC3:1.1.1.1.2.1
	netbsd-5-1-RC2:1.1.1.1.2.1
	netbsd-5-1-RC1:1.1.1.1.2.1
	netbsd-5-0-2-RELEASE:1.1.1.1
	netbsd-5-0-1-RELEASE:1.1.1.1
	netbsd-5-0:1.1.1.1.0.4
	netbsd-5-0-RELEASE:1.1.1.1
	netbsd-5-0-RC4:1.1.1.1
	netbsd-5-0-RC3:1.1.1.1
	netbsd-5-0-RC2:1.1.1.1
	netbsd-5-0-RC1:1.1.1.1
	netbsd-5:1.1.1.1.0.2
	netbsd-5-base:1.1.1.1
	MesaLib-7-0-3:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.5
date	2014.12.18.06.11.45;	author mrg;	state dead;
branches;
next	1.4;
commitid	Ae59RsLlS9l0cu2y;

1.4
date	2014.07.09.19.46.48;	author riastradh;	state Exp;
branches
	1.4.2.1;
next	1.3;
commitid	D2zJVI2fYV0xUJHx;

1.3
date	2010.07.19.05.42.53;	author mrg;	state Exp;
branches;
next	1.2;

1.2
date	2009.06.11.01.02.58;	author mrg;	state dead;
branches;
next	1.1;

1.1
date	2008.07.29.05.09.53;	author mrg;	state Exp;
branches
	1.1.1.1;
next	;

1.4.2.1
date	2015.01.06.09.26.31;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;

1.1.1.1
date	2008.07.29.05.09.53;	author mrg;	state Exp;
branches
	1.1.1.1.2.1;
next	1.1.1.2;

1.1.1.2
date	2010.07.19.05.31.39;	author mrg;	state Exp;
branches;
next	1.1.1.3;

1.1.1.3
date	2014.07.09.19.38.50;	author riastradh;	state Exp;
branches;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.1.2.1
date	2009.09.17.03.32.22;	author snj;	state dead;
branches;
next	;


desc
@@


1.5
log
@merge Mesa 10.3.5.
@
text
@# src/mesa/drivers/dri/nouveau/Makefile

TOP = ../../../../..
include $(TOP)/configs/current

LIBNAME = nouveau_vieux_dri.so

include ../Makefile.defines

DRIVER_SOURCES = \
	nouveau_screen.c \
	nouveau_context.c \
	nouveau_fbo.c \
	nouveau_driver.c \
	nouveau_state.c \
	nouveau_bufferobj.c \
	nouveau_span.c \
	nouveau_bo_state.c \
	nouveau_texture.c \
	nouveau_surface.c \
	nouveau_scratch.c \
	nouveau_array.c \
	nv04_context.c \
	nv04_render.c \
	nv04_state_fb.c \
	nv04_state_raster.c \
	nv04_state_tex.c \
	nv04_state_frag.c \
	nv04_surface.c \
	nv10_context.c \
	nv10_render.c \
	nv10_state_fb.c \
	nv10_state_polygon.c \
	nv10_state_raster.c \
	nv10_state_tex.c \
	nv10_state_frag.c \
	nv10_state_tnl.c \
	nv20_context.c \
	nv20_render.c \
	nv20_state_fb.c \
	nv20_state_polygon.c \
	nv20_state_raster.c \
	nv20_state_tex.c \
	nv20_state_frag.c \
	nv20_state_tnl.c

C_SOURCES = \
	$(COMMON_SOURCES) \
	$(DRIVER_SOURCES)

ASM_SOURCES =

INCLUDES += $(NOUVEAU_CFLAGS)
DRI_LIB_DEPS += $(NOUVEAU_LIBS)

include ../Makefile.targets

symlinks:
@


1.4
log
@merge MesaLib 7.11.2
@
text
@@


1.4.2.1
log
@File removals that accidently did not happen during pullup of the new
MesaLib for ticket #381
@
text
@@


1.3
log
@merge Mesa 7.8.2.
@
text
@a5 3
CFLAGS += $(shell pkg-config libdrm libdrm_nouveau --cflags)
DRI_LIB_DEPS += $(shell pkg-config libdrm_nouveau --libs)

d8 1
a8 1
MINIGLX_SOURCES =
d21 2
d53 2
d56 1
a56 1
include ../Makefile.template
@


1.2
log
@merge MesaLib 7.4.2
@
text
@d6 2
a7 1
LIBNAME = nouveau_dri.so
d9 3
a11 1
MINIGLX_SOURCES = 
d14 33
a46 32
	nouveau_bufferobj.c      \
	nouveau_buffers.c        \
	nouveau_card.c           \
	nouveau_context.c        \
	nouveau_driver.c         \
	nouveau_fifo.c           \
	nouveau_lock.c           \
	nouveau_object.c         \
	nouveau_screen.c         \
	nouveau_span.c           \
	nouveau_state.c          \
	nouveau_state_cache.c    \
	nouveau_shader.c         \
	nouveau_shader_0.c       \
	nouveau_shader_1.c       \
	nouveau_shader_2.c       \
	nouveau_tex.c            \
	nouveau_swtcl.c          \
	nouveau_sync.c           \
	nouveau_query.c          \
	nv04_state.c             \
	nv04_swtcl.c             \
	nv10_state.c             \
	nv10_swtcl.c             \
	nv20_state.c             \
	nv20_vertprog.c          \
	nv30_state.c             \
	nv30_fragprog.c          \
	nv30_vertprog.c          \
	nv40_fragprog.c          \
	nv40_vertprog.c          \
	nv50_state.c
d50 1
a50 1
	$(DRIVER_SOURCES) 
d52 1
a52 1
ASM_SOURCES = 
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaLib-7.0.3
@
text
@@


1.1.1.2
log
@import Mesa 7.8.2, lib part.  major changes since 7.7.1:
- several new extensions for various drivers
- many i965, i915 driver fixes
- many glsl fixes
@
text
@d6 1
a6 2
CFLAGS += $(shell pkg-config libdrm libdrm_nouveau --cflags)
DRI_LIB_DEPS += $(shell pkg-config libdrm_nouveau --libs)
d8 1
a8 3
LIBNAME = nouveau_vieux_dri.so

MINIGLX_SOURCES =
d11 32
a42 33
	nouveau_screen.c \
	nouveau_context.c \
	nouveau_fbo.c \
	nouveau_driver.c \
	nouveau_state.c \
	nouveau_bufferobj.c \
	nouveau_span.c \
	nouveau_bo_state.c \
	nouveau_texture.c \
	nouveau_surface.c \
	nv04_context.c \
	nv04_render.c \
	nv04_state_fb.c \
	nv04_state_raster.c \
	nv04_state_tex.c \
	nv04_state_frag.c \
	nv04_surface.c \
	nv10_context.c \
	nv10_render.c \
	nv10_state_fb.c \
	nv10_state_polygon.c \
	nv10_state_raster.c \
	nv10_state_tex.c \
	nv10_state_frag.c \
	nv10_state_tnl.c \
	nv20_context.c \
	nv20_render.c \
	nv20_state_fb.c \
	nv20_state_polygon.c \
	nv20_state_raster.c \
	nv20_state_tex.c \
	nv20_state_frag.c \
	nv20_state_tnl.c
d46 1
a46 1
	$(DRIVER_SOURCES)
d48 1
a48 1
ASM_SOURCES =
@


1.1.1.3
log
@import MesaLib 7.11.2

Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a
new shader language compiler, and various other improvements too
numerous to list here; see <http://www.mesa3d.org/relnotes.html> for
details.
@
text
@d6 3
d11 1
a11 1
include ../Makefile.defines
a23 2
	nouveau_scratch.c \
	nouveau_array.c \
a53 2
INCLUDES += $(NOUVEAU_CFLAGS)
DRI_LIB_DEPS += $(NOUVEAU_LIBS)
d55 1
a55 1
include ../Makefile.targets
@


1.1.1.1.2.1
log
@Apply patch (requested by mrg in ticket #958):
Bring over X.Org updates from HEAD.
@
text
@@