diff options
| author | Alan Hourihane <[email protected]> | 2008-12-15 11:22:19 +0000 |
|---|---|---|
| committer | Alan Hourihane <[email protected]> | 2008-12-15 11:22:19 +0000 |
| commit | 8abc860bd46a6cd584f9a64cb4613be76f82db06 (patch) | |
| tree | 25b94d69e8ef1198cd45b2d5fc0a6fde196124de /src/gallium/drivers/softpipe | |
| parent | a22d865f93a1db7f72e0bfe216810f67bf4c2f2c (diff) | |
| parent | 3a5d260cb1d2602b9fc32392f18538d0a6ff41c2 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-0.2
Conflicts:
src/gallium/winsys/gdi/SConscript
Diffstat (limited to 'src/gallium/drivers/softpipe')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_state_surface.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/sp_state_surface.c b/src/gallium/drivers/softpipe/sp_state_surface.c index 8877b18af90..b5376e522d8 100644 --- a/src/gallium/drivers/softpipe/sp_state_surface.c +++ b/src/gallium/drivers/softpipe/sp_state_surface.c @@ -34,6 +34,8 @@ #include "sp_surface.h" #include "sp_tile_cache.h" +#include "draw/draw_context.h" + /** * XXX this might get moved someday |