938d9d5963
Merge branch 'gallium-vertex-linear' into gallium-0.1
...
Conflicts:
src/gallium/auxiliary/draw/draw_pt_varray.c
2008-05-28 12:42:42 +02:00
b7b9ce0f86
softpipe: enable vbuf by default
...
The non-vbuf option is going away...
2008-05-27 23:28:27 +01:00
fa4b2439d4
nouveau: very quick port to tex-surface changes.
...
probably the last match-gallium-upstream merge for a bit, some cleanup+nv50
work coming RSN...
2008-05-27 01:23:31 +10:00
0f9635d9d5
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
2008-05-27 00:59:41 +10:00
c428997a52
Revert DOS line endings.
2008-05-26 23:38:03 +09:00
253066d716
Revert DOS line endings.
2008-05-26 23:29:38 +09:00
791eee64e0
i915: Removed screen sufixes on texture functions
2008-05-26 13:05:38 +02:00
e0fd3449f8
i915: Fix for tex-surface merge
2008-05-26 13:05:31 +02:00
e3ddafd1d3
Merge branch 'gallium-tex-surface' into gallium-0.1
...
Conflicts:
src/gallium/include/pipe/p_util.h
2008-05-26 13:04:25 +02:00
f5599a7a3c
nouveau: remove final PIPE_FORMAT_U_* usage
2008-05-25 14:25:15 +10:00
9212085194
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
2008-05-25 14:19:18 +10:00
845db16dbe
i915: Fix for edgeflags
2008-05-23 16:26:20 +02:00
09900df429
Merge commit 'origin/gallium-0.1' into gallium-vertex-linear
2008-05-19 12:10:42 -04:00
a846b156b8
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-19 09:36:10 -06:00
59007a811d
if x86_get_func() returns NULL, handle it properly instead of aborting
2008-05-19 09:34:28 -06:00
aafe3ddee2
i915simple: Fix win9x build.
2008-05-19 15:18:40 +09:00
54fbd8bbd4
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-18 16:17:50 -06:00
9671f7ae47
gallium: in drivers, make copy of tokens passed to pipe->create_vs/fs_state()
...
The caller can then free the token array immediately.
2008-05-17 10:30:21 -06:00
9a01ee4424
nv40: fix typo in one of the previous commits
2008-05-14 18:35:37 +10:00
bc1696862c
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
2008-05-14 18:13:36 +10:00
1ef08564d2
nouveau: remove chipset fields in all nv pipe driver context/screen structs.
2008-05-13 12:16:35 +10:00
2f80d4d2a7
nouveau: make nouveau_device.h part of public API
2008-05-13 12:09:04 +10:00
c962ad7cd5
nouveau: create objnull during channel creation
2008-05-13 12:06:32 +10:00
9b0054c7f8
nv50: slightly less skeletal texture funcs, prevents fun segfaults
2008-05-13 12:00:18 +10:00
32ed02bcfb
nv50: report some supported formats to keep the state tracker from asserting.
2008-05-13 12:00:14 +10:00
f116a14916
softpipe: more work to get non-reduced primitives working in vbuf
2008-05-12 17:40:55 +01:00
90e86363de
softpipe: make vbuf handle all primitive types
2008-05-12 17:40:55 +01:00
de818835de
softpipe: add failure paths for context creation
2008-05-12 17:40:55 +01:00
6807b4f6b1
gallium: optimize the flush_spans() function
2008-05-10 12:46:55 -06:00
140b3f7f9c
gallium: remove unused code
2008-05-10 12:46:55 -06:00
36e1bc865b
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-09 08:56:01 +01:00
9002cdb48e
softpipe: don't calc det if NO_RAST set
2008-05-08 22:14:59 +01:00
c7ad942c54
gallium: Propagate tex_usage flags down to winsys.
2008-05-07 14:17:59 +09:00
09e6be9b57
Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
...
Conflicts:
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
2008-05-06 07:45:28 +01:00
612f44266c
nouveau: bitmap texcoord bias has been removed
2008-05-05 19:45:21 +10:00
33d9e213ee
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
2008-05-05 19:44:16 +10:00
7849ccb2a7
brw: remove dead code
2008-05-02 17:55:22 +01:00
3d53d38d5e
gallium: new debug code (disabled)
2008-05-02 10:37:20 -06:00
5cb29dae06
i915: update to new display target allocation
2008-05-02 16:56:06 +01:00
a73ae3d5eb
gallium: Add texture usage flags, special-case allocation of display targets
...
For many envirionments it's necessary to allocate display targets
in a window-system friendly manner. Add facilities so that a driver
can tell if a texture is likely to be used to generate a display surface
and if use special allocation paths if necessary.
Hook up softpipe to call into the winsys->surface_alloc_storage()
routine in this case, though we probably want to change that interface
slightly also.
2008-05-02 16:46:31 +01:00
cc2af38f2a
gallium: fix typos, comments, whitespace
2008-05-02 09:31:38 -06:00
c3a8a41faa
Merge branch 'gallium-0.1' into gallium-tex-surfaces
2008-05-02 12:00:13 +01:00
731e7b961c
re-add pipe_surface map/unmap inlines
2008-05-02 11:11:27 +01:00
c1abd758c5
gallium: remove the unused softpipe_winsys code
...
The struct is still there though until all winsys layers are updated
2008-05-01 15:20:34 -06:00
b8936ca1c2
i915: avoid crashing on bad parameter
2008-05-01 20:49:45 +01:00
26bcef898a
i915: fix warning
2008-05-01 20:49:44 +01:00
f30285e99c
softpipe: fix warning
2008-05-01 20:49:44 +01:00
228aaa6cab
softpipe: missing file
2008-05-01 12:24:23 +01:00
27e46611f0
softpipe: use CPU flags for mapping
...
But when creating surfaces, adjust incoming flags from GPU->CPU usage.
2008-05-01 12:00:45 +01:00
c9ed86a964
gallium: tex surface checkpoint
2008-05-01 12:00:45 +01:00
Jakob Bornecrantz