José Fonseca a1af8eec66 Merge remote branch 'origin/lp-binning' ...

Conflicts:
	src/gallium/auxiliary/util/u_dl.c
	src/gallium/auxiliary/util/u_time.h
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_surface.c
	src/gallium/drivers/llvmpipe/lp_tex_cache.c
	src/gallium/drivers/llvmpipe/lp_tile_cache.c

2010-02-05 13:48:35 +00:00

..

beos

Remove CVS keywords.

2008-09-21 11:00:44 -07:00

demos

Merge remote branch 'origin/master' into lp-binning

2010-01-31 05:36:33 +00:00

directfb

Ignore more generated files in progs/

2008-05-20 19:04:57 -04:00

egl

progs/egl: Update eglinfo to display more attributes.

2010-01-31 11:20:15 +08:00

es1

progs/es1: Add bindtex.

2010-01-30 23:16:17 +08:00

es2

progs/es2: Fix an assertion failure in tri.

2010-02-02 10:45:00 +08:00

fbdev

Merge branch 'gallium-0.1' into gallium-0.2

2008-09-11 16:05:15 +01:00

fp

progs/fp: testcases for GL_ARB_fragment_coord_conventions

2010-01-21 09:38:50 -07:00

fpglsl

progs/fpglsl: couple more tests

2010-02-03 10:36:55 +00:00

ggi

Remove CVS keywords.

2008-09-21 11:00:44 -07:00

glsl

progs/glsl: Fix bump GLSL compilation error on Mac OS.

2010-01-28 14:58:24 -08:00

images

new test image - Delicate Arch, Utah

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

miniglx

Remove CVS keywords.

2008-09-21 11:00:44 -07:00

objviewer

progs: Ignore derived files.

2010-01-01 12:16:19 +00:00

openvg

progs: Check the number of configs returned by eglChooseConfig.

2010-01-12 10:55:35 +08:00

osdemos

progs/osmes: add missing libGL dependency, remove unneeded lines

2009-12-21 13:37:11 -07:00

perf

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

rbug

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

redbook

Merge branch 'mesa_7_7_branch'

2010-01-14 22:31:04 +00:00

samples

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

slang

progs/slang: Check for ftell failure in vstest.c.

2009-11-20 11:34:21 -08:00

tests

progs/tests: add another FBO test to exercise a RGBA vs. Z texture bug

2010-02-01 19:02:52 -07:00

tools/trace

fix gltrace (bug 16691)

2008-07-14 08:50:36 -06:00

trivial

Merge remote branch 'origin/master' into lp-binning

2010-01-31 05:36:33 +00:00

util

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

2009-12-27 15:31:08 -07:00

vp

Merge branch 'mesa_7_7_branch'

2010-01-04 19:16:24 -07:00

vpglsl

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

wgl

scons: Build progs together with everything else.

2010-01-01 12:16:19 +00:00

windml

Remove CVS keywords.

2008-09-21 11:00:44 -07:00

xdemos

glxgears: Support GLX_EXT_swap_control for querying the current swap interval.

2010-01-26 12:00:51 -07:00

.gitignore

progs: Ignore Mac OS dSYM directories.

2009-12-02 15:22:34 -08:00

Makefile

Simplify hackery added to fix AIX build.

2009-12-01 10:27:27 -08:00

SConscript

scons: Use only the shared object name when linking progs.

2010-02-04 09:23:30 +00:00