diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:14:35 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-09 10:31:08 +1000 |
| commit | d1a9b1f513109c975a5a7ed5a2d0c329b280afe4 (patch) | |
| tree | 5c85af47b4f5af0661acf129e3ce3f59e43cbfd9 /src/mesa/drivers/dri/i965/brw_tex.c | |
| parent | 90ffce497395d8c02fee2ea4ee4c025eede3d876 (diff) | |
| parent | 8648c2685870174cf620ef15de70ef030a8d5a20 (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_tex.c
src/mesa/drivers/dri/r300/r300_cmdbuf.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_swtcl.c
src/mesa/drivers/dri/r300/r300_tex.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/radeon/radeon_tex.c
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_tex.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_tex.c b/src/mesa/drivers/dri/i965/brw_tex.c index ef99e9c1ae..71bff166dd 100644 --- a/src/mesa/drivers/dri/i965/brw_tex.c +++ b/src/mesa/drivers/dri/i965/brw_tex.c @@ -32,21 +32,12 @@ #include "main/glheader.h" #include "main/mtypes.h" -#include "main/imports.h" -#include "main/simple_list.h" -#include "main/enums.h" -#include "main/image.h" #include "main/teximage.h" -#include "main/texstore.h" -#include "main/texformat.h" - -#include "texmem.h" #include "intel_context.h" #include "intel_regions.h" #include "intel_tex.h" #include "brw_context.h" -#include "brw_defines.h" void brw_FrameBufferTexInit( struct brw_context *brw, |