5ac16495a2
Merge branch 'mesa_7_7_branch'
...
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
2010-01-04 19:16:24 -07:00
8a29e3f8e8
progs/egl: Silence uninitialized variable warnings.
2010-01-03 21:39:20 -08:00
3ea5a95078
progs/samples: Silence compiler warnings.
2010-01-03 21:29:33 -08:00
1da47ac20e
progs/vp: Ensure null-terminated byte string.
2010-01-03 02:38:22 -08:00
c9c6e9a39e
progs/tests: Silence uninitialized variable warning.
2010-01-02 21:58:40 -08:00
32d18924df
progs/tests: Silence warn_unused_result warning.
2010-01-02 21:52:51 -08:00
646c8ce032
progs/samples: 'Silence no previous prototype' warnings.
2010-01-01 17:54:11 -08:00
ad9defdd9c
progs/rbug: s/wait/rbug_wait/
...
wait conflicts with wait in /usr/include/sys/wait.h.
2010-01-01 16:25:37 -08:00
7bbf7f94ea
scons: Build progs together with everything else.
...
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
2010-01-01 12:16:19 +00:00
58b401315b
progs: Ignore derived files.
2010-01-01 12:16:19 +00:00
25024d9482
Merge branch 'mesa_7_7_branch'
...
Conflicts:
configs/darwin
src/gallium/auxiliary/util/u_clear.h
src/gallium/state_trackers/xorg/xorg_exa_tgsi.c
src/mesa/drivers/dri/i965/brw_draw_upload.c
2009-12-31 09:02:27 -07:00
34075d0219
progs/tests: added test for GL_EXT_draw_buffers2
...
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.
2009-12-31 08:49:27 -07:00
08d145e1d7
progs/tests: added conditional rendering test program
2009-12-31 08:49:27 -07:00
5b2713c92a
progs/glsl: Provide a better fix for fgets warning.
2009-12-30 12:38:21 -08:00
0ab29d2b35
progs/glsl: Silence compiler warnings.
2009-12-29 21:11:37 -08:00
d0b7ff551a
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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
2009-12-27 15:31:08 -07:00
e81fe088f4
progs/demos: Silence warn_unused_result warnings.
2009-12-26 01:08:26 -08:00
cdc69e3469
progs/util: Silence warn_unused_result warnings.
2009-12-25 23:13:50 -08:00
faae0e5da3
rbug: rename pf_is_compressed to util_format_is_compressed
2009-12-23 16:57:46 +01:00
0f6cbc55b7
progs/tests: Fix build.
...
(cherry picked from commit 1bf2d78b11
2009-12-22 23:30:23 -08:00
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
1bf2d78b11
progs/tests: Fix build.
2009-12-22 00:54:34 -08:00
982acbddab
progs/perf: Fix MSVC build.
...
(cherry picked from commit cbf46ed670
2009-12-21 18:10:44 -08:00
9eb7fc6661
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/main/version.h
src/mesa/state_tracker/st_atom_shader.c
2009-12-21 18:35:54 -07:00
b57abd3bea
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
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-21 18:23:53 -07:00
07b54fe35b
progs/redbook: Silence compiler warnings.
2009-12-21 15:20:01 -08:00
fdae39c289
progs/perf: added check for GL_ARB_framebuffer_object
2009-12-21 13:49:25 -07:00
79e74cda73
progs/demos: report pixel rate in million pixels / sec
2009-12-21 13:49:25 -07:00
d26cdaaa23
progs/osmes: add missing libGL dependency, remove unneeded lines
2009-12-21 13:37:11 -07:00
66e779c22b
i965g: back out unintentional changes to gears
2009-12-21 19:19:01 +00:00
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
0dd9513874
progs/tests: Silence compiler warnings.
2009-12-20 01:01:00 -08:00
d87d71036c
progs/trivial: Use C-style comments.
2009-12-19 00:28:01 -08:00
3340fd65fb
progs/xdemos: Use C-style comment.
2009-12-19 00:00:56 -08:00
695adf41e2
progs/demos: Silence compiler warning in morph3d.c.
2009-12-18 23:46:14 -08:00
121ff55d81
progs/glsl: Use C-style comments.
2009-12-18 23:38:15 -08:00
41377942d3
progs/demos: Use C-style comment.
2009-12-18 23:34:28 -08:00
263f4322e7
progs/demos: fix glut initialization calls
...
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-18 13:58:14 -07:00
b1ed72ebe2
Move the remaining format pf_get_* functions to u_format.h.
...
Previously they depended on format blocks, but after removing those
they started depending on format encoding.
2009-12-17 23:41:57 +01:00
0a8d508854
progs/trivial: Silence compiler warnings.
2009-12-14 18:11:57 -08:00
588e9f69c4
progs/trivial: Silence compiler warnings in tri-blend-min.c.
2009-12-12 15:47:17 -08:00
786899f153
progs/trivial: Silence compiler warnings in tri-blend-max.c
2009-12-12 14:20:17 -08:00
15c6558a2e
progs/xdemos: Silence compiler warnings in glxinfo.c.
2009-12-12 02:06:51 -08:00
d5be33477e
progs/tests: Silence compiler warnings in vpeval.c.
2009-12-12 01:34:33 -08:00
44d6ab6de5
progs/tests: Silence compiler warnings in cva.c.
2009-12-12 01:11:56 -08:00
9e2eee4ab2
progs/redbook: Silence compiler warnings in aaindex.c.
2009-12-12 01:02:16 -08:00
a087eb590d
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/gallium/state_trackers/xorg/xorg_xv.c
src/mesa/drivers/dri/intel/intel_span.c
2009-12-11 10:04:07 -07:00
b605f4ff11
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
2009-12-11 09:22:00 -07:00
1cf60c9810
progs/samples: Byte swap individual members of struct _rawImageRec.
2009-12-10 15:41:13 -08:00
bc0509bba8
progs/util: Byte swap individual members of struct _rawImageRec.
2009-12-10 13:24:15 -08:00
Brian Paul
Vinson Lee
José Fonseca
Roland Scheidegger
Keith Whitwell
Michal Krol