Brian [Tue, 30 Jan 2007 15:11:50 +0000 (08:11 -0700)]
bump version to 6.5.3
Brian [Tue, 30 Jan 2007 15:10:03 +0000 (08:10 -0700)]
s/params/pointer/ for glGetVertexAttribPointer
Brian [Tue, 30 Jan 2007 15:09:25 +0000 (08:09 -0700)]
s/params/pointer/ for glGetVertexAttribPointer
Brian [Tue, 30 Jan 2007 15:02:20 +0000 (08:02 -0700)]
s/params/pointer/ for glGetVertexAttribPointer
Ben Skeggs [Tue, 30 Jan 2007 05:51:50 +0000 (16:51 +1100)]
nouveau: argh
Ben Skeggs [Tue, 30 Jan 2007 05:49:27 +0000 (16:49 +1100)]
nouveau: misc NV40 fixes
Ben Skeggs [Tue, 30 Jan 2007 05:00:20 +0000 (16:00 +1100)]
nouveau: NV40 glClipPlane support.
Ben Skeggs [Tue, 30 Jan 2007 01:33:00 +0000 (12:33 +1100)]
nouveau: rework shader param handling
Conflicts:
src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
Ben Skeggs [Mon, 29 Jan 2007 06:08:45 +0000 (17:08 +1100)]
nouveau: oops, build attrib map after we know how the final shader will look..
Ben Skeggs [Sat, 27 Jan 2007 07:54:42 +0000 (18:54 +1100)]
nouveau: remove an unused table
Ben Skeggs [Sat, 27 Jan 2007 07:51:19 +0000 (18:51 +1100)]
nouveau: oops
Ben Skeggs [Sat, 27 Jan 2007 07:36:01 +0000 (18:36 +1100)]
nouveau: maintain a map of which vtxprog input corresponds to which array
Ben Skeggs [Mon, 29 Jan 2007 05:39:19 +0000 (16:39 +1100)]
nouveau: unhardcode some more NV30TCL_FP_CONTROL values
Matthieu Castet [Mon, 29 Jan 2007 22:26:35 +0000 (23:26 +0100)]
nouveau : NOUVEAU_RING_TRACE
allow to print what we are really sending to the fifo.
Matthieu Castet [Mon, 29 Jan 2007 22:19:12 +0000 (23:19 +0100)]
nouveau : nv10 comment icomplete command
Matthieu Castet [Sun, 28 Jan 2007 22:26:21 +0000 (23:26 +0100)]
nouveau : nv10 mixing cached stuff with not cached stuff is bad.
Ben Skeggs [Sun, 28 Jan 2007 11:55:35 +0000 (22:55 +1100)]
nouveau: fix nv30 line width
Ben Skeggs [Sun, 28 Jan 2007 06:02:40 +0000 (17:02 +1100)]
nouveau: initial GL_ARB_occlusion_query support
Only enabled on NV40, NV20/NV30 code is untested.. However, NV30
should be identical to NV40.
Ben Skeggs [Sun, 28 Jan 2007 05:35:32 +0000 (16:35 +1100)]
nouveau: extend notifier interface to allow multiple notifiers in a memory block.
Claudio Ciccani [Sat, 27 Jan 2007 18:32:05 +0000 (19:32 +0100)]
Updated copyright header.
Switched to LGPL (GPL header was a cut-&-paste mistake).
Brian [Sat, 27 Jan 2007 13:25:31 +0000 (06:25 -0700)]
note that non-member posts are auto-rejected
George Sapountzis [Sat, 27 Jan 2007 06:16:10 +0000 (08:16 +0200)]
Bug 9628: no entry for GetVertexAttribPointerv
This is because (in glX_API.xml) GetVertexAttribPointerv is aliased to
GetVertexAttribPointervARB which is then aliased to GetVertexAttribPointervNV.
Make GetVertexAttribPointerv alias GetVertexAttribPointervNV directly. Patch
by Ian Romanick <idr@us.ibm.com> and regenerate.
Brian [Sat, 27 Jan 2007 02:08:58 +0000 (19:08 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Sat, 27 Jan 2007 02:08:34 +0000 (19:08 -0700)]
fix typo
Stephane Marchesin [Sat, 27 Jan 2007 02:03:25 +0000 (03:03 +0100)]
nouveau: more work on nv04, this time buffer format/pitches/...
Brian [Sat, 27 Jan 2007 02:01:55 +0000 (19:01 -0700)]
document, re-indent _mesa_ffsll()
Brian [Sat, 27 Jan 2007 01:55:12 +0000 (18:55 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Eric Anholt [Sun, 21 Jan 2007 02:09:32 +0000 (18:09 -0800)]
Bug #9604: Fix a static buffer allocation failure.
The pool that the static buffer got allocated from was sized by pitch * height,
but the buffer generated from it had its size aligned to a tile boundary, so
allocation failed if pitch * height wasn't aligned. However, the 2d driver
ensures that the size ends at a tile boundary, so just pass the 2d driver's
buffer size rather than calculating it.
Eric Anholt [Sun, 21 Jan 2007 02:06:38 +0000 (18:06 -0800)]
Add _mesa_ffsll() for compatibility on OSes without ffsll(), and use it.
Eric Anholt [Sun, 21 Jan 2007 01:59:08 +0000 (17:59 -0800)]
Remove dead code causing a warning.
George Sapountzis [Wed, 6 Dec 2006 04:54:13 +0000 (06:54 +0200)]
Override Const.CheckArrayBounds for Xserver in XMesaCreateContext().
This leaves one last XFree86Server ifdef in Mesa core.
---
Bug 9285: misc glcore, xmesa cleanups
ACKed by Ian Romanick.
George Sapountzis [Wed, 6 Dec 2006 04:43:23 +0000 (06:43 +0200)]
Drop old (pre-AIGLX) GLcore interface.
The old GLcore interface was replaced in Xorg 7.1 with the addition of AIGLX,
it is only used by DDX's which are known not to work with the new DIX glx code.
---
Bug 9285: misc glcore, xmesa cleanups
ACKed by Ian Romanick.
Zou Nan hai [Thu, 25 Jan 2007 23:05:02 +0000 (07:05 +0800)]
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
Zou Nan hai [Thu, 25 Jan 2007 23:04:15 +0000 (07:04 +0800)]
ARB_Occlusion_query should support multiple query at same time
Ben Skeggs [Thu, 25 Jan 2007 04:12:49 +0000 (15:12 +1100)]
nouveau: unbreak NOUVEAU_RING_DEBUG
Ben Skeggs [Thu, 25 Jan 2007 02:40:51 +0000 (13:40 +1100)]
nouveau: add result scaling to shader backend, use it in RSQ emul for NV40.
Ben Skeggs [Thu, 25 Jan 2007 01:08:49 +0000 (12:08 +1100)]
nouveau: and here's the "oops, I suck" commit :)
Ben Skeggs [Thu, 25 Jan 2007 00:56:45 +0000 (11:56 +1100)]
nouveau: some extra debug output
Zou Nan hai [Wed, 24 Jan 2007 08:07:43 +0000 (16:07 +0800)]
965 glxswapcontrol fix
Zou Nan hai [Wed, 24 Jan 2007 07:47:15 +0000 (15:47 +0800)]
965 ARB_Occlusion_query fix
Brian [Tue, 23 Jan 2007 19:50:08 +0000 (12:50 -0700)]
silence C++ warnings
Brian [Tue, 23 Jan 2007 18:46:02 +0000 (11:46 -0700)]
fixes for C++ warnings/errors
Thomas Hellstrom [Tue, 23 Jan 2007 08:04:58 +0000 (09:04 +0100)]
i915tex: Relocation fixes:
Increase the number of allowed relocations per batchbuffer.
Fix an assert to avoid an array index overflow.
(Reported by Steve Wilkins)
Thomas Hellstrom [Tue, 23 Jan 2007 07:57:38 +0000 (08:57 +0100)]
i915tex: Fix randr resizing. Rotation still broken.
Ben Skeggs [Tue, 23 Jan 2007 05:25:25 +0000 (16:25 +1100)]
nouveau: DPH and CMP for NV40 which doesn't do it natively.
Ben Skeggs [Tue, 23 Jan 2007 05:07:12 +0000 (16:07 +1100)]
nouveau: allow for card-specific shader infos to be kept
NV30/40 fragprog: build FP_CONTROL per-shader, still some hardcoded bits for
this reg.. It looks like it has to do with the number of
temps used, but needs more looking at.
NV40 vtxprog : build VP_IN_REG/VP_OUT_REG during shader compile
Ben Skeggs [Tue, 23 Jan 2007 02:36:45 +0000 (13:36 +1100)]
nouveau: fill in condition info for instructions
Ben Skeggs [Tue, 23 Jan 2007 00:06:16 +0000 (11:06 +1100)]
nouveau: unbreak nv40
Ben Skeggs [Sun, 21 Jan 2007 06:16:39 +0000 (17:16 +1100)]
nouveau: reindent shader pass0/pass2
if this gets rejected by the commit list, just ignore it..
nothing interesting to see here :)
Ben Skeggs [Sun, 21 Jan 2007 05:45:40 +0000 (16:45 +1100)]
nouveau: start converting shaders into a tree format again..
No branching stuff implemented yet. Works enough for gears, probably
other stuff broken.
Jeremy Kolb [Mon, 22 Jan 2007 01:47:10 +0000 (20:47 -0500)]
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
Jeremy Kolb [Mon, 22 Jan 2007 01:30:31 +0000 (20:30 -0500)]
nouveau: Fixes for nv30.
Stephane Marchesin [Sun, 21 Jan 2007 23:12:05 +0000 (00:12 +0100)]
nouveau: fix some bugs in the nv10 swtcl.
Stephane Marchesin [Sun, 21 Jan 2007 03:06:57 +0000 (04:06 +0100)]
nouveau: add nv04 state support, and small nv04 fixes.
Ben Skeggs [Sat, 20 Jan 2007 22:48:33 +0000 (09:48 +1100)]
nouveau: rename pass0_arb to pass0.
I was expecting to have 2 frontends for the shader code (asm, glsl).
With Brian's work on GLSL this is unnecessary :)
Ben Skeggs [Sat, 20 Jan 2007 22:31:00 +0000 (09:31 +1100)]
nouveau: kill off shader pass1.
It sucks, and we have someone who can do a much better job than I can starting
work on it soon. alloc_temp/free_temp is left in pass2 to workaround fragprog
temps/outputs overlapping, but this all belongs in the optimiser.
Ben Skeggs [Sat, 20 Jan 2007 22:13:27 +0000 (09:13 +1100)]
nouveau: shader backend branching support for all cards that support it.
Ben Skeggs [Fri, 19 Jan 2007 04:39:36 +0000 (15:39 +1100)]
nouveau: bump drm patchlevel
Patrice Mandin [Thu, 18 Jan 2007 21:07:17 +0000 (22:07 +0100)]
nouveau: preliminary nv50 state
Aapo Tahkola [Thu, 18 Jan 2007 03:56:13 +0000 (05:56 +0200)]
support as much of GL_EXT_stencil_two_side as we can. untested.
Keith Whitwell [Wed, 17 Jan 2007 08:44:13 +0000 (08:44 +0000)]
New debug config for linux-dri
Xiang, Haihao [Wed, 17 Jan 2007 02:39:50 +0000 (10:39 +0800)]
I965: fix bug#9625-get the correct PV for quardstrip
The order of vertices in payload for quardstrip is (0, 1, 3, 2),
so the PV for quardstrip is c->reg.vertex[2].
Xiang, Haihao [Wed, 17 Jan 2007 02:17:10 +0000 (10:17 +0800)]
Fix bug#9673
Cast from pointer to unsinged long and cast to pointer from
unsinged long
Stephane Marchesin [Tue, 16 Jan 2007 20:43:54 +0000 (21:43 +0100)]
nouveau: Use the most recent card list.
Jerome Glisse [Mon, 15 Jan 2007 20:19:52 +0000 (21:19 +0100)]
mesa: Update _Current along Current on fragment program bound.
Same as a previously committed patch for vertex program, we
update fragment program ptr _Current along the Current one
so that _Current can't end up pointing to a no more valid
program.
Patrice Mandin [Mon, 15 Jan 2007 17:58:24 +0000 (18:58 +0100)]
nouveau:nv10: fix setting clip region
Stephane Marchesin [Mon, 15 Jan 2007 11:38:24 +0000 (12:38 +0100)]
nouveau: Fix a bug in the nv04 swtcl.
Ben Skeggs [Mon, 15 Jan 2007 06:28:56 +0000 (17:28 +1100)]
nouveau: Add 0x0244 pciid manually for now..
pciids.sf.net is slow to add it so our generator picks it up,
and it's *really* annoying me :)
Ben Skeggs [Mon, 15 Jan 2007 06:23:04 +0000 (17:23 +1100)]
nouveau: fail CreateScreen on unknown cards instead of guessing.
Carlos Martín Nieto [Sun, 14 Jan 2007 23:00:30 +0000 (00:00 +0100)]
nouveau: Implement much of the fog handling.
Stephane Marchesin [Sun, 14 Jan 2007 21:39:37 +0000 (22:39 +0100)]
nouveau: Update nouveau_reg.h from renouveau to the latest version.
Stephane Marchesin [Sun, 14 Jan 2007 20:17:08 +0000 (21:17 +0100)]
nouveau: Make the state cache hierarchical.
Stephane Marchesin [Sun, 14 Jan 2007 19:37:57 +0000 (20:37 +0100)]
nouveau: add the nv04 swtcl module (it's untested for now).
Stephane Marchesin [Sat, 13 Jan 2007 22:56:55 +0000 (23:56 +0100)]
nouveau: Cleanup the nv10 swtcl module.
Patrice Mandin [Sun, 14 Jan 2007 19:14:58 +0000 (20:14 +0100)]
nouveau: nv10: 16 bits color buffer format
Patrice Mandin [Sun, 14 Jan 2007 18:56:30 +0000 (19:56 +0100)]
Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/mesa
Patrice Mandin [Sun, 14 Jan 2007 18:55:45 +0000 (19:55 +0100)]
nouveau: nv10: added missing functions
Jerome Glisse [Sun, 14 Jan 2007 18:31:30 +0000 (19:31 +0100)]
r300: Fix vertex program position invariant bug, force position reading.
When we have a position invariant program we need to force routing the
position otherwise you may handle transform quite random data which might
be funny but unlikely what you want :).
Jerome Glisse [Sun, 14 Jan 2007 13:49:36 +0000 (14:49 +0100)]
mesa: Update _Current ptr along Current when a new vertex program is bind.
On new vertex program bind only the Current ptr where updated to
point to the new program; this could lead to _Current pointing to
and out of date or even a no more existing program which in turn
could lead to a segfault in some driver. To avoid this _Current
ptr is updated along Current if _Current where previously pointing
to the same program.
Patrice Mandin [Sun, 14 Jan 2007 13:11:10 +0000 (14:11 +0100)]
nouveau: remove already defined NV15_TCL and NV17_TCL
Patrice Mandin [Sun, 14 Jan 2007 13:09:04 +0000 (14:09 +0100)]
nouveau: import color material r,g,b,a
Patrice Mandin [Sun, 14 Jan 2007 13:03:42 +0000 (14:03 +0100)]
nouveau: nv10: stencil functions
Patrice Mandin [Sun, 14 Jan 2007 11:51:30 +0000 (12:51 +0100)]
nouveau: nv10: currently fails initcard and bindbuffers, till done
Patrice Mandin [Sun, 14 Jan 2007 11:45:15 +0000 (12:45 +0100)]
nouveau: nv10 blending done, remove nv10Viewport
Patrice Mandin [Sat, 13 Jan 2007 13:14:19 +0000 (14:14 +0100)]
nouveau: update nv10 state
Patrice Mandin [Sat, 13 Jan 2007 12:56:18 +0000 (13:56 +0100)]
nouveau: Add clear color for nv10
Patrice Mandin [Sat, 13 Jan 2007 12:22:03 +0000 (13:22 +0100)]
nv10 has alpha color mask
Jerome Glisse [Thu, 11 Jan 2007 11:53:06 +0000 (12:53 +0100)]
Eric Anholt [Wed, 10 Jan 2007 00:39:10 +0000 (16:39 -0800)]
Track rename of DamagePost -> DamageAdd.
Roland Scheidegger [Tue, 9 Jan 2007 13:42:22 +0000 (14:42 +0100)]
put back missing Driver.PolygonMode call (bug 9578)
Michel Dänzer [Thu, 21 Dec 2006 17:06:58 +0000 (18:06 +0100)]
i915tex: Remove unused tex_program field.
Michel Dänzer [Thu, 21 Dec 2006 16:30:00 +0000 (17:30 +0100)]
intel_finalize_mipmap_tree: Only flush batchbuffer when necessary.
Keith Packard [Mon, 8 Jan 2007 07:00:48 +0000 (23:00 -0800)]
Merge branch 'origin'
Ben Skeggs [Mon, 8 Jan 2007 00:53:45 +0000 (11:53 +1100)]
nouveau: allow the use of multiple subchannels/objects by default.
Keith Packard [Sun, 7 Jan 2007 01:13:45 +0000 (17:13 -0800)]
Various warning fixes for i965 driver.
vertex/fragment programs provided as const.
bmSetFenceLock should return bmSetFence value.
Keith Packard [Sun, 7 Jan 2007 01:13:29 +0000 (17:13 -0800)]
Initialize GL_ARB_occlusion_query only if DRM support is present.
DRM versions before 1.8 do not include the necessary ioctls to support
GL_ARB_occlusion_query, don't enable it on these versions.
Haihao Xiang [Wed, 27 Dec 2006 00:45:02 +0000 (16:45 -0800)]
i965: Support linear format in i965.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Zou Nan hai [Wed, 13 Dec 2006 07:27:17 +0000 (15:27 +0800)]
i965: xdemos/glxthreads get: Assertion `block->fenced' failed (9201)
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Zou Nan hai [Tue, 12 Dec 2006 07:00:27 +0000 (15:00 +0800)]
i965: Take clip rects into account when computing max prim
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Wang Zhenyu [Mon, 11 Dec 2006 08:01:56 +0000 (00:01 -0800)]
i965: ARB_occlusion_query support
Signed-off-by: Keith Packard <keithp@neko.keithp.com>