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
vor 15 Jahren
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.
vor 15 Jahren
Dave Airlie
f7c2d4fee3
r300c/r300g: add 3155 rv380 pci id
vor 15 Jahren
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.
vor 15 Jahren
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).
vor 15 Jahren
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).
vor 15 Jahren
Vinson Lee
478f19ff49
auxiliary: Move loop variable declaration outside for loop.
Fixes MSVC build.
vor 15 Jahren
Vinson Lee
c628a2e0c7
nvfx: Add missing header and forward declaration.
vor 15 Jahren
Vinson Lee
b2fc623497
nouveau: Add missing header.
vor 15 Jahren
Vinson Lee
5b83e0ea04
r300g: Remove unnecessary headers.
vor 15 Jahren
Vinson Lee
c61db7d200
i915g: Remove unnecessary header.
vor 15 Jahren
Vinson Lee
aa5be94139
auxiliary: Initialize variable.
vor 15 Jahren
Vinson Lee
349c168a6e
auxiliary: Add util/u_surfaces.c to SCons build.
This was missed in commit ac4b8db62d
.
vor 15 Jahren
Brian Paul
1aaf41fd8a
st/mesa: s/st_get_stobj_texture/st_get_stobj_resource/
vor 15 Jahren
Brian Paul
c3016dcee5
st/mesa: s/st_get_texobj_texture/st_get_texobj_resource/
vor 15 Jahren
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().
vor 15 Jahren
Brian Paul
073048c872
st/mesa: s/st_renderbuffer_get_sampler_view/st_get_renderbuffer_sampler_view/
vor 15 Jahren
Brian Paul
ef9a619ba9
st/mesa: s/st_sampler_view_from_texture/st_create_texture_sampler_view/
vor 15 Jahren
Brian Paul
8a7ea577ac
st/mesa: s/st_get_stobj_sampler_view/st_get_texture_sampler_view/
vor 15 Jahren
Marek Olšák
ec719ae199
r300g: implement TRUNC as floor
vor 15 Jahren
Marek Olšák
394803b2cd
r300/compiler: lower CEIL
vor 15 Jahren
Marek Olšák
e53a1576dd
r300/compiler: enable branch emulation for vertex shaders
vor 15 Jahren
Marek Olšák
ebd05a798e
r300/compiler: optimize CMP for vertex shaders a bit
vor 15 Jahren
Nicolai Hähnle
65fd6fb204
r300/compiler: Use memory_pool_array_reserve in deadcode elimination
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
vor 16 Jahren
Nicolai Hähnle
0321f9c6f1
r300/compiler: Use memory_pool_array_reserve in r500-fragprog_emit
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
vor 16 Jahren
Marek Olšák
340e5e65dc
r300/compiler: enable branch emulation for R500 fragment programs
vor 16 Jahren
Nicolai Hähnle
4d7ed84431
r300/compiler: Implement branch emulation for R300 fragment programs
Signed-off-by: Nicolai Hähnle <nhaehnle@gmail.com>
vor 16 Jahren
Luca Barbieri
eeabe9d179
u_inlines: split pipe_surface_init in pipe_surface_reset and *_init
vor 15 Jahren
Brian Paul
0490116f96
tgsi: add comment about potential code removal
vor 15 Jahren
Brian Paul
8fd0e453d7
softpipe: new comment and assertion for face value
vor 15 Jahren
Brian Paul
1673bb38bb
tgsi: replace 0xf with TGSI_WRITEMASK_XYZW
vor 15 Jahren
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...
vor 15 Jahren
Brian Paul
6756c07b66
softpipe: clean-up and comments
vor 15 Jahren
Brian Paul
b806c3056f
softpipe: document MAX_QUADS
vor 15 Jahren
Marek Olšák
24ceef7a69
r300g: more solid is_buffer_referenced implementation
This fixes crash from 7a1b5c937fa32968a04a11649e456a1ef8c5b442,
and also removes the unused "map" pointer.
vor 15 Jahren
Luca Barbieri
cea7b9f937
u_surfaces: silence warning
vor 15 Jahren
Marek Olšák
69d8b6d5fb
Revert "r300g: save vertex buffers around u_blitter calls"
Not sure why it crashes.
vor 15 Jahren
Brian Paul
5acee66023
nvfx: move declarations before code
vor 15 Jahren
Brian Paul
27322eeb73
nvfx: fix void * arithmetic warning
vor 15 Jahren
Brian Paul
b74f4bc6b8
nvfx: move declarations before code
vor 15 Jahren
Brian Paul
d84b8cb1a8
llvmpipe: update comment
vor 15 Jahren
Brian Paul
d7c336dc49
nvfx: move declarations before code to silence warnings
vor 15 Jahren
Luca Barbieri
f9ea7a2ea9
auxiliary: add util_dirty_surfaces to track dirty render temporaries
vor 15 Jahren
Luca Barbieri
ac4b8db62d
auxiliary: add util_surfaces to track a resource's pipe_surface structs
vor 15 Jahren
Luca Barbieri
24af25df2b
u_inlines: add function to initialize pipe_surface
vor 15 Jahren
Luca Barbieri
2ac088141a
nvfx: fix fragment program constant updates
vor 15 Jahren
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.
vor 15 Jahren
Luca Barbieri
bc8fa67926
r300g: save vertex buffers around u_blitter calls
Not strictly needed by the Mesa state tracker, but needed in general.
Only compile tested.
vor 15 Jahren
Luca Barbieri
64aa67a360
u_blitter: add support for saving vertex buffers
Currently r300g does not save vertex buffer on blitter calls.
It gets away with it because the current Mesa state tracker usually
resets vertex buffers on every draw calls.
However, this is wrong.
nvfx won't be lucky because it needs to use the blitter inside draw
calls.
vor 15 Jahren
Luca Barbieri
5df6c43061
p_compiler: add likely/unlikely macros
Defined like the Linux kernel.
A explanatory comment is included.
vor 15 Jahren