Commit graph

29289 commits

Author SHA1 Message Date
Dave Airlie
e84dddde9b Revert "radeon/r300: no need to flush the cmdbuf when changing scissors state in KMM mode"
This reverts commit 286bf89e5a.

This doesn't appear to be correct, regression so revert it.
http://bugs.freedesktop.org/show_bug.cgi?id=25193
2009-12-02 11:03:22 +10:00
Brian Paul
c8cdce6657 vbo: make flush recursion check code per-context
This fixes invalid failed assertions when running multi-threaded apps.
2009-12-01 13:27:32 -07:00
Brian Paul
8c26cefec7 st/mesa: updated emit_swz() comment 2009-12-01 12:23:28 -07:00
Keith Whitwell
574715d836 tgsi: fix ureg emit after version token change 2009-12-01 15:01:00 +00:00
Keith Whitwell
b7f94c9002 st/xorg: fix merge droppings
These were stranded in emacs and not saved before committing.
2009-12-01 14:54:32 +00:00
Keith Whitwell
87eec80c11 Merge commit 'origin/tgsi-simplify-ext'
Conflicts:
	src/gallium/drivers/r300/r300_vs.c
2009-12-01 14:31:14 +00:00
Keith Whitwell
06d3732a90 Merge commit 'origin/mesa_7_7_branch'
Conflicts:
	src/gallium/drivers/svga/svga_screen_texture.c
	src/gallium/state_trackers/xorg/xorg_composite.c
	src/gallium/state_trackers/xorg/xorg_exa.c
	src/gallium/state_trackers/xorg/xorg_renderer.c
	src/gallium/state_trackers/xorg/xorg_xv.c
	src/mesa/main/texgetimage.c
	src/mesa/main/version.h
2009-12-01 10:57:37 +00:00
Michal Krol
853d4807fe mesa: Update vertex texture code after gallium changes. 2009-12-01 11:21:21 +01:00
Marek Olšák
af3dea3660 r300g: simplify allocations of VS output registers
No need to parse TGSI tokens since it's easier to walk through shader
semantics.

Also fog coordinates now work reliably.
2009-12-01 01:20:26 -08:00
Marek Olšák
f55c088f89 r300g: simplify allocations of FS input registers 2009-12-01 01:20:26 -08:00
Marek Olšák
cb90235135 r300g: clean up derived states
The state setups which aren't derived anymore have been moved to the VS
and FS objects.
2009-12-01 01:20:26 -08:00
Marek Olšák
6f05eba020 r300g: VS->FS attribute routing rework
Now it always correctly pairs up VS and FS even if the semantics and indices
of VS outputs and FS inputs don't match.
2009-12-01 01:20:26 -08:00
Marek Olšák
759604e32b r300g: add R300 prefix in reg definitions 2009-12-01 01:20:26 -08:00
Michal Krol
7a43c39d20 cso: Fix function prototype. 2009-12-01 10:07:15 +01:00
Michal Krol
57ed791305 trace: Implement separate vertex sampler state. 2009-12-01 09:52:44 +01:00
Michal Krol
f8969db2f8 fo: Implement separate vertex sampler state. 2009-12-01 09:52:42 +01:00
Michal Krol
f2f7bd855a id: Implement separate vertex sampler state. 2009-12-01 09:52:39 +01:00
Michal Krol
3f900c33ae trace: Reduce double semicolons to single ones. 2009-12-01 09:52:37 +01:00
Michal Krol
0f884ed993 sp: Do not falsely advertise support for some SNORM formats. 2009-12-01 09:52:35 +01:00
Michal Krol
8a619e62bf sp: Implement separate vertex sampler state. 2009-12-01 09:52:32 +01:00
Michal Krol
ee86b1b58d python: Update for renamed sampler/texture state setters. 2009-12-01 09:52:30 +01:00
Michal Krol
e197652ce0 st: Update for renamed sampler/texture state setters. 2009-12-01 09:52:27 +01:00
Michal Krol
eeb8dd12b4 trace: Update for renamed sampler/texture state setters. 2009-12-01 09:52:25 +01:00
Michal Krol
8eecd3bafb svga: Update for renamed sampler/texture state setters. 2009-12-01 09:52:23 +01:00
Michal Krol
c1bcedc4ce r300: Update for renamed sampler/texture state setters. 2009-12-01 09:52:20 +01:00
Michal Krol
d15bb1cba3 nv: Update for renamed sampler/texture state setters. 2009-12-01 09:52:18 +01:00
Michal Krol
551b2db82b lp: Update for renamed sampler/texture state setters. 2009-12-01 09:52:15 +01:00
Michal Krol
f0d3abf383 id: Update for renamed sampler/texture state setters. 2009-12-01 09:52:13 +01:00
Michal Krol
25bb04a1ee i915: Update for renamed sampler/texture state setters. 2009-12-01 09:52:11 +01:00
Michal Krol
e04324b8f9 fo: Update for renamed sampler/texture state setters. 2009-12-01 09:52:08 +01:00
Michal Krol
cd3409ce05 cell: Update for renamed sampler/texture state setters. 2009-12-01 09:52:06 +01:00
Michal Krol
204e586c56 vl: Update for renamed sampler/texture state setters. 2009-12-01 09:52:04 +01:00
Michal Krol
f33c064f32 draw: Update for renamed sampler/texture state setters. 2009-12-01 09:52:01 +01:00
Michal Krol
fd4aa4f323 cso: Add support for separate vertex sampler state. 2009-12-01 09:51:59 +01:00
Michal Krol
15d1b406af gallium: Introduce separate vertex texture/sampler state.
Previously, gallium shared sampler and texture state between vertex
and fragment shader stages. This change generalises this concept by
providing separate entrypoints for vertex and fragment sampler state
setting.

