From 8a475cb791a0e66fcdc3fcd12c517fcb98d75957 Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Wed, 8 Aug 2007 09:41:52 +0100 Subject: [PATCH] Rename drivers/dri/i915pipe --> drivers/dri/intel_winsys. This is appropriate as this is not a "pipe driver for the i915" as the old name would suggest, but rather a dri driver that can provide "winsys" backends to softpipe/i915/i965/etc pipe drivers, running under the intel DDX, drm, etc. It also frees up the i915pipe name for something more appropriate, ie mesa/pipe/i915pipe. --- configs/linux-dri | 2 +- src/mesa/drivers/dri/{i915pipe => intel_winsys}/Makefile | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_batchbuffer.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_batchbuffer.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_batchpool.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_blit.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_blit.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_buffers.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_buffers.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_context.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_context.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_depthstencil.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_depthstencil.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_fbo.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_fbo.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_ioctl.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_ioctl.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_mipmap_tree.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_mipmap_tree.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_reg.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_screen.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_screen.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_softpipe.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_surface.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex.c | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_tex_copy.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_tex_format.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_tex_image.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_tex_layout.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_tex_subimage.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/intel_tex_validate.c | 0 .../drivers/dri/{i915pipe => intel_winsys}/server/i830_common.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/server/i830_dri.h | 0 src/mesa/drivers/dri/{i915pipe => intel_winsys}/server/intel.h | 0 .../drivers/dri/{i915pipe => intel_winsys}/server/intel_dri.c | 0 36 files changed, 1 insertion(+), 1 deletion(-) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/Makefile (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_batchbuffer.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_batchbuffer.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_batchpool.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_blit.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_blit.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_buffers.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_buffers.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_context.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_context.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_depthstencil.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_depthstencil.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_fbo.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_fbo.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_ioctl.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_ioctl.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_mipmap_tree.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_mipmap_tree.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_reg.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_screen.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_screen.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_softpipe.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_surface.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex_copy.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex_format.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex_image.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex_layout.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex_subimage.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/intel_tex_validate.c (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/server/i830_common.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/server/i830_dri.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/server/intel.h (100%) rename src/mesa/drivers/dri/{i915pipe => intel_winsys}/server/intel_dri.c (100%) diff --git a/configs/linux-dri b/configs/linux-dri index 6a29505a6b1..63e065a40fa 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -66,4 +66,4 @@ WINDOW_SYSTEM=dri # gamma are missing because they have not been converted to use the new # interface. -DRI_DIRS = i915pipe +DRI_DIRS = intel_winsys diff --git a/src/mesa/drivers/dri/i915pipe/Makefile b/src/mesa/drivers/dri/intel_winsys/Makefile similarity index 100% rename from src/mesa/drivers/dri/i915pipe/Makefile rename to src/mesa/drivers/dri/intel_winsys/Makefile diff --git a/src/mesa/drivers/dri/i915pipe/intel_batchbuffer.c b/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_batchbuffer.c rename to src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_batchbuffer.h b/src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_batchbuffer.h rename to src/mesa/drivers/dri/intel_winsys/intel_batchbuffer.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_batchpool.c b/src/mesa/drivers/dri/intel_winsys/intel_batchpool.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_batchpool.c rename to src/mesa/drivers/dri/intel_winsys/intel_batchpool.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_blit.c b/src/mesa/drivers/dri/intel_winsys/intel_blit.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_blit.c rename to src/mesa/drivers/dri/intel_winsys/intel_blit.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_blit.h b/src/mesa/drivers/dri/intel_winsys/intel_blit.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_blit.h rename to src/mesa/drivers/dri/intel_winsys/intel_blit.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.c b/src/mesa/drivers/dri/intel_winsys/intel_buffers.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_buffers.c rename to src/mesa/drivers/dri/intel_winsys/intel_buffers.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_buffers.h b/src/mesa/drivers/dri/intel_winsys/intel_buffers.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_buffers.h rename to src/mesa/drivers/dri/intel_winsys/intel_buffers.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.c b/src/mesa/drivers/dri/intel_winsys/intel_context.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_context.c rename to src/mesa/drivers/dri/intel_winsys/intel_context.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_context.h b/src/mesa/drivers/dri/intel_winsys/intel_context.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_context.h rename to src/mesa/drivers/dri/intel_winsys/intel_context.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_depthstencil.c b/src/mesa/drivers/dri/intel_winsys/intel_depthstencil.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_depthstencil.c rename to src/mesa/drivers/dri/intel_winsys/intel_depthstencil.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_depthstencil.h b/src/mesa/drivers/dri/intel_winsys/intel_depthstencil.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_depthstencil.h rename to src/mesa/drivers/dri/intel_winsys/intel_depthstencil.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_fbo.c b/src/mesa/drivers/dri/intel_winsys/intel_fbo.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_fbo.c rename to src/mesa/drivers/dri/intel_winsys/intel_fbo.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_fbo.h b/src/mesa/drivers/dri/intel_winsys/intel_fbo.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_fbo.h rename to src/mesa/drivers/dri/intel_winsys/intel_fbo.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_ioctl.c b/src/mesa/drivers/dri/intel_winsys/intel_ioctl.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_ioctl.c rename to src/mesa/drivers/dri/intel_winsys/intel_ioctl.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_ioctl.h b/src/mesa/drivers/dri/intel_winsys/intel_ioctl.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_ioctl.h rename to src/mesa/drivers/dri/intel_winsys/intel_ioctl.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel_winsys/intel_mipmap_tree.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_mipmap_tree.c rename to src/mesa/drivers/dri/intel_winsys/intel_mipmap_tree.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel_winsys/intel_mipmap_tree.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_mipmap_tree.h rename to src/mesa/drivers/dri/intel_winsys/intel_mipmap_tree.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_reg.h b/src/mesa/drivers/dri/intel_winsys/intel_reg.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_reg.h rename to src/mesa/drivers/dri/intel_winsys/intel_reg.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_screen.c b/src/mesa/drivers/dri/intel_winsys/intel_screen.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_screen.c rename to src/mesa/drivers/dri/intel_winsys/intel_screen.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_screen.h b/src/mesa/drivers/dri/intel_winsys/intel_screen.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_screen.h rename to src/mesa/drivers/dri/intel_winsys/intel_screen.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_softpipe.c b/src/mesa/drivers/dri/intel_winsys/intel_softpipe.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_softpipe.c rename to src/mesa/drivers/dri/intel_winsys/intel_softpipe.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_surface.c b/src/mesa/drivers/dri/intel_winsys/intel_surface.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_surface.c rename to src/mesa/drivers/dri/intel_winsys/intel_surface.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex.c b/src/mesa/drivers/dri/intel_winsys/intel_tex.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex.h b/src/mesa/drivers/dri/intel_winsys/intel_tex.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex.h rename to src/mesa/drivers/dri/intel_winsys/intel_tex.h diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_copy.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_copy.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex_copy.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex_copy.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_format.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_format.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex_format.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex_format.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_image.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_image.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex_image.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex_image.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_layout.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_layout.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex_layout.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex_layout.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_subimage.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex_subimage.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex_subimage.c diff --git a/src/mesa/drivers/dri/i915pipe/intel_tex_validate.c b/src/mesa/drivers/dri/intel_winsys/intel_tex_validate.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/intel_tex_validate.c rename to src/mesa/drivers/dri/intel_winsys/intel_tex_validate.c diff --git a/src/mesa/drivers/dri/i915pipe/server/i830_common.h b/src/mesa/drivers/dri/intel_winsys/server/i830_common.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/server/i830_common.h rename to src/mesa/drivers/dri/intel_winsys/server/i830_common.h diff --git a/src/mesa/drivers/dri/i915pipe/server/i830_dri.h b/src/mesa/drivers/dri/intel_winsys/server/i830_dri.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/server/i830_dri.h rename to src/mesa/drivers/dri/intel_winsys/server/i830_dri.h diff --git a/src/mesa/drivers/dri/i915pipe/server/intel.h b/src/mesa/drivers/dri/intel_winsys/server/intel.h similarity index 100% rename from src/mesa/drivers/dri/i915pipe/server/intel.h rename to src/mesa/drivers/dri/intel_winsys/server/intel.h diff --git a/src/mesa/drivers/dri/i915pipe/server/intel_dri.c b/src/mesa/drivers/dri/intel_winsys/server/intel_dri.c similarity index 100% rename from src/mesa/drivers/dri/i915pipe/server/intel_dri.c rename to src/mesa/drivers/dri/intel_winsys/server/intel_dri.c -- 2.30.2