diff options
-rw-r--r-- | configs/freebsd-dri | 2 | ||||
-rw-r--r-- | configs/linux-dri | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/Makefile (renamed from src/mesa/drivers/dri/i915tex/Makefile) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_context.c (renamed from src/mesa/drivers/dri/i915tex/i830_context.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_context.h (renamed from src/mesa/drivers/dri/i915tex/i830_context.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_metaops.c (renamed from src/mesa/drivers/dri/i915tex/i830_metaops.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_reg.h (renamed from src/mesa/drivers/dri/i915tex/i830_reg.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_state.c (renamed from src/mesa/drivers/dri/i915tex/i830_state.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_tex.c (renamed from src/mesa/drivers/dri/i915tex/i830_tex.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_texblend.c (renamed from src/mesa/drivers/dri/i915tex/i830_texblend.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_texstate.c (renamed from src/mesa/drivers/dri/i915tex/i830_texstate.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i830_vtbl.c (renamed from src/mesa/drivers/dri/i915tex/i830_vtbl.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c (renamed from src/mesa/drivers/dri/i915tex/i915_context.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.h (renamed from src/mesa/drivers/dri/i915tex/i915_context.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_debug.c (renamed from src/mesa/drivers/dri/i915tex/i915_debug.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_debug.h (renamed from src/mesa/drivers/dri/i915tex/i915_debug.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_debug_fp.c (renamed from src/mesa/drivers/dri/i915tex/i915_debug_fp.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_fragprog.c (renamed from src/mesa/drivers/dri/i915tex/i915_fragprog.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_metaops.c (renamed from src/mesa/drivers/dri/i915tex/i915_metaops.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_program.c (renamed from src/mesa/drivers/dri/i915tex/i915_program.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_program.h (renamed from src/mesa/drivers/dri/i915tex/i915_program.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_reg.h (renamed from src/mesa/drivers/dri/i915tex/i915_reg.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_state.c (renamed from src/mesa/drivers/dri/i915tex/i915_state.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_tex.c (renamed from src/mesa/drivers/dri/i915tex/i915_tex.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_tex_layout.c (renamed from src/mesa/drivers/dri/i915tex/i915_tex_layout.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c (renamed from src/mesa/drivers/dri/i915tex/i915_texstate.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_vtbl.c (renamed from src/mesa/drivers/dri/i915tex/i915_vtbl.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_batchbuffer.c (renamed from src/mesa/drivers/dri/i915tex/intel_batchbuffer.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_batchbuffer.h (renamed from src/mesa/drivers/dri/i915tex/intel_batchbuffer.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_blit.c (renamed from src/mesa/drivers/dri/i915tex/intel_blit.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_blit.h (renamed from src/mesa/drivers/dri/i915tex/intel_blit.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_buffer_objects.c (renamed from src/mesa/drivers/dri/i915tex/intel_buffer_objects.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_buffer_objects.h (renamed from src/mesa/drivers/dri/i915tex/intel_buffer_objects.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_buffers.c (renamed from src/mesa/drivers/dri/i915tex/intel_buffers.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_buffers.h (renamed from src/mesa/drivers/dri/i915tex/intel_buffers.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.c (renamed from src/mesa/drivers/dri/i915tex/intel_context.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_context.h (renamed from src/mesa/drivers/dri/i915tex/intel_context.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_decode.c (renamed from src/mesa/drivers/dri/i915tex/intel_decode.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_decode.h (renamed from src/mesa/drivers/dri/i915tex/intel_decode.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_depthstencil.c (renamed from src/mesa/drivers/dri/i915tex/intel_depthstencil.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_depthstencil.h (renamed from src/mesa/drivers/dri/i915tex/intel_depthstencil.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_fbo.c (renamed from src/mesa/drivers/dri/i915tex/intel_fbo.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_fbo.h (renamed from src/mesa/drivers/dri/i915tex/intel_fbo.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_ioctl.c (renamed from src/mesa/drivers/dri/i915tex/intel_ioctl.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_ioctl.h (renamed from src/mesa/drivers/dri/i915tex/intel_ioctl.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_mipmap_tree.c (renamed from src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_mipmap_tree.h (renamed from src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel.c (renamed from src/mesa/drivers/dri/i915tex/intel_pixel.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel.h (renamed from src/mesa/drivers/dri/i915tex/intel_pixel.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel_bitmap.c (renamed from src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel_copy.c (renamed from src/mesa/drivers/dri/i915tex/intel_pixel_copy.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel_draw.c (renamed from src/mesa/drivers/dri/i915tex/intel_pixel_draw.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_pixel_read.c (renamed from src/mesa/drivers/dri/i915tex/intel_pixel_read.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_reg.h (renamed from src/mesa/drivers/dri/i915tex/intel_reg.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_regions.c (renamed from src/mesa/drivers/dri/i915tex/intel_regions.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_regions.h (renamed from src/mesa/drivers/dri/i915tex/intel_regions.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_render.c (renamed from src/mesa/drivers/dri/i915tex/intel_render.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_rotate.c (renamed from src/mesa/drivers/dri/i915tex/intel_rotate.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_rotate.h (renamed from src/mesa/drivers/dri/i915tex/intel_rotate.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.c (renamed from src/mesa/drivers/dri/i915tex/intel_screen.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_screen.h (renamed from src/mesa/drivers/dri/i915tex/intel_screen.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_span.c (renamed from src/mesa/drivers/dri/i915tex/intel_span.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_span.h (renamed from src/mesa/drivers/dri/i915tex/intel_span.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_state.c (renamed from src/mesa/drivers/dri/i915tex/intel_state.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_structs.h (renamed from src/mesa/drivers/dri/i915tex/intel_structs.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex.h (renamed from src/mesa/drivers/dri/i915tex/intel_tex.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex_copy.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex_copy.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex_format.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex_format.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex_image.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex_image.c) | 0 | ||||
l--------- | src/mesa/drivers/dri/i915/intel_tex_layout.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex_layout.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex_subimage.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex_subimage.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tex_validate.c (renamed from src/mesa/drivers/dri/i915tex/intel_tex_validate.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tris.c (renamed from src/mesa/drivers/dri/i915tex/intel_tris.c) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/intel_tris.h (renamed from src/mesa/drivers/dri/i915tex/intel_tris.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/server/i830_common.h (renamed from src/mesa/drivers/dri/i915tex/server/i830_common.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/server/i830_dri.h (renamed from src/mesa/drivers/dri/i915tex/server/i830_dri.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/server/intel.h (renamed from src/mesa/drivers/dri/i915tex/server/intel.h) | 0 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/server/intel_dri.c (renamed from src/mesa/drivers/dri/i915tex/server/intel_dri.c) | 0 |
79 files changed, 2 insertions, 2 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index e4d6b02bc2..9750017c23 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -45,6 +45,6 @@ DRM_SOURCE_PATH=$(TOP)/../drm # ffb and gamma are missing because they have not been converted to use the new # interface. -DRI_DIRS = i810 i915tex i965 mach64 mga r128 r200 r300 radeon tdfx \ +DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon tdfx \ unichrome savage sis diff --git a/configs/linux-dri b/configs/linux-dri index 3cba192569..afa2d8ca34 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -66,5 +66,5 @@ WINDOW_SYSTEM=dri # gamma are missing because they have not been converted to use the new # interface. -DRI_DIRS = i810 i915tex i965 mach64 mga r128 r200 r300 radeon s3v \ +DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \ savage sis tdfx trident unichrome ffb diff --git a/src/mesa/drivers/dri/i915tex/Makefile b/src/mesa/drivers/dri/i915/Makefile index d3d0bd570c..d3d0bd570c 100644 --- a/src/mesa/drivers/dri/i915tex/Makefile +++ b/src/mesa/drivers/dri/i915/Makefile diff --git a/src/mesa/drivers/dri/i915tex/i830_context.c b/src/mesa/drivers/dri/i915/i830_context.c index 2ff8621c42..2ff8621c42 100644 --- a/src/mesa/drivers/dri/i915tex/i830_context.c +++ b/src/mesa/drivers/dri/i915/i830_context.c diff --git a/src/mesa/drivers/dri/i915tex/i830_context.h b/src/mesa/drivers/dri/i915/i830_context.h index 9397fa45b5..9397fa45b5 100644 --- a/src/mesa/drivers/dri/i915tex/i830_context.h +++ b/src/mesa/drivers/dri/i915/i830_context.h diff --git a/src/mesa/drivers/dri/i915tex/i830_metaops.c b/src/mesa/drivers/dri/i915/i830_metaops.c index 13e4ab3aac..13e4ab3aac 100644 --- a/src/mesa/drivers/dri/i915tex/i830_metaops.c +++ b/src/mesa/drivers/dri/i915/i830_metaops.c diff --git a/src/mesa/drivers/dri/i915tex/i830_reg.h b/src/mesa/drivers/dri/i915/i830_reg.h index 41280bca7c..41280bca7c 100644 --- a/src/mesa/drivers/dri/i915tex/i830_reg.h +++ b/src/mesa/drivers/dri/i915/i830_reg.h diff --git a/src/mesa/drivers/dri/i915tex/i830_state.c b/src/mesa/drivers/dri/i915/i830_state.c index 3c149e6905..3c149e6905 100644 --- a/src/mesa/drivers/dri/i915tex/i830_state.c +++ b/src/mesa/drivers/dri/i915/i830_state.c diff --git a/src/mesa/drivers/dri/i915tex/i830_tex.c b/src/mesa/drivers/dri/i915/i830_tex.c index fed464d1aa..fed464d1aa 100644 --- a/src/mesa/drivers/dri/i915tex/i830_tex.c +++ b/src/mesa/drivers/dri/i915/i830_tex.c diff --git a/src/mesa/drivers/dri/i915tex/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c index 58f220eb7c..58f220eb7c 100644 --- a/src/mesa/drivers/dri/i915tex/i830_texblend.c +++ b/src/mesa/drivers/dri/i915/i830_texblend.c diff --git a/src/mesa/drivers/dri/i915tex/i830_texstate.c b/src/mesa/drivers/dri/i915/i830_texstate.c index 7613b9d2a6..7613b9d2a6 100644 --- a/src/mesa/drivers/dri/i915tex/i830_texstate.c +++ b/src/mesa/drivers/dri/i915/i830_texstate.c diff --git a/src/mesa/drivers/dri/i915tex/i830_vtbl.c b/src/mesa/drivers/dri/i915/i830_vtbl.c index eecff2729f..eecff2729f 100644 --- a/src/mesa/drivers/dri/i915tex/i830_vtbl.c +++ b/src/mesa/drivers/dri/i915/i830_vtbl.c diff --git a/src/mesa/drivers/dri/i915tex/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 49e30141e4..49e30141e4 100644 --- a/src/mesa/drivers/dri/i915tex/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c diff --git a/src/mesa/drivers/dri/i915tex/i915_context.h b/src/mesa/drivers/dri/i915/i915_context.h index 0be2b3cc8b..0be2b3cc8b 100644 --- a/src/mesa/drivers/dri/i915tex/i915_context.h +++ b/src/mesa/drivers/dri/i915/i915_context.h diff --git a/src/mesa/drivers/dri/i915tex/i915_debug.c b/src/mesa/drivers/dri/i915/i915_debug.c index c0e1242a0e..c0e1242a0e 100644 --- a/src/mesa/drivers/dri/i915tex/i915_debug.c +++ b/src/mesa/drivers/dri/i915/i915_debug.c diff --git a/src/mesa/drivers/dri/i915tex/i915_debug.h b/src/mesa/drivers/dri/i915/i915_debug.h index 0643a8c631..0643a8c631 100644 --- a/src/mesa/drivers/dri/i915tex/i915_debug.h +++ b/src/mesa/drivers/dri/i915/i915_debug.h diff --git a/src/mesa/drivers/dri/i915tex/i915_debug_fp.c b/src/mesa/drivers/dri/i915/i915_debug_fp.c index 84347a01ef..84347a01ef 100644 --- a/src/mesa/drivers/dri/i915tex/i915_debug_fp.c +++ b/src/mesa/drivers/dri/i915/i915_debug_fp.c diff --git a/src/mesa/drivers/dri/i915tex/i915_fragprog.c b/src/mesa/drivers/dri/i915/i915_fragprog.c index 4c3f2236e5..4c3f2236e5 100644 --- a/src/mesa/drivers/dri/i915tex/i915_fragprog.c +++ b/src/mesa/drivers/dri/i915/i915_fragprog.c diff --git a/src/mesa/drivers/dri/i915tex/i915_metaops.c b/src/mesa/drivers/dri/i915/i915_metaops.c index a739bd6581..a739bd6581 100644 --- a/src/mesa/drivers/dri/i915tex/i915_metaops.c +++ b/src/mesa/drivers/dri/i915/i915_metaops.c diff --git a/src/mesa/drivers/dri/i915tex/i915_program.c b/src/mesa/drivers/dri/i915/i915_program.c index ed45e4f806..ed45e4f806 100644 --- a/src/mesa/drivers/dri/i915tex/i915_program.c +++ b/src/mesa/drivers/dri/i915/i915_program.c diff --git a/src/mesa/drivers/dri/i915tex/i915_program.h b/src/mesa/drivers/dri/i915/i915_program.h index 3c12b34f16..3c12b34f16 100644 --- a/src/mesa/drivers/dri/i915tex/i915_program.h +++ b/src/mesa/drivers/dri/i915/i915_program.h diff --git a/src/mesa/drivers/dri/i915tex/i915_reg.h b/src/mesa/drivers/dri/i915/i915_reg.h index a9fa56e8a6..a9fa56e8a6 100644 --- a/src/mesa/drivers/dri/i915tex/i915_reg.h +++ b/src/mesa/drivers/dri/i915/i915_reg.h diff --git a/src/mesa/drivers/dri/i915tex/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index e5d8d27993..e5d8d27993 100644 --- a/src/mesa/drivers/dri/i915tex/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c diff --git a/src/mesa/drivers/dri/i915tex/i915_tex.c b/src/mesa/drivers/dri/i915/i915_tex.c index 59e148ca04..59e148ca04 100644 --- a/src/mesa/drivers/dri/i915tex/i915_tex.c +++ b/src/mesa/drivers/dri/i915/i915_tex.c diff --git a/src/mesa/drivers/dri/i915tex/i915_tex_layout.c b/src/mesa/drivers/dri/i915/i915_tex_layout.c index 7b761a7b22..7b761a7b22 100644 --- a/src/mesa/drivers/dri/i915tex/i915_tex_layout.c +++ b/src/mesa/drivers/dri/i915/i915_tex_layout.c diff --git a/src/mesa/drivers/dri/i915tex/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index 09684e87b4..09684e87b4 100644 --- a/src/mesa/drivers/dri/i915tex/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c diff --git a/src/mesa/drivers/dri/i915tex/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index 35757e17eb..35757e17eb 100644 --- a/src/mesa/drivers/dri/i915tex/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c b/src/mesa/drivers/dri/i915/intel_batchbuffer.c index 8ee48b5a68..8ee48b5a68 100644 --- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.c +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.c diff --git a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h b/src/mesa/drivers/dri/i915/intel_batchbuffer.h index 850a91e1c9..850a91e1c9 100644 --- a/src/mesa/drivers/dri/i915tex/intel_batchbuffer.h +++ b/src/mesa/drivers/dri/i915/intel_batchbuffer.h diff --git a/src/mesa/drivers/dri/i915tex/intel_blit.c b/src/mesa/drivers/dri/i915/intel_blit.c index 5d97f08434..5d97f08434 100644 --- a/src/mesa/drivers/dri/i915tex/intel_blit.c +++ b/src/mesa/drivers/dri/i915/intel_blit.c diff --git a/src/mesa/drivers/dri/i915tex/intel_blit.h b/src/mesa/drivers/dri/i915/intel_blit.h index a66af86359..a66af86359 100644 --- a/src/mesa/drivers/dri/i915tex/intel_blit.h +++ b/src/mesa/drivers/dri/i915/intel_blit.h diff --git a/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c b/src/mesa/drivers/dri/i915/intel_buffer_objects.c index 3c73c402d9..3c73c402d9 100644 --- a/src/mesa/drivers/dri/i915tex/intel_buffer_objects.c +++ b/src/mesa/drivers/dri/i915/intel_buffer_objects.c diff --git a/src/mesa/drivers/dri/i915tex/intel_buffer_objects.h b/src/mesa/drivers/dri/i915/intel_buffer_objects.h index db579a8ae4..db579a8ae4 100644 --- a/src/mesa/drivers/dri/i915tex/intel_buffer_objects.h +++ b/src/mesa/drivers/dri/i915/intel_buffer_objects.h diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.c b/src/mesa/drivers/dri/i915/intel_buffers.c index cb151ab94d..cb151ab94d 100644 --- a/src/mesa/drivers/dri/i915tex/intel_buffers.c +++ b/src/mesa/drivers/dri/i915/intel_buffers.c diff --git a/src/mesa/drivers/dri/i915tex/intel_buffers.h b/src/mesa/drivers/dri/i915/intel_buffers.h index 3b686cb5c1..3b686cb5c1 100644 --- a/src/mesa/drivers/dri/i915tex/intel_buffers.h +++ b/src/mesa/drivers/dri/i915/intel_buffers.h diff --git a/src/mesa/drivers/dri/i915tex/intel_context.c b/src/mesa/drivers/dri/i915/intel_context.c index 16fbe38e64..16fbe38e64 100644 --- a/src/mesa/drivers/dri/i915tex/intel_context.c +++ b/src/mesa/drivers/dri/i915/intel_context.c diff --git a/src/mesa/drivers/dri/i915tex/intel_context.h b/src/mesa/drivers/dri/i915/intel_context.h index 1e9ccd5cdc..1e9ccd5cdc 100644 --- a/src/mesa/drivers/dri/i915tex/intel_context.h +++ b/src/mesa/drivers/dri/i915/intel_context.h diff --git a/src/mesa/drivers/dri/i915tex/intel_decode.c b/src/mesa/drivers/dri/i915/intel_decode.c index bf3387b28e..bf3387b28e 100644 --- a/src/mesa/drivers/dri/i915tex/intel_decode.c +++ b/src/mesa/drivers/dri/i915/intel_decode.c diff --git a/src/mesa/drivers/dri/i915tex/intel_decode.h b/src/mesa/drivers/dri/i915/intel_decode.h index ef0cba153c..ef0cba153c 100644 --- a/src/mesa/drivers/dri/i915tex/intel_decode.h +++ b/src/mesa/drivers/dri/i915/intel_decode.h diff --git a/src/mesa/drivers/dri/i915tex/intel_depthstencil.c b/src/mesa/drivers/dri/i915/intel_depthstencil.c index d269a85a3c..d269a85a3c 100644 --- a/src/mesa/drivers/dri/i915tex/intel_depthstencil.c +++ b/src/mesa/drivers/dri/i915/intel_depthstencil.c diff --git a/src/mesa/drivers/dri/i915tex/intel_depthstencil.h b/src/mesa/drivers/dri/i915/intel_depthstencil.h index 2d3fc48b3a..2d3fc48b3a 100644 --- a/src/mesa/drivers/dri/i915tex/intel_depthstencil.h +++ b/src/mesa/drivers/dri/i915/intel_depthstencil.h diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.c b/src/mesa/drivers/dri/i915/intel_fbo.c index 6f99f401c7..6f99f401c7 100644 --- a/src/mesa/drivers/dri/i915tex/intel_fbo.c +++ b/src/mesa/drivers/dri/i915/intel_fbo.c diff --git a/src/mesa/drivers/dri/i915tex/intel_fbo.h b/src/mesa/drivers/dri/i915/intel_fbo.h index 411d634231..411d634231 100644 --- a/src/mesa/drivers/dri/i915tex/intel_fbo.h +++ b/src/mesa/drivers/dri/i915/intel_fbo.h diff --git a/src/mesa/drivers/dri/i915tex/intel_ioctl.c b/src/mesa/drivers/dri/i915/intel_ioctl.c index 6e76737c78..6e76737c78 100644 --- a/src/mesa/drivers/dri/i915tex/intel_ioctl.c +++ b/src/mesa/drivers/dri/i915/intel_ioctl.c diff --git a/src/mesa/drivers/dri/i915tex/intel_ioctl.h b/src/mesa/drivers/dri/i915/intel_ioctl.h index 7a5b175ed1..7a5b175ed1 100644 --- a/src/mesa/drivers/dri/i915tex/intel_ioctl.h +++ b/src/mesa/drivers/dri/i915/intel_ioctl.h diff --git a/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c index 74f6b2d851..74f6b2d851 100644 --- a/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.c diff --git a/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h index ecdb7be244..ecdb7be244 100644 --- a/src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h +++ b/src/mesa/drivers/dri/i915/intel_mipmap_tree.h diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel.c b/src/mesa/drivers/dri/i915/intel_pixel.c index 9018e3daef..9018e3daef 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel.c +++ b/src/mesa/drivers/dri/i915/intel_pixel.c diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel.h b/src/mesa/drivers/dri/i915/intel_pixel.h index a6fcf90ce0..a6fcf90ce0 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel.h +++ b/src/mesa/drivers/dri/i915/intel_pixel.h diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c index 65bf338589..65bf338589 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_bitmap.c diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel_copy.c b/src/mesa/drivers/dri/i915/intel_pixel_copy.c index 9d478283e4..9d478283e4 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel_copy.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_copy.c diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c b/src/mesa/drivers/dri/i915/intel_pixel_draw.c index afb586b4a3..afb586b4a3 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel_draw.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_draw.c diff --git a/src/mesa/drivers/dri/i915tex/intel_pixel_read.c b/src/mesa/drivers/dri/i915/intel_pixel_read.c index a22844926c..a22844926c 100644 --- a/src/mesa/drivers/dri/i915tex/intel_pixel_read.c +++ b/src/mesa/drivers/dri/i915/intel_pixel_read.c diff --git a/src/mesa/drivers/dri/i915tex/intel_reg.h b/src/mesa/drivers/dri/i915/intel_reg.h index 7828ba6ad3..7828ba6ad3 100644 --- a/src/mesa/drivers/dri/i915tex/intel_reg.h +++ b/src/mesa/drivers/dri/i915/intel_reg.h diff --git a/src/mesa/drivers/dri/i915tex/intel_regions.c b/src/mesa/drivers/dri/i915/intel_regions.c index 4eac859a13..4eac859a13 100644 --- a/src/mesa/drivers/dri/i915tex/intel_regions.c +++ b/src/mesa/drivers/dri/i915/intel_regions.c diff --git a/src/mesa/drivers/dri/i915tex/intel_regions.h b/src/mesa/drivers/dri/i915/intel_regions.h index 42d7b17711..42d7b17711 100644 --- a/src/mesa/drivers/dri/i915tex/intel_regions.h +++ b/src/mesa/drivers/dri/i915/intel_regions.h diff --git a/src/mesa/drivers/dri/i915tex/intel_render.c b/src/mesa/drivers/dri/i915/intel_render.c index c8b6d308d9..c8b6d308d9 100644 --- a/src/mesa/drivers/dri/i915tex/intel_render.c +++ b/src/mesa/drivers/dri/i915/intel_render.c diff --git a/src/mesa/drivers/dri/i915tex/intel_rotate.c b/src/mesa/drivers/dri/i915/intel_rotate.c index 12d98c4ad2..12d98c4ad2 100644 --- a/src/mesa/drivers/dri/i915tex/intel_rotate.c +++ b/src/mesa/drivers/dri/i915/intel_rotate.c diff --git a/src/mesa/drivers/dri/i915tex/intel_rotate.h b/src/mesa/drivers/dri/i915/intel_rotate.h index 9c8802ca47..9c8802ca47 100644 --- a/src/mesa/drivers/dri/i915tex/intel_rotate.h +++ b/src/mesa/drivers/dri/i915/intel_rotate.h diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c index 2721a90094..2721a90094 100644 --- a/src/mesa/drivers/dri/i915tex/intel_screen.c +++ b/src/mesa/drivers/dri/i915/intel_screen.c diff --git a/src/mesa/drivers/dri/i915tex/intel_screen.h b/src/mesa/drivers/dri/i915/intel_screen.h index aa0ef2c509..aa0ef2c509 100644 --- a/src/mesa/drivers/dri/i915tex/intel_screen.h +++ b/src/mesa/drivers/dri/i915/intel_screen.h diff --git a/src/mesa/drivers/dri/i915tex/intel_span.c b/src/mesa/drivers/dri/i915/intel_span.c index d1f8ef06be..d1f8ef06be 100644 --- a/src/mesa/drivers/dri/i915tex/intel_span.c +++ b/src/mesa/drivers/dri/i915/intel_span.c diff --git a/src/mesa/drivers/dri/i915tex/intel_span.h b/src/mesa/drivers/dri/i915/intel_span.h index 5201f6d6c6..5201f6d6c6 100644 --- a/src/mesa/drivers/dri/i915tex/intel_span.h +++ b/src/mesa/drivers/dri/i915/intel_span.h diff --git a/src/mesa/drivers/dri/i915tex/intel_state.c b/src/mesa/drivers/dri/i915/intel_state.c index 271511037e..271511037e 100644 --- a/src/mesa/drivers/dri/i915tex/intel_state.c +++ b/src/mesa/drivers/dri/i915/intel_state.c diff --git a/src/mesa/drivers/dri/i915tex/intel_structs.h b/src/mesa/drivers/dri/i915/intel_structs.h index 522e3bd92c..522e3bd92c 100644 --- a/src/mesa/drivers/dri/i915tex/intel_structs.h +++ b/src/mesa/drivers/dri/i915/intel_structs.h diff --git a/src/mesa/drivers/dri/i915tex/intel_tex.c b/src/mesa/drivers/dri/i915/intel_tex.c index b08dee43bc..b08dee43bc 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex.c +++ b/src/mesa/drivers/dri/i915/intel_tex.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tex.h b/src/mesa/drivers/dri/i915/intel_tex.h index b77d7a1d8a..b77d7a1d8a 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex.h +++ b/src/mesa/drivers/dri/i915/intel_tex.h diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_copy.c b/src/mesa/drivers/dri/i915/intel_tex_copy.c index b85a25642a..b85a25642a 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_copy.c +++ b/src/mesa/drivers/dri/i915/intel_tex_copy.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_format.c b/src/mesa/drivers/dri/i915/intel_tex_format.c index 6e058dff69..6e058dff69 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_format.c +++ b/src/mesa/drivers/dri/i915/intel_tex_format.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_image.c b/src/mesa/drivers/dri/i915/intel_tex_image.c index 197cf35ebe..197cf35ebe 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_image.c +++ b/src/mesa/drivers/dri/i915/intel_tex_image.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_layout.c b/src/mesa/drivers/dri/i915/intel_tex_layout.c index fe61b44194..fe61b44194 120000 --- a/src/mesa/drivers/dri/i915tex/intel_tex_layout.c +++ b/src/mesa/drivers/dri/i915/intel_tex_layout.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_subimage.c b/src/mesa/drivers/dri/i915/intel_tex_subimage.c index 3935787806..3935787806 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/i915/intel_tex_subimage.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tex_validate.c b/src/mesa/drivers/dri/i915/intel_tex_validate.c index af18c26d55..af18c26d55 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tex_validate.c +++ b/src/mesa/drivers/dri/i915/intel_tex_validate.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c index 5fe3d4561f..5fe3d4561f 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tris.c +++ b/src/mesa/drivers/dri/i915/intel_tris.c diff --git a/src/mesa/drivers/dri/i915tex/intel_tris.h b/src/mesa/drivers/dri/i915/intel_tris.h index b7bae8cd3b..b7bae8cd3b 100644 --- a/src/mesa/drivers/dri/i915tex/intel_tris.h +++ b/src/mesa/drivers/dri/i915/intel_tris.h diff --git a/src/mesa/drivers/dri/i915tex/server/i830_common.h b/src/mesa/drivers/dri/i915/server/i830_common.h index a877f3c2f4..a877f3c2f4 100644 --- a/src/mesa/drivers/dri/i915tex/server/i830_common.h +++ b/src/mesa/drivers/dri/i915/server/i830_common.h diff --git a/src/mesa/drivers/dri/i915tex/server/i830_dri.h b/src/mesa/drivers/dri/i915/server/i830_dri.h index c2a3af8cbf..c2a3af8cbf 100644 --- a/src/mesa/drivers/dri/i915tex/server/i830_dri.h +++ b/src/mesa/drivers/dri/i915/server/i830_dri.h diff --git a/src/mesa/drivers/dri/i915tex/server/intel.h b/src/mesa/drivers/dri/i915/server/intel.h index 6ea72499c1..6ea72499c1 100644 --- a/src/mesa/drivers/dri/i915tex/server/intel.h +++ b/src/mesa/drivers/dri/i915/server/intel.h diff --git a/src/mesa/drivers/dri/i915tex/server/intel_dri.c b/src/mesa/drivers/dri/i915/server/intel_dri.c index e49c4214ad..e49c4214ad 100644 --- a/src/mesa/drivers/dri/i915tex/server/intel_dri.c +++ b/src/mesa/drivers/dri/i915/server/intel_dri.c |