summaryrefslogtreecommitdiffstats
path: root/progs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2009-12-21100-363/+362
|\ | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-2187-323/+318
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/redbook: Silence compiler warnings.Vinson Lee2009-12-2162-296/+283
| | |
| | * progs/tests: Silence compiler warnings.Vinson Lee2009-12-2011-10/+19
| | |
| | * progs/trivial: Use C-style comments.Vinson Lee2009-12-1910-12/+12
| | |
| | * progs/xdemos: Use C-style comment.Vinson Lee2009-12-191-1/+1
| | |
| | * progs/demos: Silence compiler warning in morph3d.c.Vinson Lee2009-12-181-1/+1
| | |
| | * progs/glsl: Use C-style comments.Vinson Lee2009-12-182-3/+3
| | |
| | * progs/demos: Use C-style comment.Vinson Lee2009-12-181-1/+1
| | |
| * | progs/perf: added check for GL_ARB_framebuffer_objectBrian Paul2009-12-211-0/+6
| | |
| * | progs/demos: report pixel rate in million pixels / secBrian Paul2009-12-211-4/+5
| | |
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-1511-36/+33
| |\| | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c
| | * progs/trivial: Silence compiler warnings.Vinson Lee2009-12-145-15/+12
| | |
| | * progs/trivial: Silence compiler warnings in tri-blend-min.c.Vinson Lee2009-12-121-3/+3
| | |
| | * progs/trivial: Silence compiler warnings in tri-blend-max.cVinson Lee2009-12-121-3/+3
| | |
| | * progs/xdemos: Silence compiler warnings in glxinfo.c.Vinson Lee2009-12-121-2/+2
| | |
| | * progs/tests: Silence compiler warnings in vpeval.c.Vinson Lee2009-12-121-5/+5
| | |
| | * progs/tests: Silence compiler warnings in cva.c.Vinson Lee2009-12-121-4/+4
| | |
| | * progs/redbook: Silence compiler warnings in aaindex.c.Vinson Lee2009-12-121-4/+4
| | |
* | | progs/osmes: add missing libGL dependency, remove unneeded linesBrian Paul2009-12-211-12/+1
| | |
* | | progs/demos: fix glut initialization callsBrian Paul2009-12-1845-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.
* | | Move the remaining format pf_get_* functions to u_format.h.Michal Krol2009-12-171-9/+4
| | | | | | | | | | | | | | | Previously they depended on format blocks, but after removing those they started depending on format encoding.
* | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-112-2/+12
|\| | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/xorg/xorg_xv.c src/mesa/drivers/dri/intel/intel_span.c
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-112-2/+12
| |\|
| | * progs/samples: Byte swap individual members of struct _rawImageRec.Vinson Lee2009-12-101-1/+6
| | |
| | * progs/util: Byte swap individual members of struct _rawImageRec.Vinson Lee2009-12-101-1/+6
| | |
* | | Merge branch 'mesa_7_7_branch'Andre Maasikas2009-12-089-14/+31
|\| | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/r600/r700_assembler.c src/mesa/main/version.h
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchAndre Maasikas2009-12-081-0/+5
| |\|
| | * progs/test: Initialize variable in prog_parameter.Vinson Lee2009-12-071-0/+5
| | | | | | | | | | | | Silences uninitialized variable compiler warning.
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-078-14/+26
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Lee2009-12-071-0/+1
| | |
| | * progs/tests: Add tests to Makefile.Vinson Lee2009-12-051-0/+7
| | | | | | | | | | | | (cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3)
| | * progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.Vinson Lee2009-12-051-0/+1
| | |
| | * progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.Vinson Lee2009-12-051-1/+2
| | |
| | * progs/samples: Add rgbtoppm to Makefile.Vinson Lee2009-12-051-1/+1
| | |
| | * progs/tests: Removed unused variable from texdown.c.Vinson Lee2009-12-051-2/+1
| | |
| | * progs/vpglsl: Assign glGetUniformLocationARB return value to GLint.Vinson Lee2009-12-051-6/+6
| | | | | | | | | | | | The return type of glGetUniformLocationARB is GLint, not GLuint.
| | * progs/fp: Redraw upon keypress.Vinson Lee2009-12-041-1/+1
| | |
| | * progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50)
| | * progs/util: Fix memory leak if fail to load/compile shaderVinson Lee2009-12-041-0/+2
| | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab)
| | * progs/fp: Add tri-inv.c to Makefile.Vinson Lee2009-12-041-0/+1
| | |
| | * progs/xdemos: fix some visual/fbconfig logic in glxinfo.cBrian Paul2009-12-041-3/+12
| | | | | | | | | | | | | | | | | | | | | 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.
| | * progs/xdemos: Silence unused value warnings in sharedtex_mt.c.Vinson Lee2009-12-041-4/+4
| | | | | | | | | | | | (cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61)
| | * progs/xdemos: Fix memory leak in pbdemo.c.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit e0857962b911ef317238498305651515d83029ae)
| | * progs/xdemos: Add missing break statement in offset.c.Vinson Lee2009-12-041-0/+1
| | | | | | | | | | | | (cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07)
| | * progs/xdemos: Remove duplicate code in glxinfo.c.Vinson Lee2009-12-031-2/+0
| | | | | | | | | | | | (cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610)
| | * progs/xdemos: Fix memory leak in glxinfo.c.Vinson Lee2009-12-031-1/+3
| | | | | | | | | | | | (cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f)
| | * progs/xdemos: Add assert in corender.c.Vinson Lee2009-12-031-0/+1
| | | | | | | | | | | | (cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4)
| | * progs/vp: Fix memory leak in vp-tris.c.Vinson Lee2009-12-031-0/+2
| | | | | | | | | | | | (cherry picked from commit 760cf71572a071ce43da576ebfeff4a8099150bc)
| | * progs/tests: Fix memory leak in texdown.c if malloc fails.Vinson Lee2009-12-031-0/+2
| | | | | | | | | | | | (cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f)
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-22 07:46:26 +0000