Commit Graph

24498 Commits

Author SHA1 Message Date
Brian Paul debc0b6fa8 cso: check if pipe_context::bind_vertex_sampler_states is non-null
Fixes segfaults upon exit when the CSO module is releasing its objects.
2009-12-02 12:24:27 -07:00
Brian Paul d5e5909f17 Revert "llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function"
This reverts commit 792888121b.

We're instead returning 0 for the PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query.
2009-12-02 12:20:15 -07:00
Brian Paul f42192e783 llvmpipe: return 0 for PIPE_CAP_MAX_VERTEX_TEXTURE_UNITS query
The driver (and draw module) don't support vertex shader textures yet.
2009-12-02 12:19:33 -07:00
Brian Paul 792888121b llvmpipe: plug in dummy pipe_context::set_vertex_sampler_textures function
Fixes immediate segfault.
2009-12-02 10:11:05 -07:00
Brian Paul 429bf75417 cell: fix TGSI breakage 2009-12-02 09:23:37 -07:00
Brian Paul 144afacc6f gallium/util: __builtin_bswap32() is in only gcc 4.3 or later 2009-12-02 09:23:15 -07:00
Brian Paul f6d5e58427 gallium/util: added PIPE_CC_GCC_VERSION symbol 2009-12-02 09:22:42 -07:00
Brian Paul 09325b9ff4 mesa: added comment for target_enum_to_index() 2009-12-01 12:28:25 -07:00
Brian Paul e0399fddf2 softpipe: setup machine->Face without a conditional 2009-12-01 12:25:13 -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 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
Ian Romanick 587a52e95b i915: Actually put i915PointParameterfv in the driver function table. Duh. 2009-11-30 12:43:12 -08: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
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
Ian Romanick 533b766007 i915: Fallback bit define missed on previous commit 2009-11-29 17:49:55 -08:00
Ian Romanick 718f31b830 i915: Round point sizes instead of truncate. 2009-11-29 17:43:38 -08:00
Ian Romanick d8d49716cf i915: Enable point sprite coordinate generation
Support still isn't completely correct, but it's better.  piglit
point-sprite now passes.  However, glean's pointSprite test fails.  In
that test the texture on the sprite is somehow inverted as though
GL_POINT_SPRITE_COORD_ORIGIN were set to GL_LOWER_LEFT.  i915 hardware
shouldn't be able to do that!

I believe there are also problems when not all texture units have
GL_COORD_REPLACE set.  The hardware enable seems to be all or nothing.

Fixes bug #25313.
2009-11-29 17:40:02 -08:00