Ben Skeggs
f9345c7c4e
nouveau: misc NV40 fixes
2007-01-30 16:49:27 +11:00
Ben Skeggs
d2c4d9ff9b
nouveau: NV40 glClipPlane support.
2007-01-30 16:41:55 +11:00
Ben Skeggs
ede8017d2c
nouveau: rework shader param handling
...
Conflicts:
src/mesa/drivers/dri/nouveau/nouveau_shader_0.c
2007-01-30 16:41:20 +11:00
Ben Skeggs
de0cf18b09
nouveau: oops, build attrib map after we know how the final shader will look..
2007-01-30 16:39:31 +11:00
Ben Skeggs
2d8b316109
nouveau: remove an unused table
2007-01-30 16:39:05 +11:00
Ben Skeggs
7fbf8d3324
nouveau: oops
2007-01-30 16:38:46 +11:00
Ben Skeggs
cafbc459f5
nouveau: maintain a map of which vtxprog input corresponds to which array
2007-01-30 16:38:30 +11:00
Ben Skeggs
0c5b42a991
nouveau: unhardcode some more NV30TCL_FP_CONTROL values
2007-01-30 16:03:13 +11:00
Matthieu Castet
aa397fe472
nouveau : NOUVEAU_RING_TRACE
...
allow to print what we are really sending to the fifo.
2007-01-29 23:26:35 +01:00
Matthieu Castet
c97540065c
nouveau : nv10 comment icomplete command
2007-01-29 23:19:12 +01:00
Matthieu Castet
c7c0a6ddcd
nouveau : nv10 mixing cached stuff with not cached stuff is bad.
2007-01-28 23:26:21 +01:00
Ben Skeggs
b0e86b2dbd
nouveau: fix nv30 line width
2007-01-28 22:55:35 +11:00
Ben Skeggs
aacea52181
nouveau: initial GL_ARB_occlusion_query support
...
Only enabled on NV40, NV20/NV30 code is untested.. However, NV30
should be identical to NV40.
2007-01-28 17:02:40 +11:00
Ben Skeggs
1879069eab
nouveau: extend notifier interface to allow multiple notifiers in a memory block.
2007-01-28 16:35:32 +11:00
Claudio Ciccani
ea55de3d65
Updated copyright header.
...
Switched to LGPL (GPL header was a cut-&-paste mistake).
2007-01-27 19:32:05 +01:00
George Sapountzis
c00169fd25
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.
2007-01-27 09:12:57 +02:00
Brian
d8df84aae1
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-01-26 19:08:58 -07:00
Brian
1b62353dd8
fix typo
2007-01-26 19:08:34 -07:00
Stephane Marchesin
0931e21eb6
nouveau: more work on nv04, this time buffer format/pitches/...
2007-01-27 03:08:01 +01:00
Brian
99c9bc386f
document, re-indent _mesa_ffsll()
2007-01-26 19:01:55 -07:00
Brian
1d74e565db
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
2007-01-26 18:55:12 -07:00
Eric Anholt
5a3d985395
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.
2007-01-26 14:23:29 -08:00
Eric Anholt
869b8ad499
Add _mesa_ffsll() for compatibility on OSes without ffsll(), and use it.
2007-01-26 14:18:24 -08:00
Eric Anholt
dbb54b234c
Remove dead code causing a warning.
2007-01-26 14:18:24 -08:00
George Sapountzis
507167d7e2
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.
2007-01-26 18:31:44 +02:00
George Sapountzis
c9b33ecd7c
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.
2007-01-26 18:31:00 +02:00
Zou Nan hai
c6c65e7b22
Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
2007-01-26 07:05:02 +08:00
Zou Nan hai
6aa62ba43f
ARB_Occlusion_query should support multiple query at same time
2007-01-26 07:04:15 +08:00
Ben Skeggs
d5db167c2c
nouveau: unbreak NOUVEAU_RING_DEBUG
2007-01-25 15:12:49 +11:00
Ben Skeggs
86996dfe32
nouveau: add result scaling to shader backend, use it in RSQ emul for NV40.
2007-01-25 13:40:51 +11:00
Ben Skeggs
2d7687865e
nouveau: and here's the "oops, I suck" commit :)
2007-01-25 12:08:49 +11:00
Ben Skeggs
42bd32dad7
nouveau: some extra debug output
2007-01-25 11:56:45 +11:00
Zou Nan hai
844e5610de
965 glxswapcontrol fix
2007-01-24 16:07:43 +08:00
Zou Nan hai
bdc5394d22
965 ARB_Occlusion_query fix
2007-01-24 15:47:15 +08:00
Brian
7e85b0a025
silence C++ warnings
2007-01-23 12:50:08 -07:00
Brian
18d1fdebeb
fixes for C++ warnings/errors
2007-01-23 11:46:02 -07:00
Thomas Hellstrom
d46093b8d5
i915tex: Relocation fixes:
...
Increase the number of allowed relocations per batchbuffer.
Fix an assert to avoid an array index overflow.
(Reported by Steve Wilkins)
2007-01-23 09:06:21 +01:00
Thomas Hellstrom
fe9fef2cec
i915tex: Fix randr resizing. Rotation still broken.
2007-01-23 09:06:21 +01:00
Ben Skeggs
60c28739aa
nouveau: DPH and CMP for NV40 which doesn't do it natively.
2007-01-23 16:25:25 +11:00
Ben Skeggs
cf33bcf0b2
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
2007-01-23 16:07:12 +11:00
Ben Skeggs
a8b9d13f74
nouveau: fill in condition info for instructions
2007-01-23 13:36:45 +11:00
Ben Skeggs
ed69205684
nouveau: unbreak nv40
2007-01-23 11:06:16 +11:00
Ben Skeggs
50227f6fd2
nouveau: reindent shader pass0/pass2
...
if this gets rejected by the commit list, just ignore it..
nothing interesting to see here :)
2007-01-23 10:54:54 +11:00
Ben Skeggs
c3ac270996
nouveau: start converting shaders into a tree format again..
...
No branching stuff implemented yet. Works enough for gears, probably
other stuff broken.
2007-01-23 10:54:54 +11:00
Jeremy Kolb
95fc270b06
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
2007-01-21 20:47:10 -05:00
Jeremy Kolb
ea441355d3
nouveau: Fixes for nv30.
2007-01-21 20:30:31 -05:00
Stephane Marchesin
d1f0a55af4
nouveau: fix some bugs in the nv10 swtcl.
2007-01-22 00:12:05 +01:00
Stephane Marchesin
3c0961d299
nouveau: add nv04 state support, and small nv04 fixes.
2007-01-21 04:06:57 +01:00
Ben Skeggs
4f800c5bac
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 :)
2007-01-21 09:48:33 +11:00
Ben Skeggs
029b81742a
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.
2007-01-21 09:31:00 +11:00
