| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-25 | 2 | -8/+0 |
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c | ||||
| | * | progs/demos: Remove unnecessary header from shadowtex.c. | Vinson Lee | 2010-01-23 | 2 | -8/+0 |
| | | | |||||
| * | | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 5 | -7/+22 |
| |\| | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c | ||||
| | * | progs/demos: Remove unnecessary header from morph3d.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | |||||
| | * | progs/demos: Remove unnecessary header from isosurf.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | |||||
| | * | progs/demos: Remove unnecessary header from fbotexture.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | | |||||
| | * | progs/demos: Bounds check input to fire.c. | Vinson Lee | 2010-01-10 | 1 | -1/+7 |
| | | | |||||
| | * | progs/demos: Add missing initializers in engine.c. | Vinson Lee | 2010-01-08 | 1 | -3/+15 |
| | | | |||||
| * | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-08 | 1 | -0/+2 |
| |\| | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i965/brw_wm_emit.c | ||||
| | * | progs/demos: Assert that input to malloc is valid. | Vinson Lee | 2010-01-06 | 1 | -0/+2 |
| | | | |||||
| * | | scons: Build progs together with everything else. | José Fonseca | 2010-01-01 | 1 | -71/+53 |
| | | | | | | | | | | | | | | | | | This is a substantial reorganization, This particular commit enables: - building the progs for unices platforms - glew is now built as a shared library (it is the default, and it is inconvenient and pointless to shift away from that default) - all progs get built by default | ||||
| * | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-31 | 3 | -9/+25 |
| |\| | | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c | ||||
| | * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-27 | 3 | -9/+25 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h | ||||
| | | * | progs/demos: Silence warn_unused_result warnings. | Vinson Lee | 2009-12-26 | 3 | -9/+25 |
| | | | | |||||
| * | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-21 | 2 | -5/+6 |
| |\| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c | ||||
| | * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-21 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h | ||||
| | | * | progs/demos: Silence compiler warning in morph3d.c. | Vinson Lee | 2009-12-18 | 1 | -1/+1 |
| | | | | |||||
| | | * | progs/demos: Use C-style comment. | Vinson Lee | 2009-12-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | progs/demos: report pixel rate in million pixels / sec | Brian Paul | 2009-12-21 | 1 | -4/+5 |
| | | | | |||||
| * | | | progs/demos: fix glut initialization calls | Brian Paul | 2009-12-18 | 45 | -106/+54 |
| |/ / | | | | | | | | | | | | | Remove glutInitWindowPosition() calls to play nicer with window managers. Move glutInitWindowSize() calls before glutInit() so the the default window size can be overridden by the -geometry cmd line option. | ||||
| * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-07 | 1 | -0/+1 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/projtex.c progs/xdemos/glxinfo.c src/mesa/main/version.h To fix the confilicts in projtex.c and glxinfo.c I just took the code from mesa_7_6_branch. The conflicts seem to have occured from cherry-picks from mesa_7_7_branch to mesa_7_6_branch followed by commmits just to mesa_7_6_branch. | ||||
| | * | progs/demos: Fix memory leak in projtex.c. | Vinson Lee | 2009-12-07 | 1 | -0/+1 |
| | | | |||||
| | * | progs/demos: Fix memory leak in ray.c. | Vinson Lee | 2009-12-03 | 1 | -0/+2 |
| | | | | | | | | | (cherry picked from commit 6b480dc21dd489d48685b2268e495218aea74293) | ||||
| | * | progs/demos: Fix memory leak in projtex.c. | Vinson Lee | 2009-12-03 | 1 | -0/+3 |
| | | | | | | | | | (cherry picked from commit ee555e3d69c8820f27e71e5ebc028a768cef7d0b) | ||||
| | * | progs/demos: Fix memory leak in ipers.c. | Vinson Lee | 2009-12-03 | 1 | -0/+2 |
| | | | | | | | | | (cherry picked from commit a1afe303deda320aadacdaf5b1c72631ca3f734f) | ||||
| | * | progs/demos: Fix memory leak in fslight.c. | Vinson Lee | 2009-12-03 | 1 | -0/+1 |
| | | | | | | | | | (cherry picked from commit aef3218f0bb48fdb286d2008ee07e507ea8aa98e) | ||||
| * | | Merge commit 'mesa_7_6_branch' into mesa_7_7_branch | Jakob Bornecrantz | 2009-12-02 | 1 | -2/+0 |
| |\| | | | | | | | | | Conflicts: src/mesa/main/version.h | ||||
| | * | progs/demos: remove unused glFogCoordPointer_ext var | Brian Paul | 2009-12-01 | 1 | -2/+0 |
| | | | |||||
| * | | progs/demos: silence warnings | Brian Paul | 2009-11-17 | 2 | -2/+3 |
| | | | |||||
| * | | progs/demos: Fix memory leak in ray.c. | Vinson Lee | 2009-11-16 | 1 | -0/+2 |
| | | | |||||
| * | | progs/demos: Fix memory leak in projtex.c. | Vinson Lee | 2009-11-16 | 1 | -0/+3 |
| | | | |||||
| * | | progs/demos: Fix memory leak in ipers.c. | Vinson Lee | 2009-11-16 | 1 | -0/+2 |
| | | | |||||
| * | | progs/demos: Fix memory leak in fslight.c. | Vinson Lee | 2009-11-16 | 1 | -0/+1 |
| | | | |||||
| * | | progs/demos: add fps to multiarb | Keith Whitwell | 2009-10-23 | 1 | -0/+16 |
| | | | |||||
| * | | progs/demos: try different depth formats in fbo_firecube.c | Brian Paul | 2009-10-14 | 1 | -8/+28 |
| | | | |||||
| * | | Merge branch 'softpipe-opt' | Keith Whitwell | 2009-09-23 | 1 | -0/+16 |
| |\ \ | | | | | | | | | | | | | | | | | | | Conflicts: progs/demos/cubemap.c src/gallium/drivers/softpipe/sp_tex_sample.c src/gallium/drivers/softpipe/sp_texture.c | ||||
| | * | | progs/demos: add fps output to cubemap | Keith Whitwell | 2009-08-23 | 1 | -0/+16 |
| | | | | |||||
| * | | | progs/demos: use non-default texobj in cubemap.c | Brian Paul | 2009-09-15 | 1 | -0/+5 |
| | | | | |||||
| * | | | progs/demos: create a texture object in lodbias.c | Brian Paul | 2009-09-15 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | Before, we were using the default texture object (name=0). This caused the intel_generate_mipmap() path to fail since passing texture=0 to glFramebufferTexture2DEXT() causes us to _unbind_ the texture if present. | ||||
| * | | | progs/demos: added RGB invert option | Brian Paul | 2009-09-08 | 1 | -0/+22 |
| | |/ |/| | |||||
| * | | mesa: gitignore | Younes Manton | 2009-08-26 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-08-18 | 1 | -4/+24 |
| |\ \ | |||||
| | * | | progs/demos: print more info in fbotexture.c | Brian Paul | 2009-08-14 | 1 | -4/+24 |
| | | | | |||||
| * | | | demos/cubemap: Add support for GL_ARB_seamless_cube_map | Ian Romanick | 2009-08-14 | 1 | -16/+38 |
| | |/ |/| | |||||
| * | | demos: use glEnable/DisableClientState() for vertex arrays | Brian Paul | 2009-07-08 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'mesa_7_5_branch' | Jakob Bornecrantz | 2009-07-03 | 1 | -5/+20 |
| |\| | | | | | | | | | | | Conflicts: src/mesa/main/dlist.c src/mesa/vbo/vbo_save_api.c | ||||
| | * | progs/isosurf: add materials mode for glVertex + TRISTRIP | Keith Whitwell | 2009-06-30 | 1 | -5/+20 |
| | | | |||||
| * | | demos: Set the depth mask correctly to get the desired blending | Ian Romanick | 2009-06-30 | 2 | -4/+4 |
| | | | |||||
| * | | Merge branch 'mesa_7_5_branch' | Brian Paul | 2009-06-26 | 1 | -2/+6 |
| |\| | | | | | | | | | | | | | | | Conflicts: Makefile src/gallium/drivers/softpipe/sp_screen.c src/mesa/main/version.h | ||||
| | * | demos: improve argv parsing in fslight.c | Brian Paul | 2009-06-26 | 1 | -2/+6 |
| | | | |||||
 |
index : mesa.git | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |