Jakob Bornecrantz
cc8a537c57
Merge branch 'mesa_7_7_branch'
2009-12-02 14:56:56 +01:00
José Fonseca
7fc75ef7d4
util: Fix generated swizzle comments.
2009-12-03 18:19:43 +00:00
Michal Krol
cdb6849fc1
tgsi/ureg: Fix ureg_emit_src().
2009-12-03 09:13:52 +01:00
Corbin Simpson
ab7e70fabd
radeong: Clean up some bad code.
2009-12-02 12:58:15 -08:00
Corbin Simpson
f79028bbd4
radeong: Add helper to determine pipe driver.
2009-12-02 12:58:15 -08:00
Corbin Simpson
4395d35c8a
radeong: Do ioctls before selecting pipe driver.
2009-12-02 12:58:15 -08:00
Corbin Simpson
4f77b0103d
r300g, radeong: De-specialize r300_winsys into radeon_winsys.
...
There's like five good reasons for this, I swear.
2009-12-02 12:58:15 -08:00
Corbin Simpson
dad193d516
radeong: Change ioctl order, document it.
2009-12-02 12:58:14 -08:00
Corbin Simpson
08383af4c7
r300g: No vertex textures here.
2009-12-02 12:58:14 -08:00
Brian Paul
debc0b6fa8
cso: check if pipe_context::bind_vertex_sampler_states is non-null
...
Fixes segfaults upon exit when the CSO module is releasing its objects.
2009-12-02 12:24:27 -07:00
Brian Paul
d5e5909f17
Revert "llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function"
...
This reverts commit 792888121b .
We're instead returning 0 for the PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query.
2009-12-02 12:20:15 -07:00
Brian Paul
f42192e783
llvmpipe: return 0 for PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query
...
The driver (and draw module) don't support vertex shader textures yet.
2009-12-02 12:19:33 -07:00
Brian Paul
792888121b
llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function
...
Fixes immediate segfault.
2009-12-02 10:11:05 -07:00
Brian Paul
429bf75417
cell: fix TGSI breakage
2009-12-02 09:23:37 -07:00
Brian Paul
144afacc6f
gallium/util: __builtin_bswap32() is in only gcc 4.3 or later
2009-12-02 09:23:15 -07:00
Brian Paul
f6d5e58427
gallium/util: added PIPE_CC_GCC_VERSION symbol
2009-12-02 09:22:42 -07:00
Jakob Bornecrantz
0c75854cc1
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
...
Conflicts:
src/mesa/main/version.h
2009-12-02 14:52:51 +01:00
Alex Deucher
2b5618fc5b
r200: fix polygon stipple
...
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
2009-12-03 11:20:40 -05:00
Vinson Lee
c3b7f93e02
scons: Add Mac OS to target platform list.
...
(cherry picked from commit 2c307c7750 )
2009-12-02 20:33:32 -08:00
Vinson Lee
235c0c8134
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
...
(cherry picked from commit b98db7bf69 )
2009-12-02 20:28:54 -08:00
Vinson Lee
0a107d36c2
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
...
(cherry picked from commit 4b3ec2acf2 )
2009-12-02 20:20:12 -08:00
Vinson Lee
b094683e7c
progs/glsl: Fix noise GLSL compilation error on Mac OS.
...
(cherry picked from commit 0d31990b47 )
2009-12-02 20:16:51 -08:00
Vinson Lee
592c8522a2
demos/glsl: Add missing break statement to noise test.
...
(cherry picked from commit 7dfea5c072 )
2009-12-02 20:16:41 -08:00
Vinson Lee
8f4d3613da
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
...
(cherry picked from commit d4dc2e30da )
2009-12-02 20:06:20 -08:00
Vinson Lee
9ed77d12b1
progs/glsl: Add missing break statement in multinoise.c.
...
(cherry picked from commit 43080e40aa )
2009-12-02 20:06:11 -08:00
Vinson Lee
832593772d
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
...
(cherry picked from commit 04442841fb )
2009-12-02 19:55:48 -08:00
Vinson Lee
2a5cd95e24
progs/glsl: Include local headers before installed headers during compilation.
...
Fixes compilation errors on platforms with insufficient older installed
GL headers.
(cherry picked from commit d17af7d1e1 )
2009-12-02 19:39:25 -08:00
Brian Paul
ccea09cd3a
progs/glsl: minor Makefile clean-ups
...
(cherry picked from commit 4df2f7af5e )
2009-12-02 19:39:11 -08:00
Eric Anholt
4598942b1b
intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers.
2009-12-02 16:19:37 -08:00
Eric Anholt
db352f58fa
mesa: Fix bad conversion in AL1616_REV texstore.
2009-12-02 16:19:36 -08:00
Eric Anholt
b47f7316da
mesa: Fix copy'n'paste problem in al1616 texel fetch.
2009-12-02 16:19:36 -08:00
Vinson Lee
67a0628ab2
progs: Ignore Mac OS dSYM directories.
...
(cherry picked from commit a420056750 )
2009-12-02 15:22:34 -08:00
Brian Paul
908a3e56cc
cell: added tex_usage param to xm_surface_buffer_create()
2009-12-02 09:31:26 -07:00
Brian Paul
09325b9ff4
mesa: added comment for target_enum_to_index()
2009-12-01 12:28:25 -07:00
Brian Paul
e0399fddf2
softpipe: setup machine->Face without a conditional
2009-12-01 12:25:13 -07:00
Brian Paul
ba97b98842
progs/demos: remove unused glFogCoordPointer_ext var
2009-12-01 12:23:07 -07:00
Tom Fogal
b9f4a0bd2b
Simplify hackery added to fix AIX build.
...
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
2009-12-01 10:27:27 -08:00
Ian Romanick
d8da270a2b
intel: Remove GL_NV_point_sprite from extension list
...
i830 does not (and cannot!) support the any of the non-default
GL_POINT_SPRITE_R_MODE_NV settings. i915 and i965 could, but
currently do not. In both cases it would require mucking about with
the fragment shader.
2009-12-01 10:25:44 -08:00
Jakob Bornecrantz
77ff3a5619
vmware/xorg: Add video support
...
By using the hooks st/xorg provides us we can create a driver
specific implementation that uses the svga overlay engines.
2009-12-01 17:29:42 +01:00
Jakob Bornecrantz
64102a5625
vmware/xorg: Create a small driver that sits ontop of st/xorg
2009-12-01 17:29:42 +01:00
Jakob Bornecrantz
bb80a93c9e
st/xorg: Create winsys hooks that we call into
2009-12-01 17:29:41 +01:00
Jakob Bornecrantz
232e59ca6f
vmware/core: Update vmwgfx_drm.h to latest version
2009-12-01 17:29:41 +01:00
Jakob Bornecrantz
9077ddaa25
svga: Add header files for overlay support
2009-12-01 17:29:40 +01:00
Eric Anholt
a7e4a311e9
intel: Fix more front-buffer rendering after Brian's less flushing patch.
...
bcbfda71b0 left out many blit paths.
This fixes up more of them to get Blender to work again.
Bug #25030 .
2009-12-02 11:58:57 -08:00
José Fonseca
b2581dcab4
wgl: Call st_swapbuffers instead of st_notify_swapbuffers.
...
This will get single buffer, double buffer, and
joint single/double buffer (typical in CAD applications) done right,
at least as far as the frambuffer is concerned.
There are still problems with multiple contexts using the same
framebuffer because st_framebuffer_* calls assume the framebuffer
is bound to a single context.
2009-12-02 17:05:20 +00:00
Dave Airlie
e84dddde9b
Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode"
...
This reverts commit 286bf89e5a .
This doesn't appear to be correct, regression so revert it.
http://bugs.freedesktop.org/show_bug.cgi?id=25193
2009-12-02 11:03:22 +10:00
Brian Paul
c8cdce6657
vbo: make flush recursion check code per-context
...
This fixes invalid failed assertions when running multi-threaded apps.
2009-12-01 13:27:32 -07:00
Brian Paul
8c26cefec7
st/mesa: updated emit_swz() comment
2009-12-01 12:23:28 -07:00
Keith Whitwell
574715d836
tgsi: fix ureg emit after version token change
2009-12-01 15:01:00 +00:00
Keith Whitwell
b7f94c9002
st/xorg: fix merge droppings
...
These were stranded in emacs and not saved before committing.
2009-12-01 14:54:32 +00:00