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_tex_sample.c
diff --git
a/src/gallium/drivers/softpipe/sp_tex_sample.c
b/src/gallium/drivers/softpipe/sp_tex_sample.c
index 58a95d13e13b5addf9b131f18429090f8684b00a..49250ec084c811e9ec6cb5452faf86c73c4d7e06 100644
(file)
--- a/
src/gallium/drivers/softpipe/sp_tex_sample.c
+++ b/
src/gallium/drivers/softpipe/sp_tex_sample.c
@@
-39,9
+39,9
@@
#include "sp_tile_cache.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"
-#include "pipe/p_util.h"
#include "tgsi/tgsi_exec.h"
#include "util/u_math.h"
+#include "util/u_memory.h"
/*