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.31;	author mrg;	state dead;
branches;
next	1.1;
commitid	Ae59RsLlS9l0cu2y;

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

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

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

1.1.1.3
date	2014.07.09.19.39.00;	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.20;	author martin;	state dead;
branches;
next	;
commitid	2BxXkbQgg8gLEW4y;


desc
@@


1.2
log
@merge Mesa 10.3.5.
@
text
@# src/gallium/auxiliary/Makefile
TOP = ../../..
include $(TOP)/configs/current

SUBDIRS = $(GALLIUM_AUXILIARY_DIRS)

default install clean:
	@@for dir in $(SUBDIRS) ; do \
		if [ -d $$dir ] ; then \
			(cd $$dir && $(MAKE) $@@) || exit 1; \
		fi \
	done
@


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
@d1 1
d5 1
a5 195
LIBNAME = gallium

C_SOURCES = \
	cso_cache/cso_context.c \
	cso_cache/cso_cache.c \
	cso_cache/cso_hash.c \
	draw/draw_context.c \
	draw/draw_gs.c \
	draw/draw_pipe.c \
	draw/draw_pipe_aaline.c \
	draw/draw_pipe_aapoint.c \
	draw/draw_pipe_clip.c \
	draw/draw_pipe_cull.c \
	draw/draw_pipe_flatshade.c \
	draw/draw_pipe_offset.c \
	draw/draw_pipe_pstipple.c \
	draw/draw_pipe_stipple.c \
	draw/draw_pipe_twoside.c \
	draw/draw_pipe_unfilled.c \
	draw/draw_pipe_util.c \
	draw/draw_pipe_validate.c \
	draw/draw_pipe_vbuf.c \
	draw/draw_pipe_wide_line.c \
	draw/draw_pipe_wide_point.c \
	draw/draw_pt.c \
	draw/draw_pt_elts.c \
	draw/draw_pt_emit.c \
	draw/draw_pt_fetch.c \
	draw/draw_pt_fetch_emit.c \
	draw/draw_pt_fetch_shade_emit.c \
	draw/draw_pt_fetch_shade_pipeline.c \
	draw/draw_pt_post_vs.c \
	draw/draw_pt_util.c \
	draw/draw_pt_varray.c \
	draw/draw_pt_vcache.c \
	draw/draw_vertex.c \
	draw/draw_vs.c \
	draw/draw_vs_varient.c \
	draw/draw_vs_aos.c \
	draw/draw_vs_aos_io.c \
	draw/draw_vs_aos_machine.c \
	draw/draw_vs_exec.c \
	draw/draw_vs_llvm.c \
	draw/draw_vs_ppc.c \
	draw/draw_vs_sse.c \
	indices/u_indices_gen.c \
	indices/u_unfilled_gen.c \
	os/os_misc.c \
	os/os_stream_log.c \
	os/os_stream_stdc.c \
	os/os_stream_str.c \
	os/os_stream_null.c \
	os/os_time.c \
	pipebuffer/pb_buffer_fenced.c \
	pipebuffer/pb_buffer_malloc.c \
	pipebuffer/pb_bufmgr_alt.c \
	pipebuffer/pb_bufmgr_cache.c \
	pipebuffer/pb_bufmgr_debug.c \
	pipebuffer/pb_bufmgr_mm.c \
	pipebuffer/pb_bufmgr_ondemand.c \
	pipebuffer/pb_bufmgr_pool.c \
	pipebuffer/pb_bufmgr_slab.c \
	pipebuffer/pb_validate.c \
	rbug/rbug_connection.c \
	rbug/rbug_core.c \
	rbug/rbug_texture.c \
	rbug/rbug_context.c \
	rbug/rbug_shader.c \
	rbug/rbug_demarshal.c \
	rtasm/rtasm_cpu.c \
	rtasm/rtasm_execmem.c \
	rtasm/rtasm_x86sse.c \
	rtasm/rtasm_ppc.c \
	rtasm/rtasm_ppc_spe.c \
	tgsi/tgsi_sanity.c \
	tgsi/tgsi_build.c \
	tgsi/tgsi_dump.c \
	tgsi/tgsi_exec.c \
	tgsi/tgsi_info.c \
	tgsi/tgsi_iterate.c \
	tgsi/tgsi_parse.c \
	tgsi/tgsi_ppc.c \
	tgsi/tgsi_scan.c \
	tgsi/tgsi_sse2.c \
	tgsi/tgsi_text.c \
	tgsi/tgsi_transform.c \
	tgsi/tgsi_ureg.c \
	tgsi/tgsi_util.c \
	translate/translate_generic.c \
	translate/translate_sse.c \
	translate/translate.c \
	translate/translate_cache.c \
	util/u_debug.c \
	util/u_debug_symbol.c \
	util/u_debug_stack.c \
	util/u_dump_defines.c \
	util/u_dump_state.c \
	util/u_bitmask.c \
	util/u_blit.c \
	util/u_blitter.c \
	util/u_cache.c \
	util/u_cpu_detect.c \
	util/u_dl.c \
	util/u_draw_quad.c \
	util/u_format_access.c \
	util/u_format_table.c \
	util/u_gen_mipmap.c \
	util/u_handle_table.c \
	util/u_hash_table.c \
	util/u_hash.c \
	util/u_keymap.c \
	util/u_linear.c \
	util/u_network.c \
	util/u_math.c \
	util/u_mm.c \
	util/u_rect.c \
	util/u_ringbuffer.c \
	util/u_simple_shaders.c \
	util/u_snprintf.c \
	util/u_surface.c \
	util/u_texture.c \
	util/u_tile.c \
	util/u_timed_winsys.c \
	util/u_upload_mgr.c \
	util/u_simple_screen.c \
	vl/vl_bitstream_parser.c \
	vl/vl_mpeg12_mc_renderer.c \
	vl/vl_compositor.c \
	vl/vl_csc.c \
	vl/vl_shader_build.c

