diff options
| author | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-03-03 00:59:12 +0100 |
| commit | 0eccb1038a620bc76ba45ac00c293b3e88427510 (patch) | |
| tree | 4bd9209ac6e9b824284d47799b13a99a401c6963 /src/mesa/swrast/s_bitmap.c | |
| parent | ed12c29bc45b100b758c9affe2cebe8c8498e25e (diff) | |
| parent | 2e756f3d6f15d61297a3bb4efe6a88c29081a5eb (diff) | |
Merge remote branch 'origin/master' into pipe-video
Diffstat (limited to 'src/mesa/swrast/s_bitmap.c')
| -rw-r--r-- | src/mesa/swrast/s_bitmap.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/swrast/s_bitmap.c b/src/mesa/swrast/s_bitmap.c index 21488d3ba3e..18f1c1866bf 100644 --- a/src/mesa/swrast/s_bitmap.c +++ b/src/mesa/swrast/s_bitmap.c @@ -33,6 +33,7 @@ #include "main/condrender.h" #include "main/image.h" #include "main/macros.h" +#include "main/pbo.h" #include "s_context.h" #include "s_span.h" |