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>
Eric Anholt [Wed, 18 Oct 2006 07:24:01 +0000 (00:24 -0700)]
i965: Avoid branch instructions while in single program flow mode.
There is an errata for Broadwater that threads don't have the instruction/loop
mask stacks initialized on thread spawn. In single program flow mode, those
stacks are not writable, so we can't initialize them. However, they do get
read during ELSE and ENDIF instructions. So, instead, replace branch
instructions in single program flow mode with predicated jumps (ADD to the ip
register), avoiding use of the more complicated branch instructions that may
fail. This is also a minor optimization as no ENDIF equivalent is necessary.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Eric Anholt [Wed, 11 Oct 2006 19:16:09 +0000 (12:16 -0700)]
i965: Connect INTEL_DEBUG=sync up to cmd/batch ioctls.
Signed-off-by: Keith Packard <keithp@neko.keithp.com>
Brian [Sat, 6 Jan 2007 21:55:07 +0000 (14:55 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Sat, 6 Jan 2007 19:58:28 +0000 (12:58 -0700)]
document 32-bit Z line/point fix
Brian [Sat, 6 Jan 2007 19:55:17 +0000 (12:55 -0700)]
Use GLuint instead of GLint to store intermediate Z values. Fixes problems when using 32-bit Z buffer.
Eric Anholt [Sat, 6 Jan 2007 02:19:58 +0000 (18:19 -0800)]
Add reporting of damage by DRI drivers when the extension support is available.
With this, tools like ximagesrc in gstreamer correctly see updates from GL
rendering. Support requires that the Xdamage library be current (but will be
disabled if not present) plus a new X Server with support for the new
XDamagePost request. libGL now has a new interface version, and also links
against libXdamage and libXfixes to support it, but backwards compatibility
is retained.
Currently, all drivers report damage at SwapBuffers time through common code --
front buffer rendering doesn't result in damage being reported. Also, the
damage is against the root window, as our drivers don't yet render to backing
store when they should (composited environments).
Brian [Fri, 5 Jan 2007 15:42:45 +0000 (08:42 -0700)]
Merge branch 'master' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa
Brian [Fri, 5 Jan 2007 15:41:16 +0000 (08:41 -0700)]
document VBO bug fix 9445
Brian [Fri, 5 Jan 2007 15:40:06 +0000 (08:40 -0700)]
Fix glPush/PopClientAttrib() for VBO state (bug 9445).
Ian Romanick [Fri, 5 Jan 2007 02:37:10 +0000 (18:37 -0800)]
Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/mesa/mesa
Ian Romanick [Thu, 4 Jan 2007 22:53:48 +0000 (14:53 -0800)]
Use glxbyteorder.h in server-side source files.
Ian Romanick [Thu, 4 Jan 2007 22:52:53 +0000 (14:52 -0800)]
Hack indent flags for indirect_reqsize.h to eliminate extra diffs.
Ian Romanick [Thu, 4 Jan 2007 22:47:41 +0000 (14:47 -0800)]
Add missing files to server generation list.
The files indirect_reqsize.c and indirect_reqsize.h were missing from
the list of files to be generated for the server. Add them back to
the list. Also, update the INDENT_FLAGS to prevent conversion of
'GLbyte *pc' to 'GLbyte * pc' in function prototypes.
Jerome Glisse [Thu, 4 Jan 2007 19:27:49 +0000 (20:27 +0100)]
r300: Correct bug introduced by fragprog rework.
Thx for Tilman who spoted the bugs.
Brian [Thu, 4 Jan 2007 14:53:32 +0000 (07:53 -0700)]
s/unsigned/size_t/ (Matthias Hopf)
Patrice Mandin [Tue, 2 Jan 2007 13:31:16 +0000 (14:31 +0100)]
Update spot light params
Ben Skeggs [Tue, 2 Jan 2007 04:09:10 +0000 (15:09 +1100)]
nouveau: bump drm patchlevel.
Dave Airlie [Sat, 30 Dec 2006 23:01:17 +0000 (10:01 +1100)]
fix issue with i915tex advertising visuals it can't support
This may not be the proper way to fix this but it does work easily.
Haihao Xiang [Sat, 30 Dec 2006 18:30:42 +0000 (10:30 -0800)]
Use the tiled flag in the sarea to determine region tiling.
This fixes mis-rendering if back/depth fail to get set up as tiled. While it
probably won't ever be the case now that the pitch limits are loosened, this is
still the right thing to do.
Ben Skeggs [Wed, 27 Dec 2006 12:52:40 +0000 (23:52 +1100)]
nouveau: Use bufferobj interface for fragment program uploads
Ben Skeggs [Wed, 27 Dec 2006 12:30:34 +0000 (23:30 +1100)]
nouveau: Initial buffer object support
Ben Skeggs [Wed, 27 Dec 2006 04:54:30 +0000 (15:54 +1100)]
nouveau: We'll need syncNotifier for NV_MEMORY_TO_MEMORY_FORMAT too.
Ben Skeggs [Wed, 27 Dec 2006 04:50:59 +0000 (15:50 +1100)]
nouveau: add nouveau_mem_alloc/free debugging
Ben Skeggs [Wed, 27 Dec 2006 04:39:52 +0000 (15:39 +1100)]
nouveau: record *actual* type of memory that was alloc'd, not the requested types.
Ben Skeggs [Wed, 27 Dec 2006 04:38:09 +0000 (15:38 +1100)]
nouveau: Typo
Ben Skeggs [Tue, 26 Dec 2006 13:02:38 +0000 (00:02 +1100)]
nouveau: Add simple wrapper for NV_MEMORY_TO_MEMORY_FORMAT.
Jerome Glisse [Tue, 26 Dec 2006 17:39:21 +0000 (18:39 +0100)]
Deleted unused file which likely have be reintroduced during git move.
This file was deleted longtime ago, guess that git migration
created it again.
Ben Skeggs [Tue, 26 Dec 2006 11:03:12 +0000 (22:03 +1100)]
nouveau: Make use of NOUVEAU_DEBUG for shader disasm
Ben Skeggs [Tue, 26 Dec 2006 10:33:58 +0000 (21:33 +1100)]
nouveau: Make the notifier stuff actually work..
Ben Skeggs [Tue, 26 Dec 2006 10:10:38 +0000 (21:10 +1100)]
nouveau: Wait on notifier to check for completion of previous commands.
We can't wait on NV_PGRAPH_STATUS. We don't have the regs mapped, and there's
no guarantee that we'll catch PGRAPH idle when multiple channels are active.
Ben Skeggs [Tue, 26 Dec 2006 09:59:49 +0000 (20:59 +1100)]
nouveau: Add notifier support functions
Jerome Glisse [Mon, 25 Dec 2006 22:34:56 +0000 (23:34 +0100)]
Rework r300 fragprog avoid using bitfield structure.
It seems that bitfield structure lead to some strange
problem on 64bits arch, don't want to waste time debugging
strange things like that so converted pfs_reg_t structure
to a GLuint and use good old masking and shifting spell.
(cherry picked from
2a7de9d095d8e60da12b11aaa1efe664b87b11d3 commit)
Ben Skeggs [Sat, 23 Dec 2006 13:50:13 +0000 (00:50 +1100)]
nouveau: Kill some compile warnings.
Ben Skeggs [Sat, 23 Dec 2006 13:13:34 +0000 (00:13 +1100)]
nouveau: Modify span routines to use nouveau_renderbuffer instead of driRenderbuffer
Ben Skeggs [Sat, 23 Dec 2006 12:51:24 +0000 (23:51 +1100)]
nouveau: maintain numClipRects/pClipRects in context.
Ben Skeggs [Sat, 23 Dec 2006 12:03:55 +0000 (23:03 +1100)]
nouveau: Don't fill nrb->dPriv for private buffers
Ben Skeggs [Fri, 22 Dec 2006 23:56:19 +0000 (10:56 +1100)]
nouveau: get 16bpp working
George Sapountzis [Wed, 6 Dec 2006 04:40:18 +0000 (06:40 +0200)]
Drop mesa wrappers for XFree86.
Sean D'Epagnier [Thu, 21 Dec 2006 08:50:33 +0000 (01:50 -0700)]
Updated keyboard input so that glut programs can read from stdin without
problems if tty input is used. Also corrected a few stdin keycodes.
Dave Airlie [Tue, 19 Dec 2006 22:30:32 +0000 (09:30 +1100)]
Merge branch 'nouveau-import'
Ben Skeggs [Sun, 17 Dec 2006 03:38:21 +0000 (03:38 +0000)]
Don't build passthrough shader on <NV40
Brian [Sat, 16 Dec 2006 18:17:41 +0000 (11:17 -0700)]
Don't update span->array->z[] values from SLANG_FRAGMENT_FIXED_FRAGDEPTH.
This restores the behaviour of Mesa 6.5.1, fixing a regression in 6.5.2.
See bug 9345. Revisit someday...
Brian [Sat, 16 Dec 2006 18:09:14 +0000 (11:09 -0700)]
initial release notes for 6.5.3
Brian [Sat, 16 Dec 2006 18:07:00 +0000 (11:07 -0700)]
don't allow fog when using a fragment shader (bug 9346)
Ben Skeggs [Sat, 16 Dec 2006 12:32:11 +0000 (12:32 +0000)]
Get nv10_swtcl.c working enough for glxgears on NV40.