diff options
| author | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
| commit | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (patch) | |
| tree | e3cebba97261f567f461769d891aa77707b57bd7 /progs/redbook | |
| parent | faa14818856e1e9a4ee624c2bc04d7aecabd07ab (diff) | |
| parent | a80e33f40731f07e8a39896bfdcd1b1504aedc1f (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'progs/redbook')
| -rw-r--r-- | progs/redbook/.gitignore | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/progs/redbook/.gitignore b/progs/redbook/.gitignore index 8ed3efe3e23..60a77523e27 100644 --- a/progs/redbook/.gitignore +++ b/progs/redbook/.gitignore @@ -12,29 +12,39 @@ bezmesh checker clip colormat +combiner +convolution cube +cubemap depthcue dof double drawf feedback fog +fogcoord fogindex font hello +histogram image light lines list material +minmax mipmap model movelight +multisamp +multitex +mvarray nurbs pickdepth picksquare plane planet +pointp polyoff polys quadric @@ -44,10 +54,12 @@ scene scenebamb sceneflat select +shadowmap smooth stencil stroke surface +surfpoints teaambient teapots tess @@ -56,6 +68,7 @@ texbind texgen texprox texsub +texture3d texturesurf torus trim |