652901e95b
Merge branch 'draw-instanced'
...
Conflicts:
src/gallium/auxiliary/draw/draw_llvm.c
src/gallium/drivers/llvmpipe/lp_state_fs.c
src/glsl/ir_set_program_inouts.cpp
src/mesa/tnl/t_vb_program.c
2011-01-15 10:24:08 -07:00
442fcd0620
llvmpipe: Remove unnecessary headers.
2010-12-22 00:55:41 -08:00
1d6f3543a0
gallivm/llvmpipe: implement system values and instanceID
2010-12-08 19:04:11 -07:00
efc82aef35
gallivm/llvmpipe: squash merge of the llvm-context branch
...
This branch defines a gallivm_state structure which contains the
LLVMBuilderRef, LLVMContextRef, etc. All data structures built with
this object can be periodically freed during a "garbage collection"
operation.
The gallivm_state object has to be passed to most of the builder
functions where LLVMBuilderRef used to be used.
Conflicts:
src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
src/gallium/drivers/llvmpipe/lp_state_setup.c
2010-11-30 16:35:12 -07:00
2996ce72b1
llvmpipe: add a cast
2010-11-02 11:53:14 -06:00
9fbf744389
llvmpipe: assign context's frag shader pointer before using it
...
The call to draw_bind_fragment_shader() was using the old fragment
shader. This bug would have really only effected the draw module's
use of the fragment shader in the wide point stage.
2010-11-02 11:50:37 -06:00
85a08f8fc7
gallivm: Remove the EMMS opcodes.
...
Unnecessary now that lp_set_target_options() successful disables MMX code
emission.
2010-10-28 20:42:02 +01:00
0072acd447
Merge remote branch 'origin/master' into lp-setup-llvm
...
Conflicts:
src/gallium/drivers/llvmpipe/lp_setup_coef.c
src/gallium/drivers/llvmpipe/lp_setup_coef.h
src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
src/gallium/drivers/llvmpipe/lp_setup_point.c
src/gallium/drivers/llvmpipe/lp_setup_tri.c
src/gallium/drivers/llvmpipe/lp_state_derived.c
src/gallium/drivers/llvmpipe/lp_state_fs.h
2010-10-17 19:09:42 -07:00
a0add0446c
llvmpipe: Fix bad refactoring.
...
'i' and 'chan' have random values here, which could cause a buffer
overflow in debug builds, if chan > 4.
2010-10-17 09:58:04 -07:00
ac98519c4e
llvmpipe: validate color outputs against key->nr_cbufs
2010-10-15 14:49:13 +01:00
ffab84c9a2
llvmpipe: check shader outputs are non-null before using
2010-10-15 14:49:13 +01:00
0a1c900103
llvmpipe: don't pass frontfacing as a float
2010-10-15 13:27:47 +01:00
3d7479d705
llvmpipe: code to dump bytecode to file (disabled)
2010-10-14 17:28:24 -06:00
f0bd76f28d
llvmpipe: don't try to emit non-existent color outputs
2010-10-14 14:08:20 +01:00
95c18abb03
llvmpipe: Unbreak Z32_FLOAT.
...
Z32_FLOAT uses <4 x float> as intermediate/destination type,
instead of <4 x i32>.
The necessary bitcasts got removed with commit
5b7eb868fd
2010-10-13 15:25:15 +01:00
986cb9d5cf
llvmpipe: Use lp_tgsi_info.
2010-10-11 13:06:25 +01:00
307df6a858
gallivm: Cleanup the rest of the flow module.
2010-10-09 21:39:14 +01:00
d45c379027
gallivm: Remove support for Phi generation.
...
Simply rely on mem2reg pass. It's easier and more reliable.
2010-10-09 20:14:03 +01:00
cc40abad51
gallivm: Don't generate Phis for execution mask.
2010-10-09 12:55:31 +01:00
5b7eb868fd
llvmpipe: clean up shader pre/postamble, try to catch more early-z
...
Specifically, can do early-depth-test even when alpahtest or
kill-pixel are active, providing we defer the actual z write until the
final mask is avaialable.
Improves demos/fire.c especially in the case where you get close to
the trees.
2010-10-09 11:44:45 +01:00
aa4cb5e2d8
llvmpipe: try to be sensible about whether to branch after mask updates
...
Don't branch more than once in quick succession. Don't branch at the
end of the shader.
2010-10-09 11:44:45 +01:00
d2cf757f44
gallivm: specialized x8z24 depthtest path
...
Avoid unnecessary masking of non-existant stencil component.
2010-10-09 11:44:09 +01:00
954965366f
llvmpipe: dump fragment shader ir and asm when LP_DEBUG=fs
...
Better than GALLIVM_DEBUG if you're only interested in fragment shaders.
2010-10-09 11:43:23 +01:00
40d7be5261
llvmpipe: use alloca for fs color outputs
...
Don't try to emit our own phi's, let llvm mem2reg do it for us.
2010-10-09 11:43:23 +01:00
8009886b00
llvmpipe: defer attribute interpolation until after mask and ztest
...
Don't calculate 1/w for quads which aren't visible...
2010-10-09 11:42:48 +01:00
1c32583581
gallivm: Only apply min/max_lod when necessary.
2010-10-06 18:50:57 +01:00
446dbb9217
llvmpipe: Dump a few missing shader key flags.
2010-10-06 11:41:08 +01:00
591e1bc34f
llvmpipe: make debug_fs_variant respect variant->nr_samplers
2010-10-06 11:40:30 +01:00
87267c71f6
llvmpipe: Make rgb/alpha bland func/factors match, when there is no alpha.
...
Makes AoS blending easier, and state more canonical.
2010-09-22 15:02:39 +01:00
b556bb7c44
llvmpipe: When failing free fs shader too.
2010-09-21 17:51:29 +01:00
955d76c3d2
llvmpipe: maintain fragment shader state for draw module
2010-09-20 12:52:16 -06:00
5b4c43d985
llvmpipe: use llvm for attribute interpolant calculation
...
Basically no change relative to hard-coded version, but this will
be useful for other changes later.
2010-09-18 08:40:17 +01:00
0986355425
llvmpipe: add DEBUG_FS to dump variant information
2010-09-16 17:34:58 +01:00
aeb83928fd
llvmpipe: Initialize variable for potentially unhandled switch case.
2010-09-14 00:17:13 -07:00
67b957781d
llvmpipe: pass linear masks to fragment shader
...
Fragment shader can extract the correct bits for each quad.
2010-09-12 15:03:49 +01:00
853953dc3c
llvmpipe: Only generate the whole shader specialization for opaque shaders.
...
If not opaque, then the color buffer will have to be read any way,
therefore the specialization is pointless.
2010-09-12 10:15:48 +01:00
277d768d10
llvmpipe: Don't store display the alpha ref value in the key.
...
It's never used.
2010-09-11 13:30:14 +01:00
3ec296390c
llvmpipe: remove redundant tgsi_dup_tokens() call
...
We were calling this twice so the first allocation was orphaned/leaked.
2010-09-09 10:04:39 -06:00
9f6e8e1d6b
llvmpipe: use opcodes instead of function pointers in bins
...
Also, move some state from rasterizer struct to the scene.
2010-09-07 14:02:15 +01:00
71e27ef21c
llvmpipe: put fs variant dumping in a function
2010-09-07 13:22:54 +01:00
00989d5bfc
llvmpipe: Relax the colormask constraint on opaque.
...
Also, include the color buffer in the key. Not having it there
causes a tight knots in the logic to determine when it is OK or not
to discard previous color buffer contents.
2010-09-05 10:17:51 +01:00
b6e03eafe3
llvmpipe: fence debugging, add llvmpipe_finish
2010-08-25 10:29:27 +01:00
3d4b60f1f7
llvmpipe: reduce size of fragment shader variant key
...
Don't spend as much time comparing them.
2010-08-22 14:49:17 +01:00
078eff659a
llvmpipe: Fix implicit declaration of lp_func_delete_body warnings.
2010-07-30 11:48:48 -07:00
042018a943
llvmpipe: delete function bodies after generating machine code
2010-07-30 16:25:29 +01:00
e3d2ebac11
llvmpipe: Avoid corrupting the FPU stack with MMX instructions on 32bit OSes.
...
Unfortunately LLVM doesn't emit EMMS itself, and there is no
easy/effective way to disable MMX.
http://llvm.org/bugs/show_bug.cgi?id=3287
2010-07-29 19:10:59 +01:00
d4b64167b5
llvmpipe: pass mask into fragment shader
...
Move this code back out to C for now, will generate separately.
Shader now takes a mask parameter instead of C0/C1/C2/etc.
Shader does not currently use that parameter and rasterizes whole
pixel stamps always.
2010-07-13 17:23:49 +01:00
b5e381d978
llvmpipe: make geometry shaders and stream output work
2010-06-22 12:58:04 -04:00
197636814e
llvmpipe: s/lpfs/shader/
2010-06-21 14:11:15 +01:00
d7f4250333
llvmpipe: Fix pointer dereference after free.
2010-06-18 17:37:37 +01:00
Brian Paul
Vinson Lee
José Fonseca
Keith Whitwell
Zack Rusin