Brian 29c471aafc Merge branch 'origin' into glsl-compiler-1 ...

Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c

2007-02-22 08:53:33 -07:00

..

beos

GLInfo now show GLU and GLUT infos too. Fix the includes paths

2004-08-15 14:06:00 +00:00

demos

Merge branch 'origin' into glsl-compiler-1

2007-02-22 08:53:33 -07:00

directfb

Remove DirectFBGL header from Mesa bacause since 1.0.0 DirectFB installs its own header.

2006-12-01 14:12:05 +00:00

egl

LIB_DIR is now just 'lib' or 'lib64'

2006-07-13 02:50:27 +00:00

fbdev

new file

2005-04-29 15:36:38 +00:00

fp

add point-position.c

2006-08-24 17:49:37 +00:00

ggi

GGI driver updates (Filip Spacek)

2002-06-10 15:16:44 +00:00

glsl

shading language texture demo/test

2007-02-03 11:36:16 -07:00

images

new test image - Delicate Arch, Utah

2006-05-10 22:44:26 +00:00

miniglx

Improve the behaviour of the build system wrt depend files.

2004-12-08 15:16:36 +00:00

osdemos

allow specifying image size on cmd line

2006-10-14 23:24:45 +00:00

redbook

Make git ignore files only generated at build time.

2006-12-06 14:17:56 +01:00

samples

Make git ignore files only generated at build time.

2006-12-06 14:17:56 +01:00

slang

Prepend #extension 'MESA_shader_debug: require' to each shader.

2006-09-26 16:06:35 +00:00

tests

mipmap_limits: Fix display of current texture filtering mode.

2006-12-14 11:01:38 +01:00

tools/trace

Thomas Sondergaard's API tracer

2006-06-02 14:50:28 +00:00

trivial

New tests for the array functions which also provoke rebasing.

2007-01-30 19:19:51 +00:00

util

added some VerteAttrib funcs

2007-01-16 14:57:12 -07:00

vp

fprintf() clean-up (bug 6730)

2006-04-24 16:32:05 +00:00

windml

WindML updates (Stephane Raimbault)

2001-09-10 19:21:13 +00:00

xdemos

Remove the xdemo.c program from PROGS since it doesn't work with GLX/DRI.

2006-12-13 08:57:06 -07:00

Makefile

New 'install' targets in makefile. See bug 2372.

2006-06-22 22:50:48 +00:00