GALLIVM_SOURCES = \
        gallivm/lp_bld_alpha.c \
        gallivm/lp_bld_arit.c \
        gallivm/lp_bld_blend_aos.c \
        gallivm/lp_bld_blend_logicop.c \
        gallivm/lp_bld_blend_soa.c \
        gallivm/lp_bld_const.c \
        gallivm/lp_bld_conv.c \
        gallivm/lp_bld_debug.c \
        gallivm/lp_bld_depth.c \
        gallivm/lp_bld_flow.c \
        gallivm/lp_bld_format_aos.c \
        gallivm/lp_bld_format_query.c \
        gallivm/lp_bld_format_soa.c \
        gallivm/lp_bld_interp.c \
        gallivm/lp_bld_intr.c \
        gallivm/lp_bld_logic.c \
        gallivm/lp_bld_pack.c \
        gallivm/lp_bld_sample.c \
        gallivm/lp_bld_sample_soa.c \
        gallivm/lp_bld_struct.c \
        gallivm/lp_bld_swizzle.c \
        gallivm/lp_bld_tgsi_soa.c \
        gallivm/lp_bld_type.c

GALLIVM_CPP_SOURCES = \
        gallivm/lp_bld_init.cpp

GENERATED_SOURCES = \
	indices/u_indices_gen.c \
	indices/u_unfilled_gen.c \
	util/u_format_access.c \
	util/u_format_pack.h \
	util/u_format_table.c


ifeq ($(MESA_LLVM),1)
C_SOURCES += \
	$(GALLIVM_SOURCES)
CPP_SOURCES += \
	$(GALLIVM_CPP_SOURCES)
endif


LIBRARY_DEFINES += -D__STDC_CONSTANT_MACROS


include ../Makefile.template


indices/u_indices_gen.c: indices/u_indices_gen.py
	python $< > $@@

indices/u_unfilled_gen.c: indices/u_unfilled_gen.py
	python $< > $@@

util/u_format_table.c: util/u_format_table.py util/u_format_parse.py util/u_format.csv
	python util/u_format_table.py util/u_format.csv > $@@

util/u_format_pack.h: util/u_format_pack.py util/u_format_parse.py util/u_format.csv
	python util/u_format_pack.py util/u_format.csv > $@@

