diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-15 12:48:12 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-15 12:48:12 -0600 |
| commit | 0f16b07a041148ce9d050ec58f42a4302a9cb2cf (patch) | |
| tree | 5661a0431da6ed5e2a68dae1bae3fe83e47e208a /progs/egl/opengles1/.gitignore | |
| parent | 563a7e3cc552fdcfcaf9ac0d4b1683c3ba2ae732 (diff) | |
| parent | eee220d65d3d37030f33971b02823c614e3eb618 (diff) | |
Merge branch 'master' into lp-surface-tilinglp-surface-tiling
This brings in the gallium-resources branch changes. Things seem to be
working but there's probabaly bugs to be found.
Conflicts:
src/gallium/drivers/llvmpipe/lp_rast.c
src/gallium/drivers/llvmpipe/lp_scene.c
src/gallium/drivers/llvmpipe/lp_texture.c
src/gallium/drivers/llvmpipe/lp_texture.h
Diffstat (limited to 'progs/egl/opengles1/.gitignore')
| -rw-r--r-- | progs/egl/opengles1/.gitignore | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/progs/egl/opengles1/.gitignore b/progs/egl/opengles1/.gitignore index 2caf094edb..135e3deb35 100644 --- a/progs/egl/opengles1/.gitignore +++ b/progs/egl/opengles1/.gitignore @@ -1,12 +1,15 @@ bindtex -drawtex +drawtex_x11 +drawtex_screen es1_info gears_x11 gears_screen msaa pbuffer render_tex -torus +texture_from_pixmap +torus_x11 +torus_screen tri_x11 tri_screen two_win |