Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_7_branch' | Jakob Bornecrantz | 2010-01-14 | 4 | -6/+5 |
|\ | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/util/Makefile src/gallium/drivers/r300/r300_state_derived.c | ||||
| * | progs/tests: Remove duplicate included header in vparray.c. | Vinson Lee | 2010-01-11 | 1 | -1/+0 |
| | | |||||
| * | progs/tests: Add newline to end of printf in vparray.c. | Vinson Lee | 2010-01-11 | 1 | -1/+1 |
| | | |||||
| * | progs/tests: Silence fprintf format warning. | Vinson Lee | 2010-01-11 | 1 | -2/+2 |
| | | |||||
| * | progs/tests: Silence 'missing initializer' warnings. | Vinson Lee | 2010-01-08 | 2 | -2/+2 |
| | | |||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-04 | 2 | -6/+9 |
|\| | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c | ||||
| * | progs/tests: Silence uninitialized variable warning. | Vinson Lee | 2010-01-02 | 1 | -1/+1 |
| | | |||||
| * | progs/tests: Silence warn_unused_result warning. | Vinson Lee | 2010-01-02 | 1 | -5/+8 |
| | | |||||
| * | progs/tests: Fix build. | Vinson Lee | 2009-12-22 | 1 | -1/+0 |
| | | |||||
* | | scons: Build progs together with everything else. | José Fonseca | 2010-01-01 | 1 | -19/+1 |
| | | | | | | | | | | | | | | | | 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 | ||||
* | | progs/tests: added test for GL_EXT_draw_buffers2 | Brian Paul | 2009-12-31 | 3 | -0/+366 |
| | | | | | | | | | | | | Render into two color buffers (render targets). Display half of each buffer in the window. Use different color masks for each render target. Only enable blending for the second render target. | ||||
* | | progs/tests: added conditional rendering test program | Brian Paul | 2009-12-31 | 3 | -0/+244 |
| | | |||||
* | | progs/tests: Fix build. | Vinson Lee | 2009-12-22 | 1 | -1/+0 |
| | | | | | | | | (cherry picked from commit 1bf2d78b11ac9ac71f4be285963db1af9f09fe73) | ||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2009-12-21 | 13 | -17/+27 |
|\| | | | | | | | | | | | 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 | 11 | -8/+18 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/tests: Silence compiler warnings. | Vinson Lee | 2009-12-20 | 11 | -10/+19 |
| | | | |||||
| * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-15 | 2 | -9/+9 |
| |\| | | | | | | | | | | | | | Conflicts: src/gallium/drivers/softpipe/sp_quad_blend.c | ||||
| | * | 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 |
| | | | |||||
* | | | Merge branch 'mesa_7_7_branch' | Andre Maasikas | 2009-12-08 | 2 | -2/+6 |
|\| | | | | | | | | | | | | | | | | | 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 | 1 | -2/+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/tests: Add tests to Makefile. | Vinson Lee | 2009-12-05 | 1 | -0/+7 |
| | | | | | | | | | | | | (cherry picked from commit 76d2ec3a0a047a65ffca70f53848241a3225dad3) | ||||
| | * | progs/tests: Removed unused variable from texdown.c. | Vinson Lee | 2009-12-05 | 1 | -2/+1 |
| | | | |||||
| | * | progs/tests: Fix memory leak in texdown.c if malloc fails. | Vinson Lee | 2009-12-03 | 1 | -0/+2 |
| | | | | | | | | | | | | (cherry picked from commit e3cfd78969cd4a94fc83a5d6fb2f33730cc4e70f) | ||||
| | * | prog/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit 9c3197ef0abc3bf521358ea0c7af0fc6979c82b3) | ||||
| | * | progs/tests: fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit a8ed066858f12290239ddc9165b7c0734ccc0247) | ||||
| | * | progs/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -3/+3 |
| | | | | | | | | | | | | (cherry picked from commit 50e113e375b4ecfdf5b60ccce7bbcdb1c5f2ca11) | ||||
| | * | progs/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -8/+8 |
| | | | | | | | | | | | | (cherry picked from commit 952bf63e2cf442504ef89b0b1d276da0d52b21d4) | ||||
| | * | progs/tests: Use rand() instead of random(). | José Fonseca | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Forgot these on previous commit. (cherry picked from commit 166957abebea6aa203eba7e6348e89d53cf0e13e) | ||||
| | * | progs/tests: Use rand() instead of random(). | José Fonseca | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | More portable. Same implementation on Linux. (cherry picked from commit 699260b19535abaa3af0a5d33eb039e3d6a30ce9) | ||||
| | * | progs/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -1/+0 |
| | | | | | | | | | | | | (cherry picked from commit f7455ad7af09b5ef31ccc454b79422a13c59af9a) | ||||
| | * | prog/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 60b6c7458319ff01ecdd9d1650d526ac8f75e194) | ||||
| | * | prog/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 96fd13c1a024e3b6c0b1c44394c67c772e52b9c9) | ||||
| | * | progs/tests: fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -1/+1 |
| | | | | | | | | | | | | (cherry picked from commit 9c778a90ea24f25437b68bb67856c81add61e261) | ||||
| | * | prog/tests: Fix MSVC build. | Vinson Lee | 2009-12-03 | 1 | -14/+5 |
| | | | | | | | | | | | | (cherry picked from commit ea862ec8ff4a52b30b822e737d93a49330be9e31) | ||||
* | | | Add 'texture leak' test. | Michel Dänzer | 2009-12-05 | 2 | -0/+141 |
|/ / | |||||
* | | progs/tests: Silence unused value warnings in sharedtex.c. | Vinson Lee | 2009-11-20 | 1 | -4/+4 |
| | | |||||
* | | progs/tests: Initialize variable in getprocaddress.c. | Vinson Lee | 2009-11-20 | 1 | -1/+1 |
| | | |||||
* | | progs/tests: Fix memory leak in texdown.c if malloc fails. | Vinson Lee | 2009-11-18 | 1 | -0/+2 |
| | | |||||
* | | progs/tests: Fix memory leak in arbgpuprog.c. | Vinson Lee | 2009-11-17 | 1 | -0/+4 |
| | | |||||
* | | progs/tests: silence warning | Brian Paul | 2009-11-16 | 1 | -1/+1 |
| | | |||||
* | | progs/tests: add alpha/blend testing to packedpixels.c | Brian Paul | 2009-11-11 | 1 | -22/+42 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-11-04 | 1 | -1/+5 |
|\| | | | | | | | | | | | Conflicts: src/mesa/drivers/windows/gdi/mesa.def | ||||
| * | progs/tests: Fix MSVC build. | Vinson Lee | 2009-11-04 | 1 | -1/+5 |
| | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
* | | progs/tests: debug code for getting texture component sizes | Brian Paul | 2009-11-03 | 2 | -2/+17 |
| | | |||||
* | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-11-03 | 2 | -5/+18 |
|\| | |||||
| * | progs/tests: fixes for drawbuffers.c | Brian Paul | 2009-10-29 | 1 | -5/+12 |
| | | | | | | | | | | Disable GL_DEPTH_TEST before glDrawPixels. Show color buffer 0 on left, color buffer 1 on right. | ||||
| * | progs/tests: added test for GL_EXT_texture_compression_s3tc support | Brian Paul | 2009-10-28 | 1 | -0/+6 |
| | |