util/u_format_access.c: util/u_format_access.py util/u_format_parse.py util/u_format.csv
	python util/u_format_access.py util/u_format.csv > $@@
d7 6
@


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
@d7 1
a8 1
	cso_cache/cso_context.c \
a10 1
	draw/draw_fs.c \
d29 1
a35 1
	draw/draw_pt_so_emit.c \
d37 2
a38 1
	draw/draw_pt_vsplit.c \
d41 1
d46 1
a48 1
	draw/draw_vs_variant.c \
a51 1
	os/os_stream.c \
a52 1
	os/os_stream_null.c \
d55 1
a67 1
	rbug/rbug_context.c \
a68 1
	rbug/rbug_demarshal.c \
d70 1
d72 1
d75 1
d78 1
a78 1
	rtasm/rtasm_x86sse.c \
a85 1
	tgsi/tgsi_sanity.c \
d92 2
a95 2
	translate/translate_generic.c \
	translate/translate_sse.c \
d97 1
a97 2
	util/u_debug_describe.c \
	util/u_debug_refcnt.c \
a98 1
	util/u_debug_symbol.c \
a104 1
	util/u_caps.c \
a106 1
	util/u_draw.c \
d108 1
a108 6
	util/u_format.c \
	util/u_format_other.c \
	util/u_format_latc.c \
	util/u_format_s3tc.c \
	util/u_format_rgtc.c \
	util/u_format_srgb.c \
a109 4
	util/u_format_tests.c \
	util/u_format_yuv.c \
	util/u_format_zs.c \
	util/u_framebuffer.c \
a110 1
	util/u_half.c \
d112 1
a113 2
	util/u_hash_table.c \
	util/u_index_modify.c \
a115 1
	util/u_linkage.c \
a118 1
	util/u_pstipple.c \
a120 1
	util/u_sampler.c \
a121 1
	util/u_slab.c \
a122 1
	util/u_staging.c \
a123 1
	util/u_surfaces.c \
d126 1
a126 2
	util/u_transfer.c \
	util/u_resource.c \
d128 6
a133 8
	util/u_vbuf_mgr.c

	# Disabling until pipe-video branch gets merged in
	#vl/vl_bitstream_parser.c \
	#vl/vl_mpeg12_mc_renderer.c \
	#vl/vl_compositor.c \
	#vl/vl_csc.c \
	#vl/vl_shader_build.c \
d136 1
d138 3
a140 2
        gallivm/lp_bld_assert.c \
        gallivm/lp_bld_bitarit.c \
d143 2
d147 1
d149 1
a149 3
        gallivm/lp_bld_format_yuv.c \
        gallivm/lp_bld_gather.c \
        gallivm/lp_bld_init.c \
a152 2
        gallivm/lp_bld_printf.c \
        gallivm/lp_bld_quad.c \
a153 1
        gallivm/lp_bld_sample_aos.c \
a156 2
        gallivm/lp_bld_tgsi_aos.c \
        gallivm/lp_bld_tgsi_info.c \
d158 1
a158 6
        gallivm/lp_bld_type.c \
        draw/draw_llvm.c \
        draw/draw_llvm_sample.c \
        draw/draw_llvm_translate.c \
        draw/draw_vs_llvm.c \
        draw/draw_pt_fetch_shade_pipeline_llvm.c
d161 1
a161 2
	gallivm/lp_bld_debug.cpp \
	gallivm/lp_bld_misc.cpp
d166 3
a168 3
	util/u_format_srgb.c \
	util/u_format_table.c \
	util/u_half.c
d179 3
d186 1
a186 1
	$(PYTHON2) $< > $@@
d189 4
a192 1
	$(PYTHON2) $< > $@@
d194 2
a195 2
util/u_format_srgb.c: util/u_format_srgb.py
	$(PYTHON2) $< > $@@
d197 2
a198 2
util/u_format_table.c: util/u_format_table.py util/u_format_pack.py util/u_format_parse.py util/u_format.csv
	$(PYTHON2) util/u_format_table.py util/u_format.csv > $@@
a199 2
util/u_half.c: util/u_half.py
	$(PYTHON2) util/u_half.py > $@@
@


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