mesa.git
15 years agoMerge branch 'gallium-0.2-radeon' into gallium-0.2
Corbin Simpson [Fri, 6 Feb 2009 21:34:04 +0000 (13:34 -0800)]
Merge branch 'gallium-0.2-radeon' into gallium-0.2

15 years agoRename winsys amd to radeon.
Corbin Simpson [Fri, 6 Feb 2009 21:28:15 +0000 (13:28 -0800)]
Rename winsys amd to radeon.

15 years agoRemove r300 from default build.
Corbin Simpson [Fri, 6 Feb 2009 21:27:51 +0000 (13:27 -0800)]
Remove r300 from default build.

15 years agor300: Clean up CS counting.
Corbin Simpson [Fri, 6 Feb 2009 09:59:26 +0000 (01:59 -0800)]
r300: Clean up CS counting.

15 years agor300: working trivial/clear for r5xx
Joakim Sindholt [Thu, 5 Feb 2009 21:23:40 +0000 (22:23 +0100)]
r300: working trivial/clear for r5xx

15 years agor300: Add framebuffer setup stub.
Corbin Simpson [Thu, 5 Feb 2009 21:27:07 +0000 (13:27 -0800)]
r300: Add framebuffer setup stub.

15 years agonv20: copy miptree flags from nv40
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>
15 years agonv04-nv40: fix nv##_surface_copy() for flipped
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>
15 years agonv04: fix pasto in nv04_surface_2d_init()
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>
15 years agoindices: quad fixes
Keith Whitwell [Thu, 5 Feb 2009 16:04:13 +0000 (16:04 +0000)]
indices: quad fixes

15 years agogallium: add new aux lib for index list translations
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.

15 years agogallium: fixup #includes: p_screen.h does not need anything in p_state.h
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

15 years agogallium: move 'struct pipe_winsys'
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

15 years agonv50: stop using nouveau_push.h, it's evil
Ben Skeggs [Thu, 5 Feb 2009 08:40:38 +0000 (18:40 +1000)]
nv50: stop using nouveau_push.h, it's evil

15 years agonv04-nv40: move 2d blit/fill code into pipe driver
Ben Skeggs [Thu, 5 Feb 2009 08:19:32 +0000 (18:19 +1000)]
nv04-nv40: move 2d blit/fill code into pipe driver

15 years agonv50: 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

15 years agonouveau: support getting "native" bo from winsys
Ben Skeggs [Thu, 5 Feb 2009 03:17:12 +0000 (13:17 +1000)]
nouveau: support getting "native" bo from winsys

15 years agor300: Add shader state stubs.
Corbin Simpson [Thu, 5 Feb 2009 00:07:39 +0000 (16:07 -0800)]
r300: Add shader state stubs.

15 years agonouveau: notifier timeout is a float now
Ben Skeggs [Wed, 4 Feb 2009 11:08:41 +0000 (21:08 +1000)]
nouveau: notifier timeout is a float now

15 years agonouveau: get things building/running again after pipe_surface.buffer removal
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!

15 years agonouveau: link against libdrm_nouveau (installed with libdrm)
Ben Skeggs [Wed, 4 Feb 2009 04:55:13 +0000 (14:55 +1000)]
nouveau: link against libdrm_nouveau (installed with libdrm)

15 years agor300: A bit more cleanup and state handling.
Corbin Simpson [Wed, 4 Feb 2009 08:50:38 +0000 (00:50 -0800)]
r300: A bit more cleanup and state handling.

15 years agor300: Moar swtcl emit. Still sucks, but getting there.
Corbin Simpson [Wed, 4 Feb 2009 06:55:30 +0000 (22:55 -0800)]
r300: Moar swtcl emit. Still sucks, but getting there.

15 years agomesa: fix offset problem with interleaved arrays
Alan Hourihane [Tue, 3 Feb 2009 20:07:42 +0000 (20:07 +0000)]
mesa: fix offset problem with interleaved arrays

15 years agogallium: adjust gdi for the latest changes
Zack Rusin [Tue, 3 Feb 2009 04:54:28 +0000 (23:54 -0500)]
gallium: adjust gdi for the latest changes

