Mesa (master): gallium: Move the dri2 state tracker since we' re about to extend it to dri1.

[Thomas Hellstrom]

Module: Mesa
Branch: master
Commit: 2e5acd24b0421f3824fbe441f4a7062c1f081109
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2e5acd24b0421f3824fbe441f4a7062c1f081109

Author: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Date:   Tue Apr 28 11:32:59 2009 +0200

gallium: Move the dri2 state tracker since we're about to extend it to dri1.

Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>

---

 src/gallium/state_trackers/{dri2 => dri}/Makefile  |    0 
 .../state_trackers/{dri2 => dri}/dri_context.c     |    0 
 .../state_trackers/{dri2 => dri}/dri_context.h     |    0 
 .../state_trackers/{dri2 => dri}/dri_drawable.c    |    0 
 .../state_trackers/{dri2 => dri}/dri_drawable.h    |    0 
 .../state_trackers/{dri2 => dri}/dri_extensions.c  |    0 
 .../state_trackers/{dri2 => dri}/dri_screen.c      |    0 
 .../state_trackers/{dri2 => dri}/dri_screen.h      |    0 
 src/gallium/winsys/drm/intel/dri2/Makefile         |    2 +-
 src/gallium/winsys/drm/nouveau/dri2/Makefile       |    2 +-
 src/gallium/winsys/drm/radeon/dri2/Makefile        |    2 +-
 11 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/state_trackers/dri2/Makefile b/src/gallium/state_trackers/dri/Makefile
similarity index 100%
rename from src/gallium/state_trackers/dri2/Makefile
rename to src/gallium/state_trackers/dri/Makefile
diff --git a/src/gallium/state_trackers/dri2/dri_context.c b/src/gallium/state_trackers/dri/dri_context.c
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_context.c
rename to src/gallium/state_trackers/dri/dri_context.c
diff --git a/src/gallium/state_trackers/dri2/dri_context.h b/src/gallium/state_trackers/dri/dri_context.h
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_context.h
rename to src/gallium/state_trackers/dri/dri_context.h
diff --git a/src/gallium/state_trackers/dri2/dri_drawable.c b/src/gallium/state_trackers/dri/dri_drawable.c
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_drawable.c
rename to src/gallium/state_trackers/dri/dri_drawable.c
diff --git a/src/gallium/state_trackers/dri2/dri_drawable.h b/src/gallium/state_trackers/dri/dri_drawable.h
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_drawable.h
rename to src/gallium/state_trackers/dri/dri_drawable.h
diff --git a/src/gallium/state_trackers/dri2/dri_extensions.c b/src/gallium/state_trackers/dri/dri_extensions.c
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_extensions.c
rename to src/gallium/state_trackers/dri/dri_extensions.c
diff --git a/src/gallium/state_trackers/dri2/dri_screen.c b/src/gallium/state_trackers/dri/dri_screen.c
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_screen.c
rename to src/gallium/state_trackers/dri/dri_screen.c
diff --git a/src/gallium/state_trackers/dri2/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h
similarity index 100%
rename from src/gallium/state_trackers/dri2/dri_screen.h
rename to src/gallium/state_trackers/dri/dri_screen.h
diff --git a/src/gallium/winsys/drm/intel/dri2/Makefile b/src/gallium/winsys/drm/intel/dri2/Makefile
index e7c57af..286ef08 100644
--- a/src/gallium/winsys/drm/intel/dri2/Makefile
+++ b/src/gallium/winsys/drm/intel/dri2/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = i915_dri.so
 
 PIPE_DRIVERS = \
-	$(TOP)/src/gallium/state_trackers/dri2/libdri2drm.a \
+	$(TOP)/src/gallium/state_trackers/dri/libdri2drm.a \
 	$(TOP)/src/gallium/winsys/drm/intel/gem/libinteldrm.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
 	$(TOP)/src/gallium/drivers/i915simple/libi915simple.a
diff --git a/src/gallium/winsys/drm/nouveau/dri2/Makefile b/src/gallium/winsys/drm/nouveau/dri2/Makefile
index 728870d..5e5efbc 100644
--- a/src/gallium/winsys/drm/nouveau/dri2/Makefile
+++ b/src/gallium/winsys/drm/nouveau/dri2/Makefile
@@ -4,7 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = nouveau_dri2.so
 
 PIPE_DRIVERS = \
-	$(TOP)/src/gallium/state_trackers/dri2/libdri2drm.a \
+	$(TOP)/src/gallium/state_trackers/dri/libdri2drm.a \
 	$(TOP)/src/gallium/winsys/drm/nouveau/drm/libnouveaudrm.a \
 	$(TOP)/src/gallium/drivers/nv04/libnv04.a \
 	$(TOP)/src/gallium/drivers/nv10/libnv10.a \
diff --git a/src/gallium/winsys/drm/radeon/dri2/Makefile b/src/gallium/winsys/drm/radeon/dri2/Makefile
index f471c44..58a87da 100644
--- a/src/gallium/winsys/drm/radeon/dri2/Makefile
+++ b/src/gallium/winsys/drm/radeon/dri2/Makefile
@@ -7,7 +7,7 @@ LIBNAME = radeon_dri.so
 MINIGLX_SOURCES =
 
 PIPE_DRIVERS = \
-	$(TOP)/src/gallium/state_trackers/dri2/libdri2drm.a \
+	$(TOP)/src/gallium/state_trackers/dri/libdri2drm.a \
 	$(TOP)/src/gallium/winsys/drm/radeon/core/libradeonwinsys.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
 	$(TOP)/src/gallium/drivers/r300/libr300.a