diff options
author | Alan Hourihane <alanh@tungstengraphics.com> | 2008-09-11 17:32:18 +0100 |
---|---|---|
committer | Alan Hourihane <alanh@tungstengraphics.com> | 2008-09-11 17:32:18 +0100 |
commit | 47ad296a183929c2007c35c60d722b4ac680417d (patch) | |
tree | 62bcc7af01606d32d7f137ccf8f342c9b0a6774a /src/mesa/drivers/dri/i965/brw_draw_upload.c | |
parent | b6458225039ef4cf5c91080e7547ed73fb264c46 (diff) | |
parent | 4d42c5bebf8740ebfc15571d24b6c92f79e09263 (diff) |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa into gallium-0.2
Conflicts:
src/mesa/drivers/dri/i915/intel_ioctl.c
src/mesa/main/texstore.c
src/mesa/tnl/t_vp_build.c
src/mesa/vbo/vbo_exec_draw.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_draw_upload.c')
-rw-r--r-- | src/mesa/drivers/dri/i965/brw_draw_upload.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c index 0122d18f82..465239f195 100644 --- a/src/mesa/drivers/dri/i965/brw_draw_upload.c +++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c @@ -39,7 +39,6 @@ #include "brw_state.h" #include "brw_fallback.h" -#include "intel_ioctl.h" #include "intel_batchbuffer.h" #include "intel_buffer_objects.h" #include "intel_tex.h" |