Mesa (master): st/dri: Move common files to common directory

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Thu Mar 25 16:39:23 PDT 2010 

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

Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date:   Thu Mar 25 18:51:52 2010 +0100

st/dri: Move common files to common directory

 27 files changed, 15 insertions(+), 15 deletions(-)
 rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri1_helper.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_context.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_context.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_drawable.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_extensions.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_screen.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_screen.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.c (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_st_api.h (100%)
 rename src/gallium/state_trackers/dri/{ => common}/dri_wrapper.h (100%)

---

 .../state_trackers/dri/{ => common}/dri1_helper.c  |    0 
 .../state_trackers/dri/{ => common}/dri1_helper.h  |    0 
 .../state_trackers/dri/{ => common}/dri_context.c  |    0 
 .../state_trackers/dri/{ => common}/dri_context.h  |    0 
 .../state_trackers/dri/{ => common}/dri_drawable.c |    0 
 .../state_trackers/dri/{ => common}/dri_drawable.h |    0 
 .../dri/{ => common}/dri_extensions.c              |    0 
 .../state_trackers/dri/{ => common}/dri_screen.c   |    0 
 .../state_trackers/dri/{ => common}/dri_screen.h   |    0 
 .../state_trackers/dri/{ => common}/dri_st_api.c   |    0 
 .../state_trackers/dri/{ => common}/dri_st_api.h   |    0 
 .../state_trackers/dri/{ => common}/dri_wrapper.h  |    0 
 src/gallium/state_trackers/dri/drm/Makefile        |    2 +-
 src/gallium/state_trackers/dri/drm/SConscript      |    2 +-
 src/gallium/state_trackers/dri/drm/dri1_helper.c   |    2 +-
 src/gallium/state_trackers/dri/drm/dri_context.c   |    2 +-
 src/gallium/state_trackers/dri/drm/dri_drawable.c  |    2 +-
 .../state_trackers/dri/drm/dri_extensions.c        |    2 +-
 src/gallium/state_trackers/dri/drm/dri_screen.c    |    2 +-
 src/gallium/state_trackers/dri/drm/dri_st_api.c    |    2 +-
 src/gallium/state_trackers/dri/sw/Makefile         |    2 +-
 src/gallium/state_trackers/dri/sw/dri1_helper.c    |    2 +-
 src/gallium/state_trackers/dri/sw/dri_context.c    |    2 +-
 src/gallium/state_trackers/dri/sw/dri_drawable.c   |    2 +-
 src/gallium/state_trackers/dri/sw/dri_extensions.c |    2 +-
 src/gallium/state_trackers/dri/sw/dri_screen.c     |    2 +-
 src/gallium/state_trackers/dri/sw/dri_st_api.c     |    2 +-
 27 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/gallium/state_trackers/dri/dri1_helper.c b/src/gallium/state_trackers/dri/common/dri1_helper.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri1_helper.c
rename to src/gallium/state_trackers/dri/common/dri1_helper.c
diff --git a/src/gallium/state_trackers/dri/dri1_helper.h b/src/gallium/state_trackers/dri/common/dri1_helper.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri1_helper.h
rename to src/gallium/state_trackers/dri/common/dri1_helper.h
diff --git a/src/gallium/state_trackers/dri/dri_context.c b/src/gallium/state_trackers/dri/common/dri_context.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_context.c
rename to src/gallium/state_trackers/dri/common/dri_context.c
diff --git a/src/gallium/state_trackers/dri/dri_context.h b/src/gallium/state_trackers/dri/common/dri_context.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_context.h
rename to src/gallium/state_trackers/dri/common/dri_context.h
diff --git a/src/gallium/state_trackers/dri/dri_drawable.c b/src/gallium/state_trackers/dri/common/dri_drawable.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_drawable.c
rename to src/gallium/state_trackers/dri/common/dri_drawable.c
diff --git a/src/gallium/state_trackers/dri/dri_drawable.h b/src/gallium/state_trackers/dri/common/dri_drawable.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_drawable.h
rename to src/gallium/state_trackers/dri/common/dri_drawable.h
diff --git a/src/gallium/state_trackers/dri/dri_extensions.c b/src/gallium/state_trackers/dri/common/dri_extensions.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_extensions.c
rename to src/gallium/state_trackers/dri/common/dri_extensions.c
diff --git a/src/gallium/state_trackers/dri/dri_screen.c b/src/gallium/state_trackers/dri/common/dri_screen.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_screen.c
rename to src/gallium/state_trackers/dri/common/dri_screen.c
diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/common/dri_screen.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_screen.h
rename to src/gallium/state_trackers/dri/common/dri_screen.h
diff --git a/src/gallium/state_trackers/dri/dri_st_api.c b/src/gallium/state_trackers/dri/common/dri_st_api.c
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_st_api.c
rename to src/gallium/state_trackers/dri/common/dri_st_api.c
diff --git a/src/gallium/state_trackers/dri/dri_st_api.h b/src/gallium/state_trackers/dri/common/dri_st_api.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_st_api.h
rename to src/gallium/state_trackers/dri/common/dri_st_api.h
diff --git a/src/gallium/state_trackers/dri/dri_wrapper.h b/src/gallium/state_trackers/dri/common/dri_wrapper.h
similarity index 100%
rename from src/gallium/state_trackers/dri/dri_wrapper.h
rename to src/gallium/state_trackers/dri/common/dri_wrapper.h
diff --git a/src/gallium/state_trackers/dri/drm/Makefile b/src/gallium/state_trackers/dri/drm/Makefile
index c43bfee..19a755b 100644
--- a/src/gallium/state_trackers/dri/drm/Makefile
+++ b/src/gallium/state_trackers/dri/drm/Makefile
@@ -6,7 +6,7 @@ LIBNAME = dridrm
 LIBRARY_INCLUDES = \
 	-I$(TOP)/include \
 	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/gallium/state_trackers/dri \
+	-I$(TOP)/src/gallium/state_trackers/dri/common \
 	-I$(TOP)/src/mesa/drivers/dri/common \
 	-I$(TOP)/src/mesa/main \
          $(shell pkg-config --cflags-only-I libdrm)
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index a9c359c..b974e29 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -9,7 +9,7 @@ if env['dri']:
 
     env.Append(CPPPATH = [
         '#/src/mesa',
-	'#/src/gallium/state_trackers/dri',
+	'#/src/gallium/state_trackers/dri/common',
 	'#/src/mesa/drivers/dri/common',
     ])
 
diff --git a/src/gallium/state_trackers/dri/drm/dri1_helper.c b/src/gallium/state_trackers/dri/drm/dri1_helper.c
index 7006a8d..c45ebf5 120000
--- a/src/gallium/state_trackers/dri/drm/dri1_helper.c
+++ b/src/gallium/state_trackers/dri/drm/dri1_helper.c
@@ -1 +1 @@
-../dri1_helper.c
\ No newline at end of file
+../common/dri1_helper.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_context.c b/src/gallium/state_trackers/dri/drm/dri_context.c
index 989ef44..5cfbbae 120000
--- a/src/gallium/state_trackers/dri/drm/dri_context.c
+++ b/src/gallium/state_trackers/dri/drm/dri_context.c
@@ -1 +1 @@
-../dri_context.c
\ No newline at end of file
+../common/dri_context.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_drawable.c b/src/gallium/state_trackers/dri/drm/dri_drawable.c
index 422c4c1..0fc19be 120000
--- a/src/gallium/state_trackers/dri/drm/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/drm/dri_drawable.c
@@ -1 +1 @@
-../dri_drawable.c
\ No newline at end of file
+../common/dri_drawable.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_extensions.c b/src/gallium/state_trackers/dri/drm/dri_extensions.c
index b793f06..e0d06dc 120000
--- a/src/gallium/state_trackers/dri/drm/dri_extensions.c
+++ b/src/gallium/state_trackers/dri/drm/dri_extensions.c
@@ -1 +1 @@
-../dri_extensions.c
\ No newline at end of file
+../common/dri_extensions.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_screen.c b/src/gallium/state_trackers/dri/drm/dri_screen.c
index 938f4c3..847f651 120000
--- a/src/gallium/state_trackers/dri/drm/dri_screen.c
+++ b/src/gallium/state_trackers/dri/drm/dri_screen.c
@@ -1 +1 @@
-../dri_screen.c
\ No newline at end of file
+../common/dri_screen.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/drm/dri_st_api.c b/src/gallium/state_trackers/dri/drm/dri_st_api.c
index 9ae8823..a8f6bd0 120000
--- a/src/gallium/state_trackers/dri/drm/dri_st_api.c
+++ b/src/gallium/state_trackers/dri/drm/dri_st_api.c
@@ -1 +1 @@
-../dri_st_api.c
\ No newline at end of file
+../common/dri_st_api.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/Makefile b/src/gallium/state_trackers/dri/sw/Makefile
index 35e31e6..75e14fd 100644
--- a/src/gallium/state_trackers/dri/sw/Makefile
+++ b/src/gallium/state_trackers/dri/sw/Makefile
@@ -9,7 +9,7 @@ LIBRARY_INCLUDES = \
 	-I../dri \
 	-I$(TOP)/include \
 	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/gallium/state_trackers/dri \
+	-I$(TOP)/src/gallium/state_trackers/dri/common \
 	-I$(TOP)/src/mesa/drivers/dri/common \
 	-I$(TOP)/src/mesa/main \
 	-D__NOT_HAVE_DRM_H
diff --git a/src/gallium/state_trackers/dri/sw/dri1_helper.c b/src/gallium/state_trackers/dri/sw/dri1_helper.c
index 7006a8d..c45ebf5 120000
--- a/src/gallium/state_trackers/dri/sw/dri1_helper.c
+++ b/src/gallium/state_trackers/dri/sw/dri1_helper.c
@@ -1 +1 @@
-../dri1_helper.c
\ No newline at end of file
+../common/dri1_helper.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_context.c b/src/gallium/state_trackers/dri/sw/dri_context.c
index 989ef44..5cfbbae 120000
--- a/src/gallium/state_trackers/dri/sw/dri_context.c
+++ b/src/gallium/state_trackers/dri/sw/dri_context.c
@@ -1 +1 @@
-../dri_context.c
\ No newline at end of file
+../common/dri_context.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_drawable.c b/src/gallium/state_trackers/dri/sw/dri_drawable.c
index 422c4c1..0fc19be 120000
--- a/src/gallium/state_trackers/dri/sw/dri_drawable.c
+++ b/src/gallium/state_trackers/dri/sw/dri_drawable.c
@@ -1 +1 @@
-../dri_drawable.c
\ No newline at end of file
+../common/dri_drawable.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_extensions.c b/src/gallium/state_trackers/dri/sw/dri_extensions.c
index b793f06..e0d06dc 120000
--- a/src/gallium/state_trackers/dri/sw/dri_extensions.c
+++ b/src/gallium/state_trackers/dri/sw/dri_extensions.c
@@ -1 +1 @@
-../dri_extensions.c
\ No newline at end of file
+../common/dri_extensions.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_screen.c b/src/gallium/state_trackers/dri/sw/dri_screen.c
index 938f4c3..847f651 120000
--- a/src/gallium/state_trackers/dri/sw/dri_screen.c
+++ b/src/gallium/state_trackers/dri/sw/dri_screen.c
@@ -1 +1 @@
-../dri_screen.c
\ No newline at end of file
+../common/dri_screen.c
\ No newline at end of file
diff --git a/src/gallium/state_trackers/dri/sw/dri_st_api.c b/src/gallium/state_trackers/dri/sw/dri_st_api.c
index 9ae8823..a8f6bd0 120000
--- a/src/gallium/state_trackers/dri/sw/dri_st_api.c
+++ b/src/gallium/state_trackers/dri/sw/dri_st_api.c
@@ -1 +1 @@
-../dri_st_api.c
\ No newline at end of file
+../common/dri_st_api.c
\ No newline at end of file

More information about the mesa-commit mailing list