head	1.2;
access;
symbols
	netbsd-7-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-2-RELEASE:1.1.1.3.2.1
	netbsd-7-1-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1:1.1.1.3.2.1.0.4
	netbsd-7-1-RELEASE:1.1.1.3.2.1
	netbsd-7-1-RC2:1.1.1.3.2.1
	netbsd-7-1-RC1:1.1.1.3.2.1
	netbsd-7-0-2-RELEASE:1.1.1.3.2.1
	netbsd-7-0-1-RELEASE:1.1.1.3.2.1
	netbsd-7-0:1.1.1.3.2.1.0.2
	netbsd-7-0-RELEASE:1.1.1.3.2.1
	netbsd-7-0-RC3:1.1.1.3.2.1
	netbsd-7-0-RC2:1.1.1.3.2.1
	netbsd-7-0-RC1:1.1.1.3.2.1
	netbsd-6-0-6-RELEASE:1.1.1.2
	netbsd-6-1-5-RELEASE:1.1.1.2
	netbsd-7:1.1.1.3.0.2
	netbsd-7-base:1.1.1.3
	MesaLib-7-11-2:1.1.1.3
	netbsd-6-1-4-RELEASE:1.1.1.2
	netbsd-6-0-5-RELEASE:1.1.1.2
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2
	riastradh-drm2:1.1.1.2.0.8
	riastradh-drm2-base:1.1.1.2
	netbsd-6-1-3-RELEASE:1.1.1.2
	netbsd-6-0-4-RELEASE:1.1.1.2
	netbsd-6-1-2-RELEASE:1.1.1.2
	netbsd-6-0-3-RELEASE:1.1.1.2
	netbsd-6-1-1-RELEASE:1.1.1.2
	netbsd-6-1:1.1.1.2.0.6
	netbsd-6-0-2-RELEASE:1.1.1.2
	netbsd-6-1-RELEASE:1.1.1.2
	netbsd-6-1-RC4:1.1.1.2
	netbsd-6-1-RC3:1.1.1.2
	netbsd-6-1-RC2:1.1.1.2
	netbsd-6-1-RC1:1.1.1.2
	netbsd-6-0-1-RELEASE:1.1.1.2
	netbsd-6-0:1.1.1.2.0.4
	netbsd-6-0-RELEASE:1.1.1.2
	netbsd-6-0-RC2:1.1.1.2
	netbsd-6-0-RC1:1.1.1.2
	netbsd-6:1.1.1.2.0.2
	netbsd-6-base:1.1.1.2
	MesaLib-7-8-2:1.1.1.2
	MesaLib-7-7-1:1.1.1.1
	xorg:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2014.12.18.06.11.33;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

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

1.1.1.1
date	2010.05.23.21.22.31;	author mrg;	state Exp;
branches;
next	1.1.1.2;

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

1.1.1.3
date	2014.07.09.19.39.05;	author riastradh;	state Exp;
branches
	1.1.1.3.2.1;
next	;
commitid	h96CLViPL8qdRJHx;

1.1.1.3.2.1
date	2015.01.06.09.26.21;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@TOP = ../../../..
include $(TOP)/configs/current

LIBNAME = llvmpipe

CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS

C_SOURCES = \
	lp_bld_alpha.c \
	lp_bld_arit.c \
	lp_bld_blend_aos.c \
	lp_bld_blend_logicop.c \
	lp_bld_blend_soa.c \
	lp_bld_const.c \
	lp_bld_conv.c \
	lp_bld_debug.c \
	lp_bld_depth.c \
	lp_bld_flow.c \
	lp_bld_format_aos.c \
	lp_bld_format_query.c \
	lp_bld_format_soa.c \
	lp_bld_interp.c \
	lp_bld_intr.c \
	lp_bld_logic.c \
	lp_bld_pack.c \
	lp_bld_sample.c \
	lp_bld_sample_soa.c \
	lp_bld_swizzle.c \
	lp_bld_struct.c \
	lp_bld_tgsi_soa.c \
	lp_bld_type.c \
	lp_buffer.c \
	lp_clear.c \
	lp_context.c \
	lp_draw_arrays.c \
	lp_flush.c \
	lp_jit.c \
	lp_prim_vbuf.c \
	lp_setup.c \
	lp_query.c \
	lp_screen.c \
	lp_state_blend.c \
	lp_state_clip.c \
	lp_state_derived.c \
	lp_state_fs.c \
	lp_state_rasterizer.c \
	lp_state_sampler.c \
	lp_state_surface.c \
	lp_state_vertex.c \
	lp_state_vs.c \
	lp_surface.c \
	lp_tex_cache.c \
	lp_tex_sample_c.c \
	lp_tex_sample_llvm.c \
	lp_texture.c \
	lp_tile_cache.c \
	lp_tile_soa.c

CPP_SOURCES = \
	lp_bld_misc.cpp

include ../../Makefile.template

lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_access.py ../../auxiliary/util/u_format.csv
	python lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@@
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@initial import of MesaLib-7.7.1
@
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 1
DEFINES += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
d9 23
a35 1
	lp_fence.c \
d38 2
a39 1
	lp_perf.c \
a40 4
	lp_rast.c \
	lp_rast_tri.c \
	lp_scene.c \
	lp_scene_queue.c \
a41 5
	lp_setup.c \
	lp_setup_line.c \
	lp_setup_point.c \
	lp_setup_tri.c \
	lp_setup_vbuf.c \
d52 2
d56 1
a56 1
	lp_tile_image.c \
d60 1
a60 1

a65 12


testprogs := lp_test_format	\
	     lp_test_blend	\
	     lp_test_conv

LIBS += $(GL_LIB_DEPS) -L. -lllvmpipe -L../../auxiliary/ -lgallium

$(testprogs): lp_test_% : lp_test_%.o lp_test_main.o libllvmpipe.a
	$(LD) $(filter %.o,$^) -o $@@ -Wl,--start-group  $(LIBS) -Wl,--end-group

default: $(testprogs)
@


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 2
d9 1
a9 6
	lp_bld_alpha.c \
	lp_bld_blend_aos.c \
	lp_bld_blend_logicop.c \
	lp_bld_blend_soa.c \
	lp_bld_depth.c \
	lp_bld_interp.c \
a15 1
	lp_memory.c \
a18 1
	lp_rast_debug.c \
a31 2
	lp_state_setup.c \
	lp_state_gs.c \
a33 1
        lp_state_so.c \
d38 1
a38 1
	lp_tex_sample.c \
a44 9
PROGS := lp_test_format	\
	 lp_test_blend	\
	 lp_test_conv	\
	 lp_test_printf \
	 lp_test_round \
         lp_test_sincos

# Need this for the lp_test_*.o files
CLEAN_EXTRA = *.o
d48 2
a49 1
lp_test_sincos.o : sse_mathfun.h
a50 1
PROGS_DEPS := ../../auxiliary/libgallium.a
d52 3
a54 2
lp_tile_soa.c: lp_tile_soa.py ../../auxiliary/util/u_format_parse.py ../../auxiliary/util/u_format_pack.py ../../auxiliary/util/u_format.csv
	$(PYTHON2) $(PYTHON_FLAGS) lp_tile_soa.py ../../auxiliary/util/u_format.csv > $@@
d56 1
a56 3
LDFLAGS += $(LLVM_LDFLAGS)
LIBS += -L../../auxiliary/ -lgallium libllvmpipe.a $(LLVM_LIBS) $(GL_LIB_DEPS)
LD=$(CXX)
d58 2
a59 1
$(PROGS): lp_test_main.o libllvmpipe.a
d61 1
@


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