diff options
author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
---|---|---|
committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-27 00:34:31 +1100 |
commit | 68ef52886263690632552ae187a4673945c2ab74 (patch) | |
tree | 0453c0063397c196ebe5e3dcd4d9c91392496d77 /src/gallium/drivers/softpipe/sp_fs_llvm.c | |
parent | 026e2fd3c6eb87a010a9c90341e8a77b09376b5b (diff) | |
parent | ad6bb870de6103ed240fa1f9f828bd13a4401a9a (diff) |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_fs_llvm.c')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_fs_llvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_fs_llvm.c b/src/gallium/drivers/softpipe/sp_fs_llvm.c index 22da471453..34b2b7d4e2 100644 --- a/src/gallium/drivers/softpipe/sp_fs_llvm.c +++ b/src/gallium/drivers/softpipe/sp_fs_llvm.c @@ -146,7 +146,7 @@ shade_quad_llvm(struct quad_stage *qs, unsigned -run_llvm_fs( struct sp_fragment_shader *base, +run_llvm_fs( const struct sp_fragment_shader *base, struct foo *machine ) { } |