Commit graph

33692 commits

Author SHA1 Message Date
Brian Paul
44519e18a4 softpipe: add option to do polygon stipple in softpipe vs. draw module
For debugging purposes.
2010-04-19 08:51:07 -06:00
Brian Paul
8f3bdeaad6 Merge branch '7.8'
Conflicts:

	src/gallium/auxiliary/draw/draw_context.c
	src/gallium/auxiliary/draw/draw_pipe_aaline.c
	src/gallium/drivers/llvmpipe/lp_context.c
2010-04-19 08:45:20 -06:00
Brian Paul
e3a34cc7f6 gallium/draw: use correct rasterization state for wide/AA points/lines
When points or lines are decomposed into triangles, we need to be sure
to disable polygon culling, stippling, "un-filled" modes, etc.

This patch sets the rasterization state to disable those things prior to
drawing points/lines with triangles, then restores the previous state
afterward.

The new piglit point-no-line-cull test checks this problem & solution.
2010-04-19 08:35:53 -06:00
José Fonseca
857c7c7ca2 docs: Document indexBias. 2010-04-19 15:08:14 +02:00
Dave Airlie
f7c2d4fee3 r300c/r300g: add 3155 rv380 pci id 2010-04-19 19:23:19 +10:00
Vinson Lee
7f8676c0b0 gallivm: Remove redundant initialization of dst_vec_type.
dec_vec_type is already initialized to lp_build_vec_type(dst_type) at
its declaration.
2010-04-19 00:35:02 -07:00
Vinson Lee
57e71b8502 nv50: Fix include recursion.
Don't include nv50_context.h and use a forward declaration instead.
nv50_context.h includes nv50_screen.h (itself).
2010-04-19 00:05:57 -07:00
José Fonseca
c184da9505 gallium: Add index bias parameter to draw_elements and friends.
indexBias corresponds to:
- BaseVertexIndex parameter of D3D9's
  IDirect3DDevice9::DrawIndexedPrimitive method
- BaseVertexLocation parameter of ID3D10Device::DrawIndexed

Although a positive indexBias can be easily be implemented in Gallium by
adding indexBias*stride to each vertex buffer base offset, a negative
indexBias cannot, as the final vertex buffer offset could be negative.

I'm not aware of this functionality being exposed to GL drivers, so for
now all hardware drivers will just assert(indexBias == 0).