15 years agogallium: remove pipe_buffer from surfaces
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.

15 years agor300: Add stubs for swtcl immediate emit.
Corbin Simpson [Tue, 3 Feb 2009 04:33:57 +0000 (20:33 -0800)]
r300: Add stubs for swtcl immediate emit.

15 years agor300: fix compiler/linker errors
Joakim Sindholt [Tue, 3 Feb 2009 01:58:51 +0000 (02:58 +0100)]
r300: fix compiler/linker errors

15 years agor300: Clear up XXX in r300_state.
Corbin Simpson [Tue, 3 Feb 2009 00:39:43 +0000 (16:39 -0800)]
r300: Clear up XXX in r300_state.

15 years agor300: Take care of some XXXes.
Corbin Simpson [Tue, 3 Feb 2009 00:13:41 +0000 (16:13 -0800)]
r300: Take care of some XXXes.

15 years agor300: Move some registers around.
Corbin Simpson [Mon, 2 Feb 2009 23:39:30 +0000 (15:39 -0800)]
r300: Move some registers around.

This fixes r500 hangs.

15 years agor300, amd: Oops, a couple more API changes.
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.

15 years agoxlib: Get conditional compilation of drivers working again.
José Fonseca [Mon, 2 Feb 2009 15:37:58 +0000 (15:37 +0000)]
xlib: Get conditional compilation of drivers working again.

15 years agogdi: Update for wgl st reorg.
José Fonseca [Mon, 2 Feb 2009 15:32:31 +0000 (15:32 +0000)]
gdi: Update for wgl st reorg.

15 years agoscons: Fixups for the introduction of the xlib state_tracker.
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.

15 years agogallium: Stop relinking drivers and aux libraries
Jakob Bornecrantz [Mon, 2 Feb 2009 13:18:50 +0000 (14:18 +0100)]
gallium: Stop relinking drivers and aux libraries

15 years agoMerge commit 'origin/gallium-0.2' into gallium-0.2
Keith Whitwell [Mon, 2 Feb 2009 12:18:34 +0000 (12:18 +0000)]
Merge commit 'origin/gallium-0.2' into gallium-0.2

15 years agoMerge branch 'gallium-wgl-rework' 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

15 years agowgl: Only export the same symbols as Microsoft's opengl32.dll.
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.

15 years agoamd: Fix build errors from rebase.
Corbin Simpson [Mon, 2 Feb 2009 08:18:25 +0000 (00:18 -0800)]
amd: Fix build errors from rebase.

15 years agor300: Clean up after 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.

15 years agor300: Add u_simple_screen support.
Corbin Simpson [Mon, 2 Feb 2009 07:43:30 +0000 (23:43 -0800)]
r300: Add u_simple_screen support.

15 years agor300: Add more rs_state, fix indents on dsa_state.
Corbin Simpson [Fri, 30 Jan 2009 10:17:48 +0000 (02:17 -0800)]
r300: Add more rs_state, fix indents on dsa_state.

15 years agor300: Split rs_state emit into its own function.
Corbin Simpson [Fri, 30 Jan 2009 09:24:03 +0000 (01:24 -0800)]
r300: Split rs_state emit into its own function.

15 years agoamd: Add AMD_SOFTPIPE environment option.
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.

15 years agor300: Add line stipple state to rs_state.
Corbin Simpson [Thu, 29 Jan 2009 23:50:46 +0000 (15:50 -0800)]
r300: Add line stipple state to rs_state.

15 years agor300: Add cleaned-up clear fallback, sort more regs.
Corbin Simpson [Thu, 29 Jan 2009 21:23:11 +0000 (13:23 -0800)]
r300: Add cleaned-up clear fallback, sort more regs.

15 years agor300: Try to fix up RS a bit more.
Corbin Simpson [Thu, 29 Jan 2009 20:27:00 +0000 (12:27 -0800)]
r300: Try to fix up RS a bit more.

15 years agor300: set up r5xx fragment shader; clear still broken
Joakim Sindholt [Thu, 29 Jan 2009 19:24:34 +0000 (20:24 +0100)]
r300: set up r5xx fragment shader; clear still broken

