diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-05-06 07:45:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-05-06 07:45:28 +0100 |
| commit | 09e6be9b5782870f1f225653687e0d3e7be2a5a9 (patch) | |
| tree | 67215a913d51451b3a3d52f3f0815d4c81f4ff2b /src/mesa/state_tracker/st_atom_sampler.c | |
| parent | 6361d6f48d13ce481253faf106fba5c6a41488ed (diff) | |
| parent | f77442fbd3b539aa3da927630c12c3a1a377f6da (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
Conflicts:
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 0c22e03883..4ce7c41e90 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -32,12 +32,14 @@ */ +#include "main/macros.h" + #include "st_context.h" #include "st_atom.h" #include "st_program.h" #include "pipe/p_context.h" #include "pipe/p_defines.h" -#include "pipe/p_util.h" + #include "cso_cache/cso_context.h" |