See also:
- http://msdn.microsoft.com/en-us/library/bb174369.aspx (D3D9)
- http://msdn.microsoft.com/en-us/library/ff556126.aspx (D3D10 DDI)
2010-04-19 08:56:46 +02:00
Vinson Lee
11cea8196c nvfx: Fix include recursion.
Don't include nvfx_context.h and use a forward reference instead.
nvfx_context.h includes nvfx_screen.h (itself).
2010-04-18 23:44:24 -07:00
Vinson Lee
478f19ff49 auxiliary: Move loop variable declaration outside for loop.
Fixes MSVC build.
2010-04-18 23:21:07 -07:00
Vinson Lee
c628a2e0c7 nvfx: Add missing header and forward declaration. 2010-04-18 23:09:31 -07:00
Vinson Lee
b2fc623497 nouveau: Add missing header. 2010-04-18 23:00:45 -07:00
Vinson Lee
5b83e0ea04 r300g: Remove unnecessary headers. 2010-04-18 22:51:35 -07:00
Vinson Lee
c61db7d200 i915g: Remove unnecessary header. 2010-04-18 22:49:55 -07:00
Vinson Lee
aa5be94139 auxiliary: Initialize variable. 2010-04-18 22:45:18 -07:00
Vinson Lee
349c168a6e auxiliary: Add util/u_surfaces.c to SCons build.
This was missed in commit ac4b8db62d.
2010-04-18 22:38:53 -07:00
Brian Paul
1aaf41fd8a st/mesa: s/st_get_stobj_texture/st_get_stobj_resource/ 2010-04-18 18:02:42 -06:00
Brian Paul
c3016dcee5 st/mesa: s/st_get_texobj_texture/st_get_texobj_resource/ 2010-04-18 18:02:42 -06:00
Brian Paul
5d3d63d45a st/mesa: remove st_texture_object::pipe field
Just pass the pipe context to st_get_texture_sampler_view()
as is done for st_get_renderbuffer_sampler_view().
2010-04-18 18:02:42 -06:00
Brian Paul
073048c872 st/mesa: s/st_renderbuffer_get_sampler_view/st_get_renderbuffer_sampler_view/ 2010-04-18 18:02:42 -06:00
Brian Paul
ef9a619ba9 st/mesa: s/st_sampler_view_from_texture/st_create_texture_sampler_view/ 2010-04-18 18:02:42 -06:00
Brian Paul
8a7ea577ac st/mesa: s/st_get_stobj_sampler_view/st_get_texture_sampler_view/ 2010-04-18 18:02:42 -06:00
Marek Olšák
ec719ae199 r300g: implement TRUNC as floor 2010-04-19 00:36:20 +02:00
Marek Olšák
394803b2cd r300/compiler: lower CEIL 2010-04-19 00:36:20 +02:00
Marek Olšák
e53a1576dd r300/compiler: enable branch emulation for vertex shaders 2010-04-19 00:36:19 +02:00
Marek Olšák
ebd05a798e r300/compiler: optimize CMP for vertex shaders a bit 2010-04-19 00:35:26 +02:00
Nicolai Hähnle
65fd6fb204 r300/compiler: Use memory_pool_array_reserve in deadcode elimination
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
2010-04-19 00:34:02 +02:00
Nicolai Hähnle
0321f9c6f1 r300/compiler: Use memory_pool_array_reserve in r500-fragprog_emit
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
2010-04-19 00:34:02 +02:00
Marek Olšák
340e5e65dc r300/compiler: enable branch emulation for R500 fragment programs 2010-04-19 00:34:02 +02:00
Nicolai Hähnle
4d7ed84431 r300/compiler: Implement branch emulation for R300 fragment programs
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
2010-04-19 00:34:02 +02:00
Luca Barbieri
eeabe9d179 u_inlines: split pipe_surface_init in pipe_surface_reset and *_init 2010-04-18 22:58:09 +02:00
Brian Paul
0490116f96 tgsi: add comment about potential code removal 2010-04-18 10:02:11 -06:00
Brian Paul
8fd0e453d7 softpipe: new comment and assertion for face value 2010-04-18 10:02:11 -06:00
Brian Paul
1673bb38bb tgsi: replace 0xf with TGSI_WRITEMASK_XYZW 2010-04-18 10:02:11 -06:00
Brian Paul
10e4ec448e softpipe: fix computation of fragment[FACE] attribute
In TGSI, front facing is +1 and back-facing is -1.  We were computing
this attribute as +1 and 0 before.  However, the value isn't actually
used anywhere because we machine->Face attribute overrides it in
tgsi_exec.c.  That could be changed, removing some special-case code...
2010-04-18 10:02:11 -06:00
Brian Paul
6756c07b66 softpipe: clean-up and comments 2010-04-18 10:02:11 -06:00
Brian Paul
b806c3056f softpipe: document MAX_QUADS 2010-04-18 10:02:11 -06:00
Marek Olšák
24ceef7a69 r300g: more solid is_buffer_referenced implementation
This fixes crash from 7a1b5c937f,
and also removes the unused "map" pointer.
2010-04-18 17:49:12 +02:00
Luca Barbieri
cea7b9f937 u_surfaces: silence warning 2010-04-18 17:35:17 +02:00
Marek Olšák
69d8b6d5fb Revert "r300g: save vertex buffers around u_blitter calls"
Not sure why it crashes.
2010-04-18 17:02:39 +02:00
Brian Paul
5acee66023 nvfx: move declarations before code 2010-04-18 08:43:42 -06:00
Brian Paul
27322eeb73 nvfx: fix void * arithmetic warning 2010-04-18 08:41:51 -06:00
Brian Paul
b74f4bc6b8 nvfx: move declarations before code 2010-04-18 08:41:25 -06:00
Brian Paul
d84b8cb1a8 llvmpipe: update comment 2010-04-18 08:38:19 -06:00
Brian Paul
d7c336dc49 nvfx: move declarations before code to silence warnings 2010-04-18 08:38:03 -06:00
Luca Barbieri
f9ea7a2ea9 auxiliary: add util_dirty_surfaces to track dirty render temporaries 2010-04-18 16:23:11 +02:00
Luca Barbieri
ac4b8db62d auxiliary: add util_surfaces to track a resource's pipe_surface structs 2010-04-18 16:23:11 +02:00
Luca Barbieri
24af25df2b u_inlines: add function to initialize pipe_surface 2010-04-18 16:23:11 +02:00
Luca Barbieri
2ac088141a nvfx: fix fragment program constant updates 2010-04-18 16:23:11 +02:00
Marek Olšák
7a1b5c937f r300g: do not tell st that a buffer is referenced by hw
It saves a few libdrm calls and unnecessary flushes.
2010-04-18 16:09:21 +02:00