Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | rbug: rename pf_is_compressed to util_format_is_compressed | Roland Scheidegger | 2009-12-23 | 2 | -2/+4 |
| | |||||
* | progs/tests: Fix build. | Vinson Lee | 2009-12-22 | 1 | -1/+0 |
| | | | | (cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73) | ||||
* | Merge branch 'i965g-restart' | Keith Whitwell | 2009-12-22 | 8 | -5/+163 |
|\ | | | | | | | | | Conflicts: configure.ac | ||||
| * | i965g: back out unintentional changes to gears | Keith Whitwell | 2009-12-21 | 1 | -7/+0 |
| | | |||||
| * | Merge commit 'origin/master' into i965g-restart | Keith Whitwell | 2009-12-21 | 169 | -214/+638 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: SConstruct configs/default configs/linux-dri | ||||
| * | | brw: add dumping to gem winsys | Keith Whitwell | 2009-11-30 | 1 | -0/+7 |
| | | | |||||
| * | | progs/vp: add param and imm test | Keith Whitwell | 2009-11-19 | 1 | -0/+7 |
| | | | |||||
| * | | progs/fp: add simple imm, param tests | Keith Whitwell | 2009-11-19 | 3 | -0/+18 |
| | | | |||||
| * | | trivial: make tri-orig more closely match the original version of tri... | Keith Whitwell | 2009-11-11 | 1 | -5/+5 |
| | | | |||||
| * | | progs/trivial: Ignores | Jakob Bornecrantz | 2009-11-06 | 1 | -0/+1 |
| | | | |||||
| * | | trivial: add vbo-tri, an even simpler version of tri.c | Keith Whitwell | 2009-11-06 | 2 | -0/+132 |
| | | | |||||
* | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-21 | 100 | -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_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 |
| | | | | | |||||
* | | | | | progs/osmes: add missing libGL dependency, remove unneeded lines | Brian Paul | 2009-12-21 | 1 | -12/+1 |
| | | | | | |||||
* | | | | | 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. | ||||
* | | | | | Move the remaining format pf_get_* functions to u_format.h. | Michal Krol | 2009-12-17 | 1 | -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 Paul | 2009-12-11 | 2 | -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_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_7_branch' | Andre Maasikas | 2009-12-08 | 9 | -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_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) |