A new capability bit is added to query the driver for the number
of samplers that can be utilised by a vertex and fragment shader
at the same time.
2009-12-01 09:51:56 +01:00
Michal Krol
2fd1aee217 tgsi/sanity: Up MAX_REGISTERS to 1024. 2009-12-01 09:51:54 +01:00
Ian Romanick
f17dbe256b mesa: set version string to 7.7-rc1 2009-11-30 17:56:07 -08:00
Ian Romanick
910aaed4da mesa: set version string to 7.6.1-rc2 2009-11-30 17:55:21 -08:00
Ian Romanick
650e02003f Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
Conflicts:
	progs/util/shaderutil.c
	src/mesa/drivers/dri/r600/r600_context.c
	src/mesa/main/version.h
2009-11-30 17:47:07 -08:00
Roland Scheidegger
decf6ed810 fixups for interface changes (mostly state trackers) 2009-11-30 23:02:49 +01:00
Ian Romanick
587a52e95b i915: Actually put i915PointParameterfv in the driver function table. Duh. 2009-11-30 12:43:12 -08:00
Roland Scheidegger
ac400ffce6 gallium: interface cleanups, remove nblocksx/y from pipe_texture and more
This patch removes nblocksx, nblocksy arrays from pipe_texture (can be
recalculated if needed). Furthermore, pipe_format_block struct is gone
completely (again, contains just derived state).
nblocksx, nblocksy, block are also removed from pipe_transfer, together with
the format enum (can be obtained from the texture associated with the transfer).
2009-11-30 20:29:18 +01:00
Keith Whitwell
bb1cde755b i965g: turn on texture tiling by default 2009-11-30 16:16:30 +00:00
Brian Paul
7725744433 st/mesa: handle front/back-face +1/-1 vs. 1/0 conversion
Fixes progs/glsl/twoside.c demo.
2009-11-30 08:57:04 -07:00
Keith Whitwell
6781f624af i965g: pass backbuffer tiling information to driver
The gem winsys gets this information, needs to pass it on.
2009-11-30 15:37:27 +00:00
Keith Whitwell
1fd3a2773b ws/i965: more debug output 2009-11-30 15:37:27 +00:00
Keith Whitwell
1dfdc0a615 ws/i965: rename and change sense of I965_SEND_CMD to BRW_NO_HW 2009-11-30 15:37:27 +00:00
Keith Whitwell
cddc7e3a9c brw: add dumping to gem winsys 2009-11-30 15:37:27 +00:00
Keith Whitwell
4490122d0c i965g: remove redundant nr_attrs member 2009-11-30 15:37:27 +00:00
Vinson Lee
270d36da14 mesa: Fix array out-of-bounds access by _mesa_TexParameterf.
_mesa_TexParameterf calls set_tex_parameterf, which uses the params
argument as an array.
2009-11-29 21:17:44 -05:00