Keith Whitwell
aa02683e45
Merge branch 'i965g-restart'
...
Conflicts:
configure.ac
2009-12-22 09:40:39 +00:00
Christoph Bumiller
ebbc73d1ae
nv50: correct the negation of DDY sources
...
The state tracker now does the correct thing, so
interpret negation normally.
2009-12-22 10:14:45 +01:00
Ian Romanick
71678a7ede
intel: Replace release info in DRIVER_DATE with "DEVELOPMENT"
2009-12-21 18:46:17 -08:00
Ian Romanick
a4b6b42885
Merge branch 'mesa_7_7_branch'
...
Conflicts:
src/mesa/main/version.h
2009-12-21 18:45:31 -08:00
Ian Romanick
82184970d3
Add MD5 checksums for 7.6.1 release
2009-12-21 18:43:09 -08:00
Ian Romanick
6ffed19993
Add MD5 checksums for 7.7 release
2009-12-21 18:30:35 -08:00
Ian Romanick
7e210b9337
mesa: set version string to 7.7
2009-12-21 18:28:32 -08:00
Ian Romanick
164b583852
intel: Bump driver date to reflect status as final Q4 driver RC
2009-12-21 18:27:50 -08:00
Ian Romanick
48302e9b30
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
scons/gallium.py
scons/generic.py
src/mesa/main/version.h
2009-12-21 18:27:24 -08:00
Ian Romanick
75ad099d3c
mesa: set version string to 7.6.1
2009-12-21 18:25:30 -08:00
Brian Paul
ef17105134
glsl: assorted clean-ups in slang_compile.c
2009-12-21 19:14:41 -07:00
Vinson Lee
982acbddab
progs/perf: Fix MSVC build.
...
(cherry picked from commit cbf46ed670
2009-12-21 18:10:44 -08:00
José Fonseca
09415ca234
mesa: Fix missing finite symbol error on Windows.
...
Caused by some weird logic regarding the __WIN32__ define which made
the finite definition dependent on the header include order.
(cherry picked from commit 622bdecabd
2009-12-21 17:56:25 -08:00
Michal Krol
de7021b71c
mesa: Include <unistd.h> only when one is available.
...
(cherry picked from commit 970823978c
2009-12-21 17:55:13 -08:00
Jeremy Huddleston
3839f6768d
darwin: Build glsl
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-21 17:49:44 -08:00
Jeremy Huddleston
5bbdc7f420
osmesa: Fix a copy/paste error in building libOSMesa
...
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-12-21 17:49:43 -08:00
Brian Paul
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
Vinson Lee
2b7b2b90e3
scons: Define _USE_MATH_DEFINES on MSVC.
2009-12-21 17:25:03 -08:00
Brian Paul
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
Fabio Pedretti
bf064ce0c3
configure.ac: fix for libdrm_radeon API changes.
2009-12-22 10:44:53 +10:00
Fabio Pedretti
e46ad402f1
configure.ac: fix for libdrm_radeon API changes.
2009-12-22 10:44:28 +10:00
Fabio Pedretti
ae1c0a06e8
configure.ac: fix for libdrm_radeon API changes.
2009-12-22 10:43:35 +10:00
Dave Airlie
bd9e0ebaff
radeon/r600: use new libdrm_radeon api
2009-12-22 10:25:47 +10:00
Dave Airlie
bce03f7174
radeon: drop assert accessing cref which is meant to be hidden
2009-12-22 10:25:05 +10:00
Dave Airlie
34671efa29
radeon: drop unused members of radeon_state.
2009-12-22 10:24:57 +10:00
Dave Airlie
e77bfc436d
r600: move structs for legacy cmdbuf into cmdbuf C file.
...
these really shouldn't be exposed here
2009-12-22 10:24:47 +10:00
Dave Airlie
9373287a1b
radeon/r600: use new libdrm_radeon api
2009-12-22 10:23:41 +10:00
Dave Airlie
9d2910ee0f
radeon: drop assert accessing cref which is meant to be hidden
2009-12-22 10:23:41 +10:00
Dave Airlie
43d8727301
radeon: drop unused members of radeon_state.
2009-12-22 10:23:40 +10:00
Dave Airlie
1703628011
r600: move structs for legacy cmdbuf into cmdbuf C file.
...
these really shouldn't be exposed here
2009-12-22 09:58:33 +10:00
Vinson Lee
07b54fe35b
progs/redbook: Silence compiler warnings.
2009-12-21 15:20:01 -08:00
Brian Paul
fdae39c289
progs/perf: added check for GL_ARB_framebuffer_object
2009-12-21 13:49:25 -07:00
Brian Paul
79e74cda73
progs/demos: report pixel rate in million pixels / sec
2009-12-21 13:49:25 -07:00
Brian Paul
bd5fbcf92b
osmesa: added new GLSL libs
2009-12-21 13:37:49 -07:00
Brian Paul
d26cdaaa23
progs/osmes: add missing libGL dependency, remove unneeded lines
2009-12-21 13:37:11 -07:00
Keith Whitwell
0fc4dd3819
i965g: fixes to build after merge of master
2009-12-21 19:50:05 +00:00
Keith Whitwell
f72de22439
i965g: remove half-finished change to tgsi_parse
2009-12-21 19:22:45 +00:00
Keith Whitwell
57531baa92
i965g: back out unintentional changes to linux-dri
2009-12-21 19:21:09 +00:00
Keith Whitwell
66e779c22b
i965g: back out unintentional changes to gears
2009-12-21 19:19:01 +00:00
Keith Whitwell
a5585cb533
Merge commit 'origin/master' into i965g-restart
...
Conflicts:
SConstruct
configs/default
configs/linux-dri
2009-12-21 19:18:41 +00:00
Christoph Bumiller
c020a83fae
util: draw cube mipmaps with TEX CUBE
2009-12-21 19:04:06 +00:00
Roland Scheidegger
8f1d2ab590
python: fix some pipe_format_simplify merge damage
2009-12-21 18:20:31 +01:00
Roland Scheidegger
ba25137655
svga: fix typo
2009-12-21 18:20:01 +01:00
Keith Whitwell
d288a30610
ws/i965: respect DEBUG_WINSYS flag
2009-12-21 16:58:14 +00:00
Keith Whitwell
061411b261
i965g: hook vertex state emit up to PIPE_NEW_VERTEX_BUFFER
2009-12-21 16:57:37 +00:00
Keith Whitwell
1ec7e058f5
i965g: keep refcounts to bound vertex buffers
2009-12-21 16:56:46 +00:00
Keith Whitwell
6c719d4c22
i965g: add DEBUG_WINSYS flag
2009-12-21 16:55:40 +00:00
Dave Airlie
753f0a1dea
r600: fix glFrontFace(GL_CW)
...
fd.o bug #25290
Suggested fix from Rafael Monica
2009-12-21 10:40:19 -05:00
Keith Whitwell
f217927a57
i965g: remove duplicate set_viewport_state, fixes samples/depth
2009-12-21 15:38:08 +00:00
Andre Maasikas
764899d7ab
r600: support more of arb_point_sprite and also sprite_coord_origin
2009-12-21 15:23:37 +02:00
