diff options
| author | Eric Anholt <eric@anholt.net> | 2007-05-18 14:14:12 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-05-18 14:14:12 -0700 |
| commit | 1bdee1853627e08894bd267b8f0ec176a1b5978f (patch) | |
| tree | 78c3b8bb81e866de4544d2621abb633b008095ab /src/mesa/drivers/common | |
| parent | c085e350df593ab2af60f53b86265db4c3eab38a (diff) | |
| parent | 4fca6bfa5d211a093c54b0bbeadaa38081e8c141 (diff) | |
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/common/dri_drmpool.c
src/mesa/drivers/dri/i915tex/intel_batchpool.c
src/mesa/drivers/dri/i915tex/intel_buffer_objects.c
src/mesa/drivers/dri/i915tex/intel_regions.c
src/mesa/drivers/dri/i915tex/intel_screen.c
src/mesa/drivers/dri/i915tex/intel_screen.h
Diffstat (limited to 'src/mesa/drivers/common')
| -rw-r--r-- | src/mesa/drivers/common/driverfuncs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c index f543de183a..adf9aafe59 100644 --- a/src/mesa/drivers/common/driverfuncs.c +++ b/src/mesa/drivers/common/driverfuncs.c @@ -28,9 +28,9 @@ #include "buffers.h" #include "context.h" #include "framebuffer.h" -#include "occlude.h" #include "program.h" #include "prog_execute.h" +#include "queryobj.h" #include "renderbuffer.h" #include "texcompress.h" #include "texformat.h" |