Roland Scheidegger 685340a53e Merge branch 'gallium-vertexelementcso' ...

Conflicts:
	src/gallium/auxiliary/cso_cache/cso_context.c
	src/gallium/auxiliary/util/u_blit.c
	src/gallium/auxiliary/util/u_gen_mipmap.c
	src/gallium/drivers/i915/i915_context.h
	src/gallium/drivers/i965/brw_draw_upload.c
	src/gallium/drivers/r300/r300_blit.c
	src/gallium/drivers/r300/r300_context.h
	src/gallium/drivers/r300/r300_render.c
	src/gallium/drivers/r300/r300_state_derived.c
	src/mesa/state_tracker/st_cb_bitmap.c
	src/mesa/state_tracker/st_cb_clear.c

2010-03-09 15:59:40 +01:00

..

beos

Remove CVS keywords.

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

demos

progs/demos: Add arbocclude2 to Makefile and .gitignore.

2010-03-05 23:18:01 -08:00

egl

eglinfo: Wrap extension string

2010-02-26 15:11:29 -05:00

es1

progs/es1: Update .gitignore.

2010-02-17 22:32:10 +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

Fix up more stale references to gl(X)_API.xml which have moved.

2010-02-26 10:48:07 +01:00

fpglsl

progs/fpglsl: couple more tests

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

gallium

Merge branch 'gallium-vertexelementcso'

2010-03-09 15:59:40 +01:00

glsl

progs/glsl: Ensure CFLAGS are passed during linking

2010-02-26 11:05:54 -08:00

images

new test image - Delicate Arch, Utah

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

objviewer

progs/objviewer: close file (bug 26559)

2010-02-14 10:05:42 -07:00

openvg

progs/openvg: Add .gitignore.

2010-02-17 22:32:10 +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

rbug: Rename pipe formats.

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

redbook

progs/redbook: Silence warn_unused_result warnings.

2010-02-20 01:34:16 -08: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

fix getprocaddress test

2010-03-04 16:34:01 +02:00

tools/trace

Fix up more stale references to gl(X)_API.xml which have moved.

2010-02-26 10:48:07 +01:00

trivial

Fix up more stale references to gl(X)_API.xml which have moved.

2010-02-26 10:48:07 +01: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

xdemos

xdemos/omlsync: improve OML WaitMsc test

2010-03-08 11:31:26 -08: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

progs/gallium: Add unit tests for pixel format packing/unpacking.

2010-02-27 20:29:14 +00:00