projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'mesa_7_7_branch'
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_atom_sampler.c
diff --git
a/src/mesa/state_tracker/st_atom_sampler.c
b/src/mesa/state_tracker/st_atom_sampler.c
index 7b84a86ba485d35762b8888cec48c776760c7b8b..9d63f1c6ab6583b251e8d4d6514b0311477f3421 100644
(file)
--- a/
src/mesa/state_tracker/st_atom_sampler.c
+++ b/
src/mesa/state_tracker/st_atom_sampler.c
@@
-37,7
+37,6
@@
#include "st_context.h"
#include "st_cb_texture.h"
#include "st_atom.h"
-#include "st_program.h"
#include "pipe/p_context.h"
#include "pipe/p_defines.h"