Younes Manton [Sat, 7 Feb 2009 17:53:30 +0000 (12:53 -0500)]
nouveau: Need to surface_copy() without a pipe context.
Corbin Simpson [Fri, 6 Feb 2009 22:06:39 +0000 (14:06 -0800)]
Merge branch 'gallium-0.2' of git://anongit.freedesktop.org/mesa/mesa into gallium-0.2
Corbin Simpson [Fri, 6 Feb 2009 21:36:31 +0000 (13:36 -0800)]
Readd trace to list of default pipe drivers.
Looks like the gallium-0.2-radeon merge clobbered it.
Corbin Simpson [Fri, 6 Feb 2009 21:34:04 +0000 (13:34 -0800)]
Merge branch 'gallium-0.2-radeon' into gallium-0.2
Corbin Simpson [Fri, 6 Feb 2009 21:28:15 +0000 (13:28 -0800)]
Rename winsys amd to radeon.
Corbin Simpson [Fri, 6 Feb 2009 21:27:51 +0000 (13:27 -0800)]
Remove r300 from default build.
Younes Manton [Fri, 6 Feb 2009 19:37:35 +0000 (14:37 -0500)]
g3dvl: Catch up to gallium changes, fix build.
Younes Manton [Fri, 6 Feb 2009 19:36:56 +0000 (14:36 -0500)]
nouveau: Pass proper format to NV04_GDI_RECTANGLE_TEXT.
Younes Manton [Fri, 6 Feb 2009 19:33:49 +0000 (14:33 -0500)]
nouveau: Frontbuffer pitch needs to be set.
Corbin Simpson [Fri, 6 Feb 2009 09:59:26 +0000 (01:59 -0800)]
r300: Clean up CS counting.
Joakim Sindholt [Thu, 5 Feb 2009 21:23:40 +0000 (22:23 +0100)]
r300: working trivial/clear for r5xx
Corbin Simpson [Thu, 5 Feb 2009 21:27:07 +0000 (13:27 -0800)]
r300: Add framebuffer setup stub.
Pekka Paalanen [Thu, 5 Feb 2009 18:12:04 +0000 (20:12 +0200)]
nv20: copy miptree flags from nv40
nv20_miptree_create() should set various flags.
Copy stuff over from nv40.
trivial/tri does not abort on nv04 swizzled copy anymore.
I still miss my triangle.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Thu, 5 Feb 2009 17:45:33 +0000 (19:45 +0200)]
nv04-nv40: fix nv##_surface_copy() for flipped
If do_flipp is true, it would first do the proper copy, height would
wrap around to unsigned maximum, and then it attempts to do another
copy.
Return after doing the proper copy.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Pekka Paalanen [Thu, 5 Feb 2009 17:43:36 +0000 (19:43 +0200)]
nv04: fix pasto in nv04_surface_2d_init()
Wrong hardware object being used, when compared with earlier code.
Signed-off-by: Pekka Paalanen <pq@iki.fi>
Keith Whitwell [Thu, 5 Feb 2009 16:04:13 +0000 (16:04 +0000)]
indices: quad fixes
Keith Whitwell [Thu, 5 Feb 2009 14:44:17 +0000 (14:44 +0000)]
gallium: add new aux lib for index list translations
Could this be the ultimate index list translating utility? Maybe, but it
doesn't yet include support for splitting primitives.
Unlike previous attempts, this captures all possible combinations of API
and hardware provoking vertex, supports generated list reuse and various
other tricks. Relies on python-generated code.
Brian Paul [Thu, 5 Feb 2009 15:23:00 +0000 (08:23 -0700)]
gallium: fixup #includes: p_screen.h does not need anything in p_state.h
Brian Paul [Thu, 5 Feb 2009 15:16:56 +0000 (08:16 -0700)]
gallium: move 'struct pipe_winsys'
Not used in p_state.h but used in p_context.h and p_screen.h
Ben Skeggs [Thu, 5 Feb 2009 08:40:38 +0000 (18:40 +1000)]
nv50: stop using nouveau_push.h, it's evil
Ben Skeggs [Thu, 5 Feb 2009 08:19:32 +0000 (18:19 +1000)]
nv04-nv40: move 2d blit/fill code into pipe driver
Ben Skeggs [Thu, 5 Feb 2009 04:04:45 +0000 (14:04 +1000)]
nv50: move 2d blit/fill code into pipe driver
Ben Skeggs [Thu, 5 Feb 2009 03:17:12 +0000 (13:17 +1000)]
nouveau: support getting "native" bo from winsys
Corbin Simpson [Thu, 5 Feb 2009 00:07:39 +0000 (16:07 -0800)]
r300: Add shader state stubs.
Ben Skeggs [Wed, 4 Feb 2009 11:08:41 +0000 (21:08 +1000)]
nouveau: notifier timeout is a float now
Ben Skeggs [Wed, 4 Feb 2009 10:59:49 +0000 (20:59 +1000)]
nouveau: get things building/running again after pipe_surface.buffer removal
Don't look at nouveau_winsys_pipe.h... I promise it's temporary!
Ben Skeggs [Wed, 4 Feb 2009 04:55:13 +0000 (14:55 +1000)]
nouveau: link against libdrm_nouveau (installed with libdrm)
Corbin Simpson [Wed, 4 Feb 2009 08:50:38 +0000 (00:50 -0800)]
r300: A bit more cleanup and state handling.
Corbin Simpson [Wed, 4 Feb 2009 06:55:30 +0000 (22:55 -0800)]
r300: Moar swtcl emit. Still sucks, but getting there.
Alan Hourihane [Tue, 3 Feb 2009 20:07:42 +0000 (20:07 +0000)]
mesa: fix offset problem with interleaved arrays
Zack Rusin [Tue, 3 Feb 2009 04:54:28 +0000 (23:54 -0500)]
gallium: adjust gdi for the latest changes
Zack Rusin [Tue, 3 Feb 2009 04:47:16 +0000 (23:47 -0500)]
gallium: remove pipe_buffer from surfaces
this change disassociates, at least from the driver perspective,
the surface from buffer. surfaces are technically now views on the
textures so make it so by hiding the buffer in the internals of
textures.
Corbin Simpson [Tue, 3 Feb 2009 04:33:57 +0000 (20:33 -0800)]
r300: Add stubs for swtcl immediate emit.
Joakim Sindholt [Tue, 3 Feb 2009 01:58:51 +0000 (02:58 +0100)]
r300: fix compiler/linker errors
Corbin Simpson [Tue, 3 Feb 2009 00:39:43 +0000 (16:39 -0800)]
r300: Clear up XXX in r300_state.
Corbin Simpson [Tue, 3 Feb 2009 00:13:41 +0000 (16:13 -0800)]
r300: Take care of some XXXes.
Corbin Simpson [Mon, 2 Feb 2009 23:39:30 +0000 (15:39 -0800)]
r300: Move some registers around.
This fixes r500 hangs.
Corbin Simpson [Mon, 2 Feb 2009 22:42:04 +0000 (14:42 -0800)]
r300, amd: Oops, a couple more API changes.
Somehow I forgot to commit these.
José Fonseca [Mon, 2 Feb 2009 15:37:58 +0000 (15:37 +0000)]
xlib: Get conditional compilation of drivers working again.
José Fonseca [Mon, 2 Feb 2009 15:32:31 +0000 (15:32 +0000)]
gdi: Update for wgl st reorg.
Michel Dänzer [Mon, 2 Feb 2009 14:49:33 +0000 (15:49 +0100)]
scons: Fixups for the introduction of the xlib state_tracker.
Not quite working yet; glxinfo complains about glXChooseVisual being undefined.
Jakob Bornecrantz [Mon, 2 Feb 2009 13:18:50 +0000 (14:18 +0100)]
gallium: Stop relinking drivers and aux libraries
Keith Whitwell [Mon, 2 Feb 2009 12:18:34 +0000 (12:18 +0000)]
Merge commit 'origin/gallium-0.2' into gallium-0.2
Keith Whitwell [Mon, 2 Feb 2009 12:17:01 +0000 (12:17 +0000)]
Merge branch 'gallium-wgl-rework' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/shared/stw_public.h
José Fonseca [Sun, 1 Feb 2009 14:42:40 +0000 (14:42 +0000)]
wgl: Only export the same symbols as Microsoft's opengl32.dll.
Plus the ICD entrypoints.
Corbin Simpson [Mon, 2 Feb 2009 08:18:25 +0000 (00:18 -0800)]
amd: Fix build errors from rebase.
Corbin Simpson [Mon, 2 Feb 2009 07:58:16 +0000 (23:58 -0800)]
r300: Clean up after rebase.
Fix a couple struct members, clear up a few texture lines.
Corbin Simpson [Mon, 2 Feb 2009 07:43:30 +0000 (23:43 -0800)]
r300: Add u_simple_screen support.
Corbin Simpson [Fri, 30 Jan 2009 10:17:48 +0000 (02:17 -0800)]
r300: Add more rs_state, fix indents on dsa_state.
Corbin Simpson [Fri, 30 Jan 2009 09:24:03 +0000 (01:24 -0800)]
r300: Split rs_state emit into its own function.
Corbin Simpson [Thu, 29 Jan 2009 23:53:32 +0000 (15:53 -0800)]
amd: Add AMD_SOFTPIPE environment option.
If set, AMD_SOFTPIPE will make amd switch to softpipe.
Corbin Simpson [Thu, 29 Jan 2009 23:50:46 +0000 (15:50 -0800)]
r300: Add line stipple state to rs_state.
Corbin Simpson [Thu, 29 Jan 2009 21:23:11 +0000 (13:23 -0800)]
r300: Add cleaned-up clear fallback, sort more regs.
Corbin Simpson [Thu, 29 Jan 2009 20:27:00 +0000 (12:27 -0800)]
r300: Try to fix up RS a bit more.
Joakim Sindholt [Thu, 29 Jan 2009 19:24:34 +0000 (20:24 +0100)]
r300: set up r5xx fragment shader; clear still broken
Corbin Simpson [Thu, 29 Jan 2009 05:33:35 +0000 (21:33 -0800)]
r300: Unbreak emit, fix up a bunch of little things.
Joakim Sindholt [Wed, 28 Jan 2009 23:12:32 +0000 (00:12 +0100)]
r300: attempt at trivial/clear on r5xx
Joakim Sindholt [Wed, 28 Jan 2009 13:53:39 +0000 (14:53 +0100)]
r300: name registers for human readability
Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
Corbin Simpson [Wed, 28 Jan 2009 11:06:08 +0000 (03:06 -0800)]
r300: Fix a few more registers.
Corbin Simpson [Wed, 28 Jan 2009 10:57:08 +0000 (02:57 -0800)]
Ack, forgot to update the index again.
Corbin Simpson [Wed, 28 Jan 2009 10:51:51 +0000 (02:51 -0800)]
r300: A handful of thingys.
Corbin Simpson [Wed, 28 Jan 2009 10:40:18 +0000 (02:40 -0800)]
r300: Fix small r300_reg typo.
Corbin Simpson [Wed, 28 Jan 2009 02:09:14 +0000 (18:09 -0800)]
r300: Moar RS cleanup.
How could I possibly miss these?
Corbin Simpson [Wed, 28 Jan 2009 01:56:44 +0000 (17:56 -0800)]
r300: Cleanup first part of RS block.
Working towards r500-ability.
Corbin Simpson [Tue, 27 Jan 2009 23:12:01 +0000 (15:12 -0800)]
r300: Clean up PVS upload emits.
Corbin Simpson [Tue, 27 Jan 2009 12:48:19 +0000 (04:48 -0800)]
r300: Add dsa state emit.
Seeing a pattern yet?
Corbin Simpson [Tue, 27 Jan 2009 12:04:57 +0000 (04:04 -0800)]
r300: Add blend color state emit.
Slow and steady wins the race. Or something like that.
Corbin Simpson [Tue, 27 Jan 2009 12:03:38 +0000 (04:03 -0800)]
r300: Count BEGIN_CS, END_CS, warn if count is off.
Corbin Simpson [Tue, 27 Jan 2009 11:40:46 +0000 (03:40 -0800)]
r300: Set up blend state emit, clean up blend registers.
Also add at least one missing register to r300_reg.
Corbin Simpson [Mon, 26 Jan 2009 18:26:41 +0000 (10:26 -0800)]
r300: Add r300_flush.
Haha, I always do this.
Corbin Simpson [Mon, 26 Jan 2009 10:18:56 +0000 (02:18 -0800)]
r300: Deobfuscate a few registers, fix inaccurate variable names.
It's not "pipes", it's floating-point vertex processors. Completely different.
Corbin Simpson [Mon, 26 Jan 2009 05:35:26 +0000 (21:35 -0800)]
r300: Working trivial/clear for RV410.
This might work for other people too.
Corbin Simpson [Mon, 26 Jan 2009 00:29:02 +0000 (16:29 -0800)]
BROKEN
This commit is only to protect against data loss, so please skip it when
bisecting. Thanks.
Corbin Simpson [Sat, 24 Jan 2009 14:21:00 +0000 (06:21 -0800)]
Rebased to gallium-0.2, Jan 24 2009.
Corbin Simpson [Sat, 24 Jan 2009 13:44:01 +0000 (05:44 -0800)]
r300: Hook up clear, set it to fallback.
Corbin Simpson [Sat, 24 Jan 2009 12:11:03 +0000 (04:11 -0800)]
r300: Make format names legible.
Corbin Simpson [Sat, 24 Jan 2009 12:08:33 +0000 (04:08 -0800)]
r300: Add more capabilities.
Corbin Simpson [Sat, 24 Jan 2009 12:03:27 +0000 (04:03 -0800)]
r300: Newlines, dammit!
Corbin Simpson [Sat, 24 Jan 2009 12:03:11 +0000 (04:03 -0800)]
r300: More state setters.
Corbin Simpson [Sat, 24 Jan 2009 11:34:17 +0000 (03:34 -0800)]
r300: Add some useful debugging information; remove a couple compile warnings.
Deck chairs on the Titanic.
Corbin Simpson [Sat, 24 Jan 2009 10:12:55 +0000 (02:12 -0800)]
r300: Remove radeon_reg.
Wonder why this was ever committed...
Corbin Simpson [Sat, 24 Jan 2009 10:03:35 +0000 (02:03 -0800)]
r300: Put r300_blit to bed.
Not going to be using the blitter. Period.
Corbin Simpson [Sat, 24 Jan 2009 09:49:57 +0000 (01:49 -0800)]
r300: Plan for the next state setters.
Corbin Simpson [Sat, 24 Jan 2009 09:32:14 +0000 (01:32 -0800)]
r300: Moar state handlers.
Ah, my code's so bad. It's amazing.
Corbin Simpson [Sat, 24 Jan 2009 01:01:04 +0000 (17:01 -0800)]
r300: Finish basic state setup.
I have successfully fooled glxinfo into believing that I am a competent
writer of code. Next step is to trick trivial/clear.
Corbin Simpson [Sat, 24 Jan 2009 00:34:00 +0000 (16:34 -0800)]
amd: Fix uninitialized pipe_screen.
Corbin Simpson [Sat, 24 Jan 2009 00:00:33 +0000 (16:00 -0800)]
amd: Fix missing break statement.
Corbin Simpson [Fri, 23 Jan 2009 23:08:27 +0000 (15:08 -0800)]
r300: Add fragment shader stubs.
Not looking forward to filling these out at all.
Corbin Simpson [Fri, 23 Jan 2009 11:09:15 +0000 (03:09 -0800)]
r300: Add more pipe_texture stuff.
This is enough to sate glxinfo, for now.
Corbin Simpson [Fri, 23 Jan 2009 10:46:52 +0000 (02:46 -0800)]
r300: Add initial pipe_texture handling.
Still primitive and needing to be fleshed out, but it's a start.
Corbin Simpson [Fri, 23 Jan 2009 05:47:05 +0000 (21:47 -0800)]
r300: Add texture sampler state.
Easy compared to the actual texture handling code.
Corbin Simpson [Fri, 23 Jan 2009 00:51:34 +0000 (16:51 -0800)]
r300: Add texture stubs.
Corbin Simpson [Thu, 22 Jan 2009 21:34:21 +0000 (13:34 -0800)]
amd/r300: Wire up GETPARAM ioctls.
Whoo, stuff is starting to look cleaner and cleaner.
Corbin Simpson [Thu, 22 Jan 2009 11:45:14 +0000 (03:45 -0800)]
r300: Add sampler state skeleton.
Heh, serendipitous sibilance. Anyway, need to flesh this out.
Corbin Simpson [Thu, 22 Jan 2009 07:48:47 +0000 (23:48 -0800)]
r300: Add num_vert_pipes (and remove busted num_pipes.)
Corbin Simpson [Thu, 22 Jan 2009 07:12:40 +0000 (23:12 -0800)]
r300: Unbreak build, finish clear state.
Completely untested, of course.
Corbin Simpson [Wed, 21 Jan 2009 10:21:09 +0000 (02:21 -0800)]
[BROKEN] r300: Add initial clear/fill code.
Copied from mesa and still broken. Gimme a few to clean it up.
Corbin Simpson [Tue, 20 Jan 2009 23:42:11 +0000 (15:42 -0800)]
r300: Fix constness, compile warnings, indentation in r300_state.
Corbin Simpson [Tue, 20 Jan 2009 23:38:43 +0000 (15:38 -0800)]
r300: Set floating-point params.
Note: I took those numbers from classic Mesa. I know that points are routinely
used to clear buffers, but line width is probably wrong.
Corbin Simpson [Tue, 20 Jan 2009 23:27:46 +0000 (15:27 -0800)]
r300: Fix indenting.