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
Roland Scheidegger
38e9f8b6f2
do not rebase index buffers as it does not work currently (tested with r200 and sw mesa)
2007-01-25 18:52:40 +01:00
Roland Scheidegger
78b64d911b
allocate larger minimum dstelt buffer
...
increase the minimum dstelt buffer size to avoid triggering an assertion later
because the split is triggered before the buffer is full. This fixes cases
where the vbo_split_copy path is hit because of maximum index limit, where the
dstelt buffer size needed could be very small (doom3 hit that assertion with a
vertex count of just 3)
2007-01-25 16:39:02 +01:00
Roland Scheidegger
db79d7dea0
fix dstelt memory allocation to avoid hash corruption
2007-01-25 14:32:06 +01:00
Roland Scheidegger
327462d901
remove tnl/t_vtx_x86_gcc.S file from sources as it no longer exists
2007-01-25 12:12:54 +01:00
Roland Scheidegger
5970400476
re-fix bug 9062 in vbo code
2007-01-25 12:11:03 +01: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
Ben Skeggs
ee3d0617f9
nouveau: shader backend branching support for all cards that support it.
2007-01-21 09:13:27 +11:00
Ben Skeggs
669fefd3da
nouveau: bump drm patchlevel
2007-01-19 15:39:36 +11:00
Patrice Mandin
3c59483ed7
nouveau: preliminary nv50 state
2007-01-18 22:07:17 +01:00
Aapo Tahkola
62efc4ba3e
support as much of GL_EXT_stencil_two_side as we can. untested.
2007-01-18 05:56:13 +02:00
Aapo Tahkola
feeed10dfd
typo fix. this case still fails.
2007-01-18 05:30:20 +02:00
Aapo Tahkola
a3b4b11739
Fix invalid enums passed to MapBuffer
2007-01-18 04:46:04 +02:00
Aapo Tahkola
2cb3594af9
Fix invalid enums passed to MapBuffer
2007-01-18 04:17:56 +02:00
Keith Whitwell
3bfbe63806
New debug config for linux-dri
2007-01-17 08:44:13 +00:00
Xiang, Haihao
747c9129c0
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].
2007-01-17 10:39:50 +08:00
Xiang, Haihao
afba8f0d30
Fix bug#9673
...
Cast from pointer to unsinged long and cast to pointer from
unsinged long
2007-01-17 10:17:10 +08:00
Stephane Marchesin
7c8f311e40
nouveau: Use the most recent card list.
2007-01-16 21:43:54 +01:00
Keith Whitwell
fea6e5a695
Don't special-case index, edgeflag.
...
Remove display list opcodes for INDEX and EDGEFLAG, handle them
through the regular ATTRIB mechanism now that Mesa understands them
to just be regular attribs.
2007-01-16 13:30:04 +00:00
Keith Whitwell
c53df49b8b
Additional display list tests
2007-01-16 13:29:01 +00:00
Keith Whitwell
3ad12fab45
Merge vbo_0_1_branch
...
Hopefully leaving behind the cruft generated by the CVS import.
2007-01-16 11:24:08 +00:00
