diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-16 16:30:22 +1100 |
| commit | 87e3301533aa4d3e6e98db139887ebba3d217f7d (patch) | |
| tree | ad80803f8f90263ea4c9adf9b3e7dd8eae4b05fa /src/mesa/state_tracker/st_cb_readpixels.c | |
| parent | 49405c43f245d3b3ddd12e891413bf7ead23145c (diff) | |
| parent | 3320b1874e810583f95b93a89697b2955987b84f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
configs/linux-dri
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/state_tracker/st_cb_readpixels.c')
| -rw-r--r-- | src/mesa/state_tracker/st_cb_readpixels.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_cb_readpixels.c b/src/mesa/state_tracker/st_cb_readpixels.c index 868c5f3c5f..c89c74229e 100644 --- a/src/mesa/state_tracker/st_cb_readpixels.c +++ b/src/mesa/state_tracker/st_cb_readpixels.c @@ -40,7 +40,7 @@ #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "pipe/p_inlines.h" -#include "pipe/util/p_tile.h" +#include "util/p_tile.h" #include "st_context.h" #include "st_cb_readpixels.h" #include "st_cb_fbo.h" |