Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-27 | 4 | -15/+39 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | |||||
| * | progs/util: Silence warn_unused_result warnings. | Vinson Lee | 2009-12-25 | 1 | -6/+14 |
| | | |||||
| * | progs/perf: Fix MSVC build. | Vinson Lee | 2009-12-21 | 1 | -1/+1 |
| | | | | | | | | (cherry picked from commit cbf46ed670ef5a5c8a641730234dd7ae964c3170) | ||||
* | | progs/tests: Fix build. | Vinson Lee | 2009-12-22 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-21 | 87 | -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 Lee | 2009-12-21 | 62 | -296/+283 |
| | | |||||
| * | progs/tests: Silence compiler warnings. | Vinson Lee | 2009-12-20 | 11 | -10/+19 |
| | | |||||
| * | progs/trivial: Use C-style comments. | Vinson Lee | 2009-12-19 | 10 | -12/+12 |
| | | |||||
| * | progs/xdemos: Use C-style comment. | Vinson Lee | 2009-12-19 | 1 | -1/+1 |
| | | |||||
| * | progs/demos: Silence compiler warning in morph3d.c. | Vinson Lee | 2009-12-18 | 1 | -1/+1 |
| | | |||||
| * | progs/glsl: Use C-style comments. | Vinson Lee | 2009-12-18 | 2 | -3/+3 |
| | | |||||
| * | progs/demos: Use C-style comment. | Vinson Lee | 2009-12-18 | 1 | -1/+1 |
| | | |||||
* | | progs/perf: added check for GL_ARB_framebuffer_object | Brian Paul | 2009-12-21 | 1 | -0/+6 |
| | | |||||
* | | progs/demos: report pixel rate in million pixels / sec | Brian Paul | 2009-12-21 | 1 | -4/+5 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-15 | 11 | -36/+33 |
|\| | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c | ||||
| * | progs/trivial: Silence compiler warnings. | Vinson Lee | 2009-12-14 | 5 | -15/+12 |
| | | |||||
| * | progs/trivial: Silence compiler warnings in tri-blend-min.c. | Vinson Lee | 2009-12-12 | 1 | -3/+3 |
| | | |||||
| * | progs/trivial: Silence compiler warnings in tri-blend-max.c | Vinson Lee | 2009-12-12 | 1 | -3/+3 |
| | | |||||
| * | progs/xdemos: Silence compiler warnings in glxinfo.c. | Vinson Lee | 2009-12-12 | 1 | -2/+2 |
| | | |||||
| * | progs/tests: Silence compiler warnings in vpeval.c. | Vinson Lee | 2009-12-12 | 1 | -5/+5 |
| | | |||||
| * | progs/tests: Silence compiler warnings in cva.c. | Vinson Lee | 2009-12-12 | 1 | -4/+4 |
| | | |||||
| * | progs/redbook: Silence compiler warnings in aaindex.c. | Vinson Lee | 2009-12-12 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-11 | 2 | -2/+12 |
|\| | |||||
| * | progs/samples: Byte swap individual members of struct _rawImageRec. | Vinson Lee | 2009-12-10 | 1 | -1/+6 |
| | | |||||
| * | progs/util: Byte swap individual members of struct _rawImageRec. | Vinson Lee | 2009-12-10 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Andre Maasikas | 2009-12-08 | 1 | -0/+5 |
|\| | |||||
| * | progs/test: Initialize variable in prog_parameter. | Vinson Lee | 2009-12-07 | 1 | -0/+5 |
| | | | | | | | | Silences uninitialized variable compiler warning. | ||||
* | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-07 | 8 | -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 Lee | 2009-12-07 | 1 | -0/+1 |
| | | |||||
| * | progs/tests: Add tests to Makefile. | Vinson Lee | 2009-12-05 | 1 | -0/+7 |
| | | | | | | | | (cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3) | ||||
| * | progs/samples: Fix memory leak if malloc fails in rgbtoppm.c. | Vinson Lee | 2009-12-05 | 1 | -0/+1 |
| | | |||||
| * | progs/samples: Fix memory leak if fopen fails in rgbtoppm.c. | Vinson Lee | 2009-12-05 | 1 | -1/+2 |
| | | |||||
| * | progs/samples: Add rgbtoppm to Makefile. | Vinson Lee | 2009-12-05 | 1 | -1/+1 |
| | | |||||
| * | progs/tests: Removed unused variable from texdown.c. | Vinson Lee | 2009-12-05 | 1 | -2/+1 |
| | | |||||
| * | progs/vpglsl: Assign glGetUniformLocationARB return value to GLint. | Vinson Lee | 2009-12-05 | 1 | -6/+6 |
| | | | | | | | | The return type of glGetUniformLocationARB is GLint, not GLuint. | ||||
| * | progs/fp: Redraw upon keypress. | Vinson Lee | 2009-12-04 | 1 | -1/+1 |
| | | |||||
| * | progs/util: Fix memory leak if fread returns 0 in CompileShaderFile. | Vinson Lee | 2009-12-04 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit 11905da8836822f7dd60c84b5eefc72e46c94b50) | ||||
| * | progs/util: Fix memory leak if fail to load/compile shader | Vinson Lee | 2009-12-04 | 1 | -0/+2 |
| | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit c475079ef2d901ba4506ebd53e19419cd46793ab) | ||||
| * | progs/fp: Add tri-inv.c to Makefile. | Vinson Lee | 2009-12-04 | 1 | -0/+1 |
| | | |||||
| * | progs/xdemos: fix some visual/fbconfig logic in glxinfo.c | Brian Paul | 2009-12-04 | 1 | -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 Lee | 2009-12-04 | 1 | -4/+4 |
| | | | | | | | | (cherry picked from commit 8556fad75124e1ade9af095e112ebb6ac5cbff61) | ||||
| * | progs/xdemos: Fix memory leak in pbdemo.c. | Vinson Lee | 2009-12-04 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit e0857962b911ef317238498305651515d83029ae) | ||||
| * | progs/xdemos: Add missing break statement in offset.c. | Vinson Lee | 2009-12-04 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit 4ab8dbe5935d5c946cbc9af6982461073a784d07) | ||||
| * | progs/xdemos: Remove duplicate code in glxinfo.c. | Vinson Lee | 2009-12-03 | 1 | -2/+0 |
| | | | | | | | | (cherry picked from commit a4720a1a3206dd2edecf47a21fce547a79b67610) | ||||
| * | progs/xdemos: Fix memory leak in glxinfo.c. | Vinson Lee | 2009-12-03 | 1 | -1/+3 |
| | | | | | | | | (cherry picked from commit f080567f4c4018c4885c105a154cb0eb39e6234f) | ||||
| * | progs/xdemos: Add assert in corender.c. | Vinson Lee | 2009-12-03 | 1 | -0/+1 |
| | | | | | | | | (cherry picked from commit 66a4ec14c38d407256545e0cf31c98974d621fe4) | ||||
| * | progs/vp: Fix memory leak in vp-tris.c. | Vinson Lee | 2009-12-03 | 1 | -0/+2 |
| | | | | | | | | (cherry picked from commit 760cf71572a071ce43da576ebfeff4a8099150bc) | ||||
| * | progs/tests: Fix memory leak in texdown.c if malloc fails. | Vinson Lee | 2009-12-03 | 1 | -0/+2 |
| | | | | | | | | (cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f) | ||||
| * | progs/redbook: Fix memory leak in quadric.c. | Vinson Lee | 2009-12-03 | 1 | -0/+2 |
| | | | | | | | | (cherry picked from commit 47b5f584a68ceab7c9c1d5279efbc9fe30ff2fcc) |