15 years agor300: Unbreak emit, fix up a bunch of little things.
Corbin Simpson [Thu, 29 Jan 2009 05:33:35 +0000 (21:33 -0800)]
r300: Unbreak emit, fix up a bunch of little things.

15 years agor300: attempt at trivial/clear on r5xx
Joakim Sindholt [Wed, 28 Jan 2009 23:12:32 +0000 (00:12 +0100)]
r300: attempt at trivial/clear on r5xx

15 years agor300: name registers for human readability
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>
15 years agor300: Fix a few more registers.
Corbin Simpson [Wed, 28 Jan 2009 11:06:08 +0000 (03:06 -0800)]
r300: Fix a few more registers.

15 years agoAck, forgot to update the index again.
Corbin Simpson [Wed, 28 Jan 2009 10:57:08 +0000 (02:57 -0800)]
Ack, forgot to update the index again.

15 years agor300: A handful of thingys.
Corbin Simpson [Wed, 28 Jan 2009 10:51:51 +0000 (02:51 -0800)]
r300: A handful of thingys.

15 years agor300: Fix small r300_reg typo.
Corbin Simpson [Wed, 28 Jan 2009 10:40:18 +0000 (02:40 -0800)]
r300: Fix small r300_reg typo.

15 years agor300: Moar RS cleanup.
Corbin Simpson [Wed, 28 Jan 2009 02:09:14 +0000 (18:09 -0800)]
r300: Moar RS cleanup.

How could I possibly miss these?

15 years agor300: Cleanup first part of RS block.
Corbin Simpson [Wed, 28 Jan 2009 01:56:44 +0000 (17:56 -0800)]
r300: Cleanup first part of RS block.

Working towards r500-ability.

15 years agor300: Clean up PVS upload emits.
Corbin Simpson [Tue, 27 Jan 2009 23:12:01 +0000 (15:12 -0800)]
r300: Clean up PVS upload emits.

15 years agor300: Add dsa state emit.
Corbin Simpson [Tue, 27 Jan 2009 12:48:19 +0000 (04:48 -0800)]
r300: Add dsa state emit.

Seeing a pattern yet?

15 years agor300: Add blend color state emit.
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.

15 years agor300: Count BEGIN_CS, END_CS, warn if count is off.
Corbin Simpson [Tue, 27 Jan 2009 12:03:38 +0000 (04:03 -0800)]
r300: Count BEGIN_CS, END_CS, warn if count is off.

15 years agor300: Set up blend state emit, clean up blend registers.
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.

15 years agor300: Add r300_flush.
Corbin Simpson [Mon, 26 Jan 2009 18:26:41 +0000 (10:26 -0800)]
r300: Add r300_flush.

Haha, I always do this.

15 years agor300: Deobfuscate a few registers, fix inaccurate variable names.
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.

15 years agor300: Working trivial/clear for RV410.
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.

15 years agoBROKEN
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.

15 years agoRebased to gallium-0.2, Jan 24 2009.
Corbin Simpson [Sat, 24 Jan 2009 14:21:00 +0000 (06:21 -0800)]
Rebased to gallium-0.2, Jan 24 2009.

15 years agor300: Hook up clear, set it to fallback.
Corbin Simpson [Sat, 24 Jan 2009 13:44:01 +0000 (05:44 -0800)]
r300: Hook up clear, set it to fallback.

15 years agor300: Make format names legible.
Corbin Simpson [Sat, 24 Jan 2009 12:11:03 +0000 (04:11 -0800)]
r300: Make format names legible.

15 years agor300: Add more capabilities.
Corbin Simpson [Sat, 24 Jan 2009 12:08:33 +0000 (04:08 -0800)]
r300: Add more capabilities.

15 years agor300: Newlines, dammit!
Corbin Simpson [Sat, 24 Jan 2009 12:03:27 +0000 (04:03 -0800)]
r300: Newlines, dammit!

15 years agor300: More state setters.
Corbin Simpson [Sat, 24 Jan 2009 12:03:11 +0000 (04:03 -0800)]
r300: More state setters.

15 years agor300: Add some useful debugging information; remove a couple compile warnings.
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.

15 years agor300: Remove radeon_reg.
Corbin Simpson [Sat, 24 Jan 2009 10:12:55 +0000 (02:12 -0800)]
r300: Remove radeon_reg.

Wonder why this was ever committed...

15 years agor300: Put r300_blit to bed.
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.

15 years agor300: Plan for the next state setters.
Corbin Simpson [Sat, 24 Jan 2009 09:49:57 +0000 (01:49 -0800)]
r300: Plan for the next state setters.

15 years agor300: Moar state handlers.
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.

15 years agor300: Finish basic state setup.
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.

15 years agoamd: Fix uninitialized pipe_screen.
Corbin Simpson [Sat, 24 Jan 2009 00:34:00 +0000 (16:34 -0800)]
amd: Fix uninitialized pipe_screen.

15 years agoamd: Fix missing break statement.
Corbin Simpson [Sat, 24 Jan 2009 00:00:33 +0000 (16:00 -0800)]
amd: Fix missing break statement.

15 years agor300: Add fragment shader stubs.
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.

15 years agor300: Add more pipe_texture stuff.
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.

15 years agor300: Add initial pipe_texture handling.
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.

15 years agor300: Add texture sampler state.
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.

15 years agor300: Add texture stubs.
Corbin Simpson [Fri, 23 Jan 2009 00:51:34 +0000 (16:51 -0800)]
r300: Add texture stubs.

15 years agoamd/r300: Wire up GETPARAM ioctls.
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.

15 years agor300: Add sampler state skeleton.
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.

15 years agor300: Add num_vert_pipes (and remove busted num_pipes.)
Corbin Simpson [Thu, 22 Jan 2009 07:48:47 +0000 (23:48 -0800)]
r300: Add num_vert_pipes (and remove busted num_pipes.)

15 years agor300: Unbreak build, finish clear state.
Corbin Simpson [Thu, 22 Jan 2009 07:12:40 +0000 (23:12 -0800)]
r300: Unbreak build, finish clear state.

Completely untested, of course.

15 years ago[BROKEN] r300: Add initial clear/fill code.
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.

15 years agor300: Fix constness, compile warnings, indentation in r300_state.
Corbin Simpson [Tue, 20 Jan 2009 23:42:11 +0000 (15:42 -0800)]
r300: Fix constness, compile warnings, indentation in r300_state.

15 years agor300: Set floating-point params.
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.

15 years agor300: Fix indenting.
Corbin Simpson [Tue, 20 Jan 2009 23:27:46 +0000 (15:27 -0800)]
r300: Fix indenting.

15 years agor300: Fix missing free().
Corbin Simpson [Tue, 20 Jan 2009 23:26:41 +0000 (15:26 -0800)]
r300: Fix missing free().

15 years agor300: Add path for pci_id in winsys.
Corbin Simpson [Tue, 20 Jan 2009 09:49:34 +0000 (01:49 -0800)]
r300: Add path for pci_id in winsys.

Needs to be hooked up to the getparam from the kernel.

15 years agor300: Use chip caps for something.
Corbin Simpson [Tue, 20 Jan 2009 09:11:08 +0000 (01:11 -0800)]
r300: Use chip caps for something.

Step two: Integration. Yay?

Time to stop messing around with this and actually go do things.

15 years agor300: Add chipset sorting and capabilities.
Corbin Simpson [Tue, 20 Jan 2009 08:31:43 +0000 (00:31 -0800)]
r300: Add chipset sorting and capabilities.

Part one: Capabilities from classic Mesa.

Damn, if only we didn't have so many fucking Radeons!

15 years agor300: Various flags, small state tracking things.
Corbin Simpson [Tue, 20 Jan 2009 05:03:24 +0000 (21:03 -0800)]
r300: Various flags, small state tracking things.

Getting these out of the way so more stuff can be put in.

15 years agor300: Add a basic dirty state emit.
Corbin Simpson [Sat, 17 Jan 2009 11:20:48 +0000 (03:20 -0800)]
r300: Add a basic dirty state emit.

I feel strangely unproductive. Must be the cold.