summaryrefslogtreecommitdiff
path: root/progs
AgeCommit message (Collapse)Author
2009-12-22Merge branch 'i965g-restart'Keith Whitwell
Conflicts: configure.ac
2009-12-21Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
2009-12-21Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
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
2009-12-21progs/redbook: Silence compiler warnings.Vinson Lee
2009-12-21progs/perf: added check for GL_ARB_framebuffer_objectBrian Paul
2009-12-21progs/demos: report pixel rate in million pixels / secBrian Paul
2009-12-21progs/osmes: add missing libGL dependency, remove unneeded linesBrian Paul
2009-12-21i965g: back out unintentional changes to gearsKeith Whitwell
2009-12-21Merge commit 'origin/master' into i965g-restartKeith Whitwell
Conflicts: SConstruct configs/default configs/linux-dri
2009-12-20progs/tests: Silence compiler warnings.Vinson Lee
2009-12-19progs/trivial: Use C-style comments.Vinson Lee
2009-12-19progs/xdemos: Use C-style comment.Vinson Lee
2009-12-18progs/demos: Silence compiler warning in morph3d.c.Vinson Lee
2009-12-18progs/glsl: Use C-style comments.Vinson Lee
2009-12-18progs/demos: Use C-style comment.Vinson Lee
2009-12-18progs/demos: fix glut initialization callsBrian Paul
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.
2009-12-17Move the remaining format pf_get_* functions to u_format.h.Michal Krol
Previously they depended on format blocks, but after removing those they started depending on format encoding.
2009-12-14progs/trivial: Silence compiler warnings.Vinson Lee
2009-12-12progs/trivial: Silence compiler warnings in tri-blend-min.c.Vinson Lee
2009-12-12progs/trivial: Silence compiler warnings in tri-blend-max.cVinson Lee
2009-12-12progs/xdemos: Silence compiler warnings in glxinfo.c.Vinson Lee
2009-12-12progs/tests: Silence compiler warnings in vpeval.c.Vinson Lee
2009-12-12progs/tests: Silence compiler warnings in cva.c.Vinson Lee
2009-12-12progs/redbook: Silence compiler warnings in aaindex.c.Vinson Lee
2009-12-11Merge branch 'mesa_7_7_branch'Brian Paul
Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
2009-12-11Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul
2009-12-10progs/samples: Byte swap individual members of struct _rawImageRec.Vinson Lee
2009-12-10progs/util: Byte swap individual members of struct _rawImageRec.Vinson Lee
2009-12-08Merge branch 'mesa_7_7_branch'Andre Maasikas
Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/main/version.h
2009-12-08Merge branch 'mesa_7_6_branch' into mesa_7_7_branchAndre Maasikas
2009-12-07progs/test: Initialize variable in prog_parameter.Vinson Lee
Silences uninitialized variable compiler warning.
2009-12-07Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick
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.
2009-12-07progs/demos: Fix memory leak in projtex.c.Vinson Lee
2009-12-07progs/glsl: updates to deriv.c testBrian Paul
Pass window size into the shader so scaling the window doesn't effect the colors.
2009-12-07progs/glsl: added texture mapping to bump demoBrian Paul
Press 't' to toggle texture map.
2009-12-05progs/tests: Add tests to Makefile.Vinson Lee
(cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
2009-12-05Add 'texture leak' test.Michel Dänzer
2009-12-05progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.Vinson Lee
2009-12-05progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.Vinson Lee
2009-12-05progs/samples: Add rgbtoppm to Makefile.Vinson Lee
2009-12-05progs/tests: Removed unused variable from texdown.c.Vinson Lee
2009-12-05progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.Vinson Lee
The return type of glGetUniformLocationARB is GLint, not GLuint.
2009-12-04progs/fp: Redraw upon keypress.Vinson Lee
2009-12-04progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.Vinson Lee
(cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
2009-12-04progs/util: Fix memory leak if fail to load/compile shaderVinson Lee
Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
2009-12-04progs/fp: Add tri-inv.c to Makefile.Vinson Lee
2009-12-04progs/xdemos: fix some visual/fbconfig logic in glxinfo.cBrian Paul
The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values. We only need to use the glXChooseFBConfig() code when glXChooseVisual() fails (but I don't know when that would happen). Other recent commits errantly removed some code in this area too.
2009-12-04progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee
(cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
2009-12-04progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee
(cherry picked from commit e0857962b911ef317238498305651515d83029ae)
2009-12-04progs/xdemos: Add missing break statement in offset.c.Vinson Lee
(cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)