Keith Whitwell [Tue, 10 Feb 2009 18:21:41 +0000 (18:21 +0000)]
wgl: return before locking if stw_icd is NULL
Keith Whitwell [Tue, 10 Feb 2009 19:22:57 +0000 (19:22 +0000)]
Merge commit 'origin/gallium-0.2' into gallium-0.2
Conflicts:
src/gallium/state_trackers/wgl/icd/stw_icd.c
José Fonseca [Tue, 10 Feb 2009 18:11:56 +0000 (18:11 +0000)]
scons: Use parallel builds by default.
Keith Whitwell [Tue, 10 Feb 2009 18:11:44 +0000 (18:11 +0000)]
wgl: mutex-protect the shared stw_icd struct
Patrice Mandin [Tue, 10 Feb 2009 17:44:08 +0000 (18:44 +0100)]
nouveau: dst offset is correct
José Fonseca [Tue, 10 Feb 2009 16:18:22 +0000 (16:18 +0000)]
pipebuffer: Drop reliance on pipe_winsys.
Patrice Mandin [Tue, 10 Feb 2009 17:31:41 +0000 (18:31 +0100)]
Missing: tgsi: Fix build -- rename Size to NrTokens.
Patrice Mandin [Tue, 10 Feb 2009 17:09:10 +0000 (18:09 +0100)]
nouveau: recalc sub width and height for each mipmap level
Michal Krol [Tue, 10 Feb 2009 14:18:32 +0000 (15:18 +0100)]
nv40: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:18:19 +0000 (15:18 +0100)]
nv30: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:18:03 +0000 (15:18 +0100)]
nv20: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:17:41 +0000 (15:17 +0100)]
brw: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:17:17 +0000 (15:17 +0100)]
i915: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:16:35 +0000 (15:16 +0100)]
gallivm: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:16:00 +0000 (15:16 +0100)]
draw: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:14:31 +0000 (15:14 +0100)]
tgsi: Fix build -- rename Size to NrTokens.
Michal Krol [Tue, 10 Feb 2009 14:12:34 +0000 (15:12 +0100)]
gallium: Rename Size member of TGSI token to NrTokens.
Driver writers often got confused and assumed Size to be
the number of immediate values in Immediate declaration.
Keith Whitwell [Tue, 10 Feb 2009 14:03:43 +0000 (14:03 +0000)]
vmw/icd: remove bogus current_context value
José Fonseca [Tue, 10 Feb 2009 13:40:00 +0000 (13:40 +0000)]
mesa: Compare formats using nominal bytes per pixel.
This is a temporary fix which works for the formats we care so far. The
real fix would be abandon the concept "nominal bytes per pixel" entirely
in Mesa, and use macropixels instead, as done in gallium interfaces
already.
José Fonseca [Tue, 10 Feb 2009 11:50:54 +0000 (11:50 +0000)]
wgl: Fix null pointer reference.
José Fonseca [Tue, 10 Feb 2009 11:37:23 +0000 (11:37 +0000)]
stw: Hack for applications which use wglSetPixelFormat instead of SetPixelFormat.
José Fonseca [Tue, 10 Feb 2009 11:36:48 +0000 (11:36 +0000)]
glut: Use the official WGL functions.
Especially using wglGetPixelFormat instead of GetPixelFormat causes
problems with opengl32.dll and drivers that not hack around this issue.
José Fonseca [Tue, 10 Feb 2009 11:35:26 +0000 (11:35 +0000)]
glut: DESCRIPTION .def clause deprecated.
José Fonseca [Mon, 9 Feb 2009 21:08:49 +0000 (21:08 +0000)]
wgl: s/0x%p/%p/g
Rather not have 0x prefix, than 0x0x in certain platforms.
Roland Scheidegger [Mon, 9 Feb 2009 22:10:16 +0000 (23:10 +0100)]
mesa: fixes for srgb formats
swizzling in fetch/store srgba/sargb functions fixed (consistent with
equivalent non-srgb formats now).
Roland Scheidegger [Mon, 9 Feb 2009 16:57:22 +0000 (17:57 +0100)]
fix _mesa_get_teximage for srgb textures
José Fonseca [Mon, 9 Feb 2009 18:11:05 +0000 (18:11 +0000)]
indices: Fix typo.
Patrice Mandin [Sun, 8 Feb 2009 16:03:47 +0000 (17:03 +0100)]
nouveau: include and calc offset before changing dimensions for next level
Patrice Mandin [Sun, 8 Feb 2009 15:42:56 +0000 (16:42 +0100)]
nouveau: upload and swizzle each mipmap level in turn
Corbin Simpson [Sun, 8 Feb 2009 10:03:29 +0000 (02:03 -0800)]
r300: Accidentally removed a pipe_buffer_reference that should be there.
Corbin Simpson [Sun, 8 Feb 2009 09:07:03 +0000 (01:07 -0800)]
r300: Add SW TCL paths for clear.
This should make things work for people on RSxxx chipsets.
Corbin Simpson [Sun, 8 Feb 2009 09:01:26 +0000 (01:01 -0800)]
r300: Update to match pipe_surface changes.
Brian Paul [Sat, 7 Feb 2009 20:05:38 +0000 (13:05 -0700)]
cell: remove unused var
Brian Paul [Sat, 7 Feb 2009 20:04:53 +0000 (13:04 -0700)]
cell: compile fix: many updates to cell texture code for new surface mapping
The Cell texture code really needs a thorough inspection and clean-up someday...
Brian Paul [Sat, 7 Feb 2009 20:03:24 +0000 (13:03 -0700)]
softpipe: simplify an assertion
Brian Paul [Sat, 7 Feb 2009 20:02:27 +0000 (13:02 -0700)]
cell: compile fix: no-op xlib_create_brw_screen() for Cell build
Brian Paul [Sat, 7 Feb 2009 20:01:53 +0000 (13:01 -0700)]
cell: compile fix: alpha.ref is now alpha.ref_value
Brian Paul [Sat, 7 Feb 2009 20:01:02 +0000 (13:01 -0700)]
cell: compile fix: pipe_constant_buffer no longer has size field
Brian Paul [Sat, 7 Feb 2009 19:59:40 +0000 (12:59 -0700)]
cell: compile fix: pipe_constant_buffer no longer has size field
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.