summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gallium/state_trackers/dri/common/dri1_helper.c (renamed from src/gallium/state_trackers/dri/dri1_helper.c)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri1_helper.h (renamed from src/gallium/state_trackers/dri/dri1_helper.h)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_context.c (renamed from src/gallium/state_trackers/dri/dri_context.c)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_context.h (renamed from src/gallium/state_trackers/dri/dri_context.h)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_drawable.c (renamed from src/gallium/state_trackers/dri/dri_drawable.c)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_drawable.h (renamed from src/gallium/state_trackers/dri/dri_drawable.h)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_extensions.c (renamed from src/gallium/state_trackers/dri/dri_extensions.c)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_screen.c (renamed from src/gallium/state_trackers/dri/dri_screen.c)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_screen.h (renamed from src/gallium/state_trackers/dri/dri_screen.h)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_st_api.c (renamed from src/gallium/state_trackers/dri/dri_st_api.c)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_st_api.h (renamed from src/gallium/state_trackers/dri/dri_st_api.h)0
-rw-r--r--src/gallium/state_trackers/dri/common/dri_wrapper.h (renamed from src/gallium/state_trackers/dri/dri_wrapper.h)0
-rw-r--r--src/gallium/state_trackers/dri/drm/Makefile2
-rw-r--r--src/gallium/state_trackers/dri/drm/SConscript2
l---------src/gallium/state_trackers/dri/drm/dri1_helper.c2
l---------src/gallium/state_trackers/dri/drm/dri_context.c2
l---------src/gallium/state_trackers/dri/drm/dri_drawable.c2
l---------src/gallium/state_trackers/dri/drm/dri_extensions.c2
l---------src/gallium/state_trackers/dri/drm/dri_screen.c2
l---------src/gallium/state_trackers/dri/drm/dri_st_api.c2
-rw-r--r--src/gallium/state_trackers/dri/sw/Makefile2
l---------src/gallium/state_trackers/dri/sw/dri1_helper.c2
l---------src/gallium/state_trackers/dri/sw/dri_context.c2
l---------src/gallium/state_trackers/dri/sw/dri_drawable.c2
l---------src/gallium/state_trackers/dri/sw/dri_extensions.c2
l---------src/gallium/state_trackers/dri/sw/dri_screen.c2
l---------src/gallium/state_trackers/dri/sw/dri_st_api.c2
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
index 7eeb868d422..7eeb868d422 100644
--- a/src/gallium/state_trackers/dri/dri1_helper.c
+++ b/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
index 3254b7ff872..3254b7ff872 100644
--- a/src/gallium/state_trackers/dri/dri1_helper.h
+++ b/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
index 34d9a932ead..34d9a932ead 100644
--- a/src/gallium/state_trackers/dri/dri_context.c
+++ b/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
index 24d3d0368a4..24d3d0368a4 100644
--- a/src/gallium/state_trackers/dri/dri_context.h
+++ b/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
index 75b4cc56289..75b4cc56289 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.c
+++ b/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
index 98abeb9ec05..98abeb9ec05 100644
--- a/src/gallium/state_trackers/dri/dri_drawable.h
+++ b/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
index df458e1eb0f..df458e1eb0f 100644
--- a/src/gallium/state_trackers/dri/dri_extensions.c
+++ b/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
index 598a07bb646..598a07bb646 100644
--- a/src/gallium/state_trackers/dri/dri_screen.c
+++ b/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
index 4f59db37cfa..4f59db37cfa 100644
--- a/src/gallium/state_trackers/dri/dri_screen.h
+++ b/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
index 40b24b18e9f..40b24b18e9f 100644
--- a/src/gallium/state_trackers/dri/dri_st_api.c
+++ b/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
index 99a217bfa79..99a217bfa79 100644
--- a/src/gallium/state_trackers/dri/dri_st_api.h
+++ b/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
index 141ba02706a..141ba02706a 100644
--- a/src/gallium/state_trackers/dri/dri_wrapper.h
+++ b/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 c43bfee8b8f..19a755b86f1 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 a9c359c2e89..b974e298f36 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 7006a8d882f..c45ebf5c102 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 989ef4438a1..5cfbbaeb068 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 422c4c1d740..0fc19be6ea6 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 b793f06747d..e0d06dcdfa5 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 938f4c3bdc7..847f6515f25 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 9ae88230ddc..a8f6bd06b09 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 35e31e6466a..75e14fd26cb 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 7006a8d882f..c45ebf5c102 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 989ef4438a1..5cfbbaeb068 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 422c4c1d740..0fc19be6ea6 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 b793f06747d..e0d06dcdfa5 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 938f4c3bdc7..847f6515f25 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 9ae88230ddc..a8f6bd06b09 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