OSDN Git Service
Jakob Bornecrantz [Wed, 2 Dec 2009 13:52:51 +0000 (14:52 +0100)]
Merge commit 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
src/mesa/main/version.h
Alex Deucher [Thu, 3 Dec 2009 16:20:40 +0000 (11:20 -0500)]
r200: fix polygon stipple
fixes fdo bug 25354
Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
Vinson Lee [Tue, 8 Sep 2009 11:31:42 +0000 (12:31 +0100)]
scons: Add Mac OS to target platform list.
(cherry picked from commit
2c307c775018e5b9680de8022ddf0ce3b6f560be)
Vinson Lee [Fri, 20 Nov 2009 07:56:07 +0000 (23:56 -0800)]
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
(cherry picked from commit
b98db7bf697c3ed6e6df303e9dd66f7ac31eb3e2)
Vinson Lee [Wed, 18 Nov 2009 22:02:20 +0000 (14:02 -0800)]
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
(cherry picked from commit
4b3ec2acf2cc2830b0907e4fb4db8bd1ff4a18e3)
Vinson Lee [Wed, 18 Nov 2009 21:50:49 +0000 (13:50 -0800)]
progs/glsl: Fix noise GLSL compilation error on Mac OS.
(cherry picked from commit
0d31990b4742eccdf6ae6a3b3e16c81cc863085d)
Vinson Lee [Thu, 12 Nov 2009 01:39:58 +0000 (17:39 -0800)]
demos/glsl: Add missing break statement to noise test.
(cherry picked from commit
7dfea5c0722e9da101805c15b9dd26352816bca9)
Vinson Lee [Wed, 18 Nov 2009 20:49:31 +0000 (12:49 -0800)]
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
(cherry picked from commit
d4dc2e30dada1be425e95ba270920db6eb210982)
Vinson Lee [Fri, 13 Nov 2009 00:20:23 +0000 (16:20 -0800)]
progs/glsl: Add missing break statement in multinoise.c.
(cherry picked from commit
43080e40aa0d34423e10f1d50aad15289b2b9aec)
Vinson Lee [Wed, 18 Nov 2009 07:15:25 +0000 (23:15 -0800)]
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
(cherry picked from commit
04442841fb7e9138eb50ff692952ad7e8c3877d8)
Vinson Lee [Mon, 21 Sep 2009 14:44:53 +0000 (08:44 -0600)]
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
d17af7d1e19e637e29db47bd8f6e3e579760c530)
Brian Paul [Wed, 16 Sep 2009 21:49:33 +0000 (15:49 -0600)]
progs/glsl: minor Makefile clean-ups
(cherry picked from commit
4df2f7af5e9b2c00ead92fe0ae49ed8491aef1d0)
Eric Anholt [Wed, 2 Dec 2009 21:00:15 +0000 (13:00 -0800)]
intel: Make RGB renderbuffers use XRGB8888 like we do for RGB system buffers.
Eric Anholt [Wed, 2 Dec 2009 20:42:36 +0000 (12:42 -0800)]
mesa: Fix bad conversion in AL1616_REV texstore.
Eric Anholt [Wed, 2 Dec 2009 20:15:46 +0000 (12:15 -0800)]
mesa: Fix copy'n'paste problem in al1616 texel fetch.
Vinson Lee [Sun, 15 Nov 2009 05:36:18 +0000 (21:36 -0800)]
progs: Ignore Mac OS dSYM directories.
(cherry picked from commit
a420056750908f7c2f9a7c18b3ab20f04e49711d)
Brian Paul [Wed, 2 Dec 2009 16:31:26 +0000 (09:31 -0700)]
cell: added tex_usage param to xm_surface_buffer_create()
Brian Paul [Mon, 30 Nov 2009 16:54:27 +0000 (09:54 -0700)]
progs/demos: remove unused glFogCoordPointer_ext var
Tom Fogal [Tue, 24 Nov 2009 23:46:31 +0000 (16:46 -0700)]
Simplify hackery added to fix AIX build.
Borrow an idiom from the GNU build system which can handle `for'
loops over empty lists.
Ian Romanick [Tue, 24 Nov 2009 19:59:23 +0000 (11:59 -0800)]
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.
Jakob Bornecrantz [Tue, 1 Dec 2009 16:13:41 +0000 (17:13 +0100)]
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.
Jakob Bornecrantz [Tue, 24 Nov 2009 22:51:05 +0000 (23:51 +0100)]
vmware/xorg: Create a small driver that sits ontop of st/xorg
Jakob Bornecrantz [Tue, 24 Nov 2009 21:55:24 +0000 (22:55 +0100)]
st/xorg: Create winsys hooks that we call into
Jakob Bornecrantz [Tue, 1 Dec 2009 16:00:43 +0000 (17:00 +0100)]
vmware/core: Update vmwgfx_drm.h to latest version
Jakob Bornecrantz [Tue, 24 Nov 2009 23:33:43 +0000 (00:33 +0100)]
svga: Add header files for overlay support
Eric Anholt [Wed, 2 Dec 2009 19:56:18 +0000 (11:56 -0800)]
intel: Fix more front-buffer rendering after Brian's less flushing patch.
bcbfda71b03303d3f008a6f3cf8cb7d9667bf8d2 left out many blit paths.
This fixes up more of them to get Blender to work again.
Bug #25030.
José Fonseca [Wed, 2 Dec 2009 17:05:20 +0000 (17:05 +0000)]
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.
Dave Airlie [Wed, 2 Dec 2009 01:01:19 +0000 (11:01 +1000)]
Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode"
This reverts commit
286bf89e5a1fc931dbf523ded861b809859485e2.
This doesn't appear to be correct, regression so revert it.
http://bugs.freedesktop.org/show_bug.cgi?id=25193
Brian Paul [Tue, 1 Dec 2009 20:26:15 +0000 (13:26 -0700)]
vbo: make flush recursion check code per-context
This fixes invalid failed assertions when running multi-threaded apps.
Brian Paul [Mon, 30 Nov 2009 15:41:37 +0000 (08:41 -0700)]
st/mesa: updated emit_swz() comment
Ian Romanick [Tue, 1 Dec 2009 01:56:07 +0000 (17:56 -0800)]
mesa: set version string to 7.7-rc1
Ian Romanick [Tue, 1 Dec 2009 01:55:21 +0000 (17:55 -0800)]
mesa: set version string to 7.6.1-rc2
Ian Romanick [Tue, 1 Dec 2009 01:47:07 +0000 (17:47 -0800)]
Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
progs/util/shaderutil.c
src/mesa/drivers/dri/r600/r600_context.c
src/mesa/main/version.h
Ian Romanick [Mon, 30 Nov 2009 20:43:12 +0000 (12:43 -0800)]
i915: Actually put i915PointParameterfv in the driver function table. Duh.
Vinson Lee [Mon, 30 Nov 2009 02:17:44 +0000 (21:17 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
Ian Romanick [Mon, 30 Nov 2009 01:49:55 +0000 (17:49 -0800)]
i915: Fallback bit define missed on previous commit
Ian Romanick [Mon, 30 Nov 2009 01:43:38 +0000 (17:43 -0800)]
i915: Round point sizes instead of truncate.
Ian Romanick [Mon, 30 Nov 2009 01:40:02 +0000 (17:40 -0800)]
i915: Enable point sprite coordinate generation
Support still isn't completely correct, but it's better. piglit
point-sprite now passes. However, glean's pointSprite test fails. In
that test the texture on the sprite is somehow inverted as though
GL_POINT_SPRITE_COORD_ORIGIN were set to GL_LOWER_LEFT. i915 hardware
shouldn't be able to do that!
I believe there are also problems when not all texture units have
GL_COORD_REPLACE set. The hardware enable seems to be all or nothing.
Fixes bug #25313.
Vinson Lee [Sun, 29 Nov 2009 23:18:23 +0000 (18:18 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameteri, which uses the params
argument as an array.
Maciej Cencora [Sun, 29 Nov 2009 14:40:13 +0000 (15:40 +0100)]
radeon: update miptree code a little
Simplify gl image level <-> miptree level mapping (are equal now).
Don't allocate miptree for images that won't fit in it (fixes #25230).
Maciej Cencora [Sun, 29 Nov 2009 11:36:09 +0000 (12:36 +0100)]
radeon: don't check the same miptree many times when looking for matching miptrees
Maciej Cencora [Sun, 29 Nov 2009 11:27:29 +0000 (12:27 +0100)]
radeon: add some debugging info
Vinson Lee [Sun, 29 Nov 2009 05:50:48 +0000 (00:50 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexGenf.
_mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument
as an array.
Vinson Lee [Sun, 29 Nov 2009 04:47:23 +0000 (23:47 -0500)]
mesa: Fix array out-of-bounds access by _mesa_TexGeni.
_mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument
as an array.
Vinson Lee [Sun, 29 Nov 2009 04:22:31 +0000 (23:22 -0500)]
dri: Fix potential null pointer dereference in driBindContext.
Vinson Lee [Sun, 29 Nov 2009 03:04:06 +0000 (22:04 -0500)]
mesa: Fix array out-of-bounds access in _mesa_TexEnvf.
_mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument
as an array.
Maciej Cencora [Sat, 28 Nov 2009 20:31:24 +0000 (21:31 +0100)]
radeon: need to flush cs when moving images between mipmap trees
José Fonseca [Fri, 27 Nov 2009 16:01:36 +0000 (16:01 +0000)]
scons: Promote pointer arithmetic to error.
All code covered by scons is being built on multiple OSes, so pointer
arithmetic must really be addressed when spotted.
José Fonseca [Fri, 27 Nov 2009 16:01:11 +0000 (16:01 +0000)]
configs: Warn about pointer arithmetic.
It's not portable. Warn to help catching it early.
José Fonseca [Fri, 27 Nov 2009 15:58:02 +0000 (15:58 +0000)]
mesa: Avoid void pointer arithmetic.
Keith Whitwell [Fri, 27 Nov 2009 15:28:46 +0000 (15:28 +0000)]
st/xorg: proper fix for compositing after rounding up
Basically don't round up shared textures. This fixes compiz,
but I'm afraid that rounding up texture sizes here in the driver
is doomed, as it will inevitably break texture wrap modes.
José Fonseca [Fri, 27 Nov 2009 14:55:20 +0000 (14:55 +0000)]
rbug: Mention where the GUI can be found.
José Fonseca [Fri, 27 Nov 2009 13:59:37 +0000 (13:59 +0000)]
svga: Re-add shader dumping.
Keith Whitwell [Fri, 27 Nov 2009 14:03:10 +0000 (14:03 +0000)]
Revert "st/xorg: fix composite after texture size changes"
This reverts commit
124ae596806f1a77af46f1f0e446d448da6e953a.
Pushed by mistake
Keith Whitwell [Fri, 27 Nov 2009 13:59:00 +0000 (13:59 +0000)]
st/xorg: fix composite after texture size changes
José Fonseca [Wed, 11 Nov 2009 00:56:43 +0000 (16:56 -0800)]
wgl: Fix copy'n'paste typo in comment.
José Fonseca [Sun, 15 Nov 2009 20:14:03 +0000 (12:14 -0800)]
svga: Handle comment tokens when dumping.
José Fonseca [Tue, 24 Nov 2009 14:43:30 +0000 (14:43 +0000)]
svga: Use consistent names for public symbol names of shader dumping facilities.
José Fonseca [Tue, 24 Nov 2009 14:37:45 +0000 (14:37 +0000)]
svga: Use consistent file names for dumping facilities.
Keith Whitwell [Fri, 27 Nov 2009 12:24:42 +0000 (12:24 +0000)]
st/xorg: speculatively round textures up to nearest POT
I'm not sure if this is a great change, but helps with caching.
Probably we want to turn this on/off on a driver-by-driver basis.
Keith Whitwell [Fri, 27 Nov 2009 12:22:43 +0000 (12:22 +0000)]
st/xorg: free last fence
Keith Whitwell [Fri, 27 Nov 2009 12:19:28 +0000 (12:19 +0000)]
svga: flush our command buffer after the 8th distinct render target
This helps improve the surface cache behaviour in the face of the
large number of single-use render targets generated by EXA and the xorg
state tracker. Without this we can reference hundreds of individual
render targets from a command buffer, which leaves little scope for
sharing or reuse of those targets.
Flushing early means we can start reusing textures much sooner.
This shouldn't have much effect on normal 3d rendering as it's pretty
rare to have a command buffer with >8 different render targets in that
world.
Keith Whitwell [Fri, 27 Nov 2009 12:18:22 +0000 (12:18 +0000)]
svga: add DEBUG_CACHE option
Vinson Lee [Fri, 27 Nov 2009 04:02:49 +0000 (23:02 -0500)]
svga: Prevent potential null pointer dereference in vmw_surface.c.
Ian Romanick [Thu, 26 Nov 2009 00:31:28 +0000 (16:31 -0800)]
Improve implementation of GL_POINT_SPRITE_COORD_ORIGIN errors
This enum is only supported for OpenGL 2.0. If a driver supports
OpenGL 1.4 and GL_ARB_point_sprite, using this enum should generate an
error. This is important because, for example, i915 and i830 can
support GL_ARB_point_sprite, but they cannot support
GL_POINT_SPRITE_COORD_ORIGIN.
This commit just removes the check for NV_point_sprite, which is
completely wrong, and add some comments describing what the code
should do. I don't see an easy way to check for version >= 2.0 from
inside Mesa. Perhaps we should add an extension
GL_MESA_point_sprite_20 (like Intel's old GL_EXT_packed_pixels_12) to
indicate that this added bit of functionality is available.
Also note that glean's pointSprite test only checks for
GL_ARB_point_sprite before trying to use
GL_POINT_SPRITE_COORD_ORIGIN. Naturally, that fails on
non-2.0 implementations (i.e., Mac OS X on GMA 950).
Dave Airlie [Wed, 25 Nov 2009 10:23:22 +0000 (20:23 +1000)]
radeon: fix context destroy needing lock for flushing.
Thanks to Intel code which I've just stolen pretty much as usual.
This fixes fdo bug 22851 which is a dri1 regression since rewrite.
Tested by: fpiobaf (Fabio) on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
Jakob Bornecrantz [Tue, 24 Nov 2009 21:54:00 +0000 (22:54 +0100)]
vmware/xorg: Remove gem include
Michel Dänzer [Thu, 26 Nov 2009 15:46:13 +0000 (16:46 +0100)]
st/xorg: Use pipe clear hook for solid fills of whole pixmaps.
Can give a little boost e.g. for anti-aliased text rendering.
Keith Whitwell [Thu, 26 Nov 2009 15:25:09 +0000 (15:25 +0000)]
svga: hash the whole key, not just the first four bytes
Michel Dänzer [Thu, 26 Nov 2009 15:00:06 +0000 (16:00 +0100)]
st/xorg: Make sure DRI2 blits use GPU copy contents even for software fallback.
Fixes 3D apps not updating with a non-GL compositing manager and Option
"2DAccel" "off".
Also clean up a little pixmap vs. drawable mess.
Keith Whitwell [Thu, 26 Nov 2009 14:23:24 +0000 (14:23 +0000)]
st/xorg: fix refcounting bugs introduced in earlier commit
Keith Whitwell [Thu, 26 Nov 2009 14:23:07 +0000 (14:23 +0000)]
st/xorg: formatting
This directory needs indent run over it.
Keith Whitwell [Thu, 26 Nov 2009 12:52:45 +0000 (12:52 +0000)]
st/xorg: remove debugging flush
Accidentally committed in
7fbdbad5c02e3d5bfbf0e641e2aec224e39fa974
('st/xorg: consolidate some dest surface state setting')
José Fonseca [Thu, 26 Nov 2009 12:02:14 +0000 (12:02 +0000)]
svga: Remove spurious argument to SVGA_DBG.
Keith Whitwell [Thu, 26 Nov 2009 11:55:47 +0000 (11:55 +0000)]
st/xorg: render throttling in block handler
Similar to the classic swapbuffer throttling in GL drivers, put an
upper bound on the number of outstanding chunks of rendering the state
tracker can generate -- where calling the block handler denotes a
chunk.
Currently that number is set at around 4 "chunks", but could be
tweaked up or down. If a better measure for the amount of outstanding
rendering is found, that would be fine too.
As it stands, this improves interactivity by preventing the X server
from queueing up arbitary amounts of rendering.
Keith Whitwell [Thu, 26 Nov 2009 11:17:06 +0000 (11:17 +0000)]
st/xorg: split copy operation into prepare/copy/done phases
Any high-overhead one-off tasks are moved into the prepare hook.
Keith Whitwell [Thu, 26 Nov 2009 10:40:40 +0000 (10:40 +0000)]
st/xorg: don't set up constant buffer for non-xv fragment shaders
These currently don't reference any constants. Can add this back
if newer shaders need them, but in the meantime don't create
a new constant buffer every time we do a blit.
Keith Whitwell [Thu, 26 Nov 2009 10:34:28 +0000 (10:34 +0000)]
st/xorg: split up shared Done call
The two users of composite (Composite and Solid) now call a new
xorg_composite_done() from their Done functions, while CopyDone
is directly implemented on top of xorg_renderer.c.
Keith Whitwell [Thu, 26 Nov 2009 10:15:01 +0000 (10:15 +0000)]
st/xorg: set up rasterizer state in init
Keith Whitwell [Wed, 25 Nov 2009 18:45:20 +0000 (18:45 +0000)]
st/xorg: remove redundant clipping code
Keith Whitwell [Wed, 25 Nov 2009 18:42:54 +0000 (18:42 +0000)]
st/xorg: don't bother with cso save and restore in copy func
Keith Whitwell [Wed, 25 Nov 2009 18:41:11 +0000 (18:41 +0000)]
st/xorg: consolidate some dest surface state setting
Vinson Lee [Thu, 26 Nov 2009 05:35:31 +0000 (00:35 -0500)]
glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore.
Jakob Bornecrantz [Tue, 24 Nov 2009 18:20:59 +0000 (19:20 +0100)]
vmware/xorg: Link against libkms
If the system doesn't have libkms installed it wont try to link against it.
Jakob Bornecrantz [Tue, 24 Nov 2009 18:16:37 +0000 (19:16 +0100)]
vmware/xorg: Clean Makefile a bit
Jakob Bornecrantz [Tue, 24 Nov 2009 17:47:15 +0000 (18:47 +0100)]
vmware/xorg: Don't link against libdrm_intel
Jakob Bornecrantz [Tue, 24 Nov 2009 17:44:39 +0000 (18:44 +0100)]
vmware/xorg: Stage driver in lib/gallium
Jakob Bornecrantz [Tue, 24 Nov 2009 13:53:03 +0000 (14:53 +0100)]
st/xorg: Pass mode types from the kernel to X
Jakob Bornecrantz [Tue, 24 Nov 2009 11:47:38 +0000 (12:47 +0100)]
st/xorg: Add libkms integration
Jakob Bornecrantz [Tue, 24 Nov 2009 01:49:57 +0000 (02:49 +0100)]
st/xorg: Touch up xorg_crtc.c
Jakob Bornecrantz [Tue, 24 Nov 2009 03:19:07 +0000 (04:19 +0100)]
st/xorg: Rename driver functions
Jakob Bornecrantz [Tue, 24 Nov 2009 01:54:24 +0000 (02:54 +0100)]
st/xorg: Rename output functions
Jakob Bornecrantz [Tue, 24 Nov 2009 01:28:09 +0000 (02:28 +0100)]
st/xorg: Rename dri2 functions
Jakob Bornecrantz [Tue, 24 Nov 2009 01:21:16 +0000 (02:21 +0100)]
st/xorg: Standardise all function names defined in xorg_tracker.h
Keith Whitwell [Wed, 25 Nov 2009 17:13:04 +0000 (17:13 +0000)]
svga: try harder to make the cachable flag work
It doesn't though.
Zack Rusin [Mon, 23 Nov 2009 06:00:34 +0000 (01:00 -0500)]
st/xorg: accelerate src luminance
Zack Rusin [Sun, 22 Nov 2009 20:21:14 +0000 (15:21 -0500)]
util: also print out memory statistics
Keith Whitwell [Wed, 25 Nov 2009 11:44:41 +0000 (11:44 +0000)]
svga: revert packing of surface key
Over-ambitious packing of values broke my cursor.
Dave Airlie [Wed, 25 Nov 2009 10:23:22 +0000 (20:23 +1000)]
radeon: fix context destroy needing lock for flushing.
Thanks to Intel code which I've just stolen pretty much as usual.
This fixes fdo bug 22851 which is a dri1 regression since rewrite.
Tested by: fpiobaf (Fabio) on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>
Vinson Lee [Wed, 25 Nov 2009 05:39:37 +0000 (00:39 -0500)]
glu/sgi: Fix memory leak in gluBuild1DMipmapLevelsCore.