projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into gallium-0.2
[mesa.git]
/
src
/
gallium
/
drivers
/
softpipe
/
sp_fs_exec.c
diff --git
a/src/gallium/drivers/softpipe/sp_fs_exec.c
b/src/gallium/drivers/softpipe/sp_fs_exec.c
index f472dd0ed2ad2d9d7e7d675f8464a807600bc611..453b0373f0feffdf554b2c8fdfb3b3e5e695ba1f 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_fs_exec.c
+++ b/
src/gallium/drivers/softpipe/sp_fs_exec.c
@@
-92,7
+92,7
@@
sp_setup_pos_vector(const struct tgsi_interp_coef *coef,
static void
exec_prepare( const struct sp_fragment_shader *base,
struct tgsi_exec_machine *machine,
- struct tgsi_sampler *samplers )
+ struct tgsi_sampler *
*
samplers )
{
/*
* Bind tokens/shader to the interpreter's machine state.