From 8cf9085bc7b96819d2bec1e749e15af58eefb2f3 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Mon, 24 Sep 2007 10:03:25 -0700 Subject: [PATCH] Move i915tex driver into place as just i915. --- configs/freebsd-dri | 2 +- configs/linux-dri | 2 +- src/mesa/drivers/dri/{i915tex => i915}/Makefile | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_context.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_context.h | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_metaops.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_reg.h | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_state.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_tex.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_texblend.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_texstate.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i830_vtbl.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_context.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_context.h | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_debug.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_debug.h | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_debug_fp.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_fragprog.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_metaops.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_program.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_program.h | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_reg.h | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_state.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_tex.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_tex_layout.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_texstate.c | 0 src/mesa/drivers/dri/{i915tex => i915}/i915_vtbl.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_batchbuffer.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_batchbuffer.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_blit.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_blit.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_buffer_objects.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_buffer_objects.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_buffers.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_buffers.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_context.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_context.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_decode.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_decode.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_depthstencil.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_depthstencil.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_fbo.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_fbo.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_ioctl.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_ioctl.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_mipmap_tree.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_mipmap_tree.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_pixel.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_pixel.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_bitmap.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_copy.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_draw.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_read.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_reg.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_regions.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_regions.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_render.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_rotate.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_rotate.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_screen.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_screen.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_span.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_span.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_state.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_structs.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex.h | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex_copy.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex_format.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex_image.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex_layout.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex_subimage.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tex_validate.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tris.c | 0 src/mesa/drivers/dri/{i915tex => i915}/intel_tris.h | 0 src/mesa/drivers/dri/{i915tex => i915}/server/i830_common.h | 0 src/mesa/drivers/dri/{i915tex => i915}/server/i830_dri.h | 0 src/mesa/drivers/dri/{i915tex => i915}/server/intel.h | 0 src/mesa/drivers/dri/{i915tex => i915}/server/intel_dri.c | 0 79 files changed, 2 insertions(+), 2 deletions(-) rename src/mesa/drivers/dri/{i915tex => i915}/Makefile (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_context.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_context.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_metaops.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_reg.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_state.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_tex.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_texblend.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_texstate.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i830_vtbl.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_context.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_context.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_debug.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_debug.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_debug_fp.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_fragprog.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_metaops.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_program.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_program.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_reg.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_state.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_tex.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_tex_layout.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_texstate.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/i915_vtbl.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_batchbuffer.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_batchbuffer.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_blit.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_blit.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_buffer_objects.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_buffer_objects.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_buffers.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_buffers.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_context.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_context.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_decode.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_decode.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_depthstencil.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_depthstencil.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_fbo.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_fbo.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_ioctl.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_ioctl.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_mipmap_tree.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_mipmap_tree.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_pixel.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_pixel.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_bitmap.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_copy.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_draw.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_pixel_read.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_reg.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_regions.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_regions.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_render.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_rotate.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_rotate.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_screen.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_screen.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_span.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_span.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_state.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_structs.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex_copy.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex_format.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex_image.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex_layout.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex_subimage.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tex_validate.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tris.c (100%) rename src/mesa/drivers/dri/{i915tex => i915}/intel_tris.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/server/i830_common.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/server/i830_dri.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/server/intel.h (100%) rename src/mesa/drivers/dri/{i915tex => i915}/server/intel_dri.c (100%) diff --git a/configs/freebsd-dri b/configs/freebsd-dri index e4d6b02bc23..9750017c231 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 3cba192569d..afa2d8ca346 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/Makefile rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_context.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_context.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_metaops.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_reg.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_state.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_tex.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_texblend.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_texstate.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i830_vtbl.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_context.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_context.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_debug.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_debug.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_debug_fp.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_fragprog.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_metaops.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_program.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_program.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_reg.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_state.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_tex.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_tex_layout.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_texstate.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/i915_vtbl.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_batchbuffer.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_batchbuffer.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_blit.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_blit.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_buffer_objects.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_buffer_objects.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_buffers.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_buffers.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_context.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_context.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_decode.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_decode.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_depthstencil.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_depthstencil.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_fbo.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_fbo.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_ioctl.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_ioctl.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_mipmap_tree.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_mipmap_tree.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_pixel.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_pixel.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_pixel_bitmap.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_pixel_copy.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_pixel_draw.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_pixel_read.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_reg.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_regions.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_regions.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_render.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_rotate.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_rotate.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_screen.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_screen.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_span.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_span.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_state.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_structs.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex_copy.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex_format.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex_image.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex_layout.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex_subimage.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tex_validate.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tris.c rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/intel_tris.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/server/i830_common.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/server/i830_dri.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/server/intel.h rename to 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 similarity index 100% rename from src/mesa/drivers/dri/i915tex/server/intel_dri.c rename to src/mesa/drivers/dri/i915/server/intel_dri.c -- 2.30.2