gallium: Make all drm drivers use the new drm compat helper

diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile
index fdcfd08c2275ad44d48867e8ad2b8fa2aba570a2..24ef989ad2a7d679acb8586318f3033474af069a 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile
+++ b/src/gallium/targets/dri-i915/Makefile
@@ -13,6 +13,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/i915/libi915.a
 
 C_SOURCES = \
+       target.c \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 

diff --git a/src/gallium/targets/dri-i915/SConscript b/src/gallium/targets/dri-i915/SConscript
index 65c423988755d4d93acc8629f78bde9aeaa6d842..5da2a0a4036a59e4c34ea556c0da99aba10b3196 100644 (file)
--- a/src/gallium/targets/dri-i915/SConscript
+++ b/src/gallium/targets/dri-i915/SConscript
@@ -22,6 +22,6 @@ env.Prepend(LIBS = [
 
 env.LoadableModule(
     target = 'i915_dri.so',
-    source = 'dummy.c',
+    source = 'target.c',
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/targets/dri-i915/dummy.c b/src/gallium/targets/dri-i915/dummy.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/gallium/targets/dri-i915/target.c b/src/gallium/targets/dri-i915/target.c
new file mode 100644 (file)
index 0000000..8fd7308
--- /dev/null
+++ b/src/gallium/targets/dri-i915/target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("i915", "i915")

diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index 13987c643e20393ca6ce03e7612607aa78f22f67..b068430ecf77ba6c4ff180609ed93959a5ede9d5 100644 (file)
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -15,6 +15,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/i965/libi965.a
 
 C_SOURCES = \
+       target.c \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 

diff --git a/src/gallium/targets/dri-i965/SConscript b/src/gallium/targets/dri-i965/SConscript
index 13ac5a2d8ea6f058b3fb938c22ab758f47fd416c..9e12c61aabc7fc10d9a5e422a98f29389cbe2990 100644 (file)
--- a/src/gallium/targets/dri-i965/SConscript
+++ b/src/gallium/targets/dri-i965/SConscript
@@ -24,6 +24,6 @@ env.Prepend(LIBS = [
 
 env.LoadableModule(
     target = 'i965_dri.so',
-    source = 'dummy.c',
+    source = 'target.c',
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/targets/dri-i965/dummy.c b/src/gallium/targets/dri-i965/dummy.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/gallium/targets/dri-i965/target.c b/src/gallium/targets/dri-i965/target.c
new file mode 100644 (file)
index 0000000..9fe2227
--- /dev/null
+++ b/src/gallium/targets/dri-i965/target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("i965", "i915")

diff --git a/src/gallium/targets/dri-nouveau/Makefile b/src/gallium/targets/dri-nouveau/Makefile
index 74d352c6a705fffadc570f0e03690f862f357e10..bf594ce483e35f471cedc604734dfb642d069667 100644 (file)
--- a/src/gallium/targets/dri-nouveau/Makefile
+++ b/src/gallium/targets/dri-nouveau/Makefile
@@ -11,6 +11,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/nouveau/libnouveau.a
 
 C_SOURCES = \
+       target.c \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 

diff --git a/src/gallium/targets/dri-nouveau/target.c b/src/gallium/targets/dri-nouveau/target.c
new file mode 100644 (file)
index 0000000..e16e86c
--- /dev/null
+++ b/src/gallium/targets/dri-nouveau/target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("nouveau", "nouveau")

diff --git a/src/gallium/targets/dri-r600/Makefile b/src/gallium/targets/dri-r600/Makefile
index 0213200fbcc3e8f6ce1fd221ca34c9e099c9697c..136fbb260b474f29ab0d838af6d7a8c1dd8ca120 100644 (file)
--- a/src/gallium/targets/dri-r600/Makefile
+++ b/src/gallium/targets/dri-r600/Makefile
@@ -12,6 +12,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/r600/libr600.a
 
 C_SOURCES = \
+       target.c \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 

diff --git a/src/gallium/targets/dri-r600/SConscript b/src/gallium/targets/dri-r600/SConscript
index 6c23c050eb863adfb62d25bf90e3252487410b97..d24251673c610b0e96fcd3d37bbab1ca12c27785 100644 (file)
--- a/src/gallium/targets/dri-r600/SConscript
+++ b/src/gallium/targets/dri-r600/SConscript
@@ -22,6 +22,6 @@ env.Prepend(LIBS = [
 
 env.SharedLibrary(
     target ='r600_dri.so',
-    source = 'dummy.c',
+    source = 'target.c',
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/targets/dri-r600/dummy.c b/src/gallium/targets/dri-r600/dummy.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/gallium/targets/dri-r600/target.c b/src/gallium/targets/dri-r600/target.c
new file mode 100644 (file)
index 0000000..3f09a7c
--- /dev/null
+++ b/src/gallium/targets/dri-r600/target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("r600", "radeon")

diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile
index 8ef24c08215ff85af6e391f6dec9f743c6ebe201..d67d7d7ac23c348fe2aaec74873c5ef03b1fd1e7 100644 (file)
--- a/src/gallium/targets/dri-radeong/Makefile
+++ b/src/gallium/targets/dri-radeong/Makefile
@@ -12,6 +12,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/r300/libr300.a
 
 C_SOURCES = \
+       target.c \
        $(COMMON_GALLIUM_SOURCES) \
        $(DRIVER_SOURCES)
 

diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-radeong/SConscript
index 4c6cfb84ebade0ed5b80dd5658ee0aa373dd4573..c1d4eeecee6026c4a3b315283f39a066a0bfc1d3 100644 (file)
--- a/src/gallium/targets/dri-radeong/SConscript
+++ b/src/gallium/targets/dri-radeong/SConscript
@@ -22,6 +22,6 @@ env.Prepend(LIBS = [
 
 env.SharedLibrary(
     target ='radeon_dri.so',
-    source = 'dummy.c',
+    source = 'target.c',
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/targets/dri-radeong/dummy.c b/src/gallium/targets/dri-radeong/dummy.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/gallium/targets/dri-radeong/target.c b/src/gallium/targets/dri-radeong/target.c
new file mode 100644 (file)
index 0000000..06b6482
--- /dev/null
+++ b/src/gallium/targets/dri-radeong/target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("radeon", "radeon")

diff --git a/src/gallium/targets/dri-vmwgfx/Makefile b/src/gallium/targets/dri-vmwgfx/Makefile
index b5b679f3c7c9e558093b9d24e9d8180ac9fdc2b7..8e3cd6ff28a4e5f4fe9e88ef38d0af5e2f913c85 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/Makefile
+++ b/src/gallium/targets/dri-vmwgfx/Makefile
@@ -11,6 +11,7 @@ PIPE_DRIVERS = \
        $(TOP)/src/gallium/drivers/svga/libsvga.a
 
 C_SOURCES = \
+       target.c \
        $(COMMON_GALLIUM_SOURCES)
 
 include ../Makefile.dri

diff --git a/src/gallium/targets/dri-vmwgfx/SConscript b/src/gallium/targets/dri-vmwgfx/SConscript
index 09a0c254c304e651f36190e9a757e2fcdd4fe6e7..3d0c5495da193b5ae4dab37f299ed76dbd65e2eb 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/SConscript
+++ b/src/gallium/targets/dri-vmwgfx/SConscript
@@ -20,6 +20,6 @@ env.Prepend(LIBS = [
 
 env.LoadableModule(
     target = 'vmwgfx_dri.so',
-    source = 'dummy.c',
+    source = 'target.c',
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/targets/dri-vmwgfx/dummy.c b/src/gallium/targets/dri-vmwgfx/dummy.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/src/gallium/targets/dri-vmwgfx/target.c b/src/gallium/targets/dri-vmwgfx/target.c
new file mode 100644 (file)
index 0000000..3d1990f
--- /dev/null
+++ b/src/gallium/targets/dri-vmwgfx/target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("vmwgfx", "vmwgfx")

diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile
index a4b41842ff75d9700d2027e37187f3b67656b500..a118f169299154d32340de31ae437bc2b7d76ebf 100644 (file)
--- a/src/gallium/targets/egl-i915/Makefile
+++ b/src/gallium/targets/egl-i915/Makefile
@@ -2,7 +2,7 @@ TOP = ../../../..
 include $(TOP)/configs/current
 
 EGL_DRIVER_NAME = i915
-EGL_DRIVER_SOURCES = dummy.c
+EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_PIPES = \

diff --git a/src/gallium/targets/egl-i915/dummy.c b/src/gallium/targets/egl-i915/dummy.c
deleted file mode 100644 (file)
index 3181d0b..0000000
--- a/src/gallium/targets/egl-i915/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* A poor man's --whole-archive for EGL drivers */
-void *_eglMain(void *);
-void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-i915/target.c b/src/gallium/targets/egl-i915/target.c
new file mode 100644 (file)
index 0000000..fd68c4b
--- /dev/null
+++ b/src/gallium/targets/egl-i915/target.c
@@ -0,0 +1,8 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("i915", "i915")
+
+/* A poor man's --whole-archive for EGL drivers */
+void *_eglMain(void *);
+void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-i965/Makefile b/src/gallium/targets/egl-i965/Makefile
index d4730824a5b2e55e827c72823e991a49caa1a5e5..542200481d17a67a9ac1d95b506742b4a0cecaeb 100644 (file)
--- a/src/gallium/targets/egl-i965/Makefile
+++ b/src/gallium/targets/egl-i965/Makefile
@@ -2,7 +2,7 @@ TOP = ../../../..
 include $(TOP)/configs/current
 
 EGL_DRIVER_NAME = i965
-EGL_DRIVER_SOURCES = dummy.c
+EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_intel
 
 EGL_DRIVER_PIPES = \

diff --git a/src/gallium/targets/egl-i965/dummy.c b/src/gallium/targets/egl-i965/dummy.c
deleted file mode 100644 (file)
index 3181d0b..0000000
--- a/src/gallium/targets/egl-i965/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* A poor man's --whole-archive for EGL drivers */
-void *_eglMain(void *);
-void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-i965/target.c b/src/gallium/targets/egl-i965/target.c
new file mode 100644 (file)
index 0000000..2f97bce
--- /dev/null
+++ b/src/gallium/targets/egl-i965/target.c
@@ -0,0 +1,8 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("i965", "i915")
+
+/* A poor man's --whole-archive for EGL drivers */
+void *_eglMain(void *);
+void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-nouveau/Makefile b/src/gallium/targets/egl-nouveau/Makefile
index e3fa8937e83a2fb57615131c1417b148d9aed0d3..3f0a373e43b139a99387dd65fe0b984bcb237e14 100644 (file)
--- a/src/gallium/targets/egl-nouveau/Makefile
+++ b/src/gallium/targets/egl-nouveau/Makefile
@@ -2,7 +2,7 @@ TOP = ../../../..
 include $(TOP)/configs/current
 
 EGL_DRIVER_NAME = nouveau
-EGL_DRIVER_SOURCES = dummy.c
+EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_nouveau
 
 EGL_DRIVER_PIPES = \

diff --git a/src/gallium/targets/egl-nouveau/dummy.c b/src/gallium/targets/egl-nouveau/dummy.c
deleted file mode 100644 (file)
index 3181d0b..0000000
--- a/src/gallium/targets/egl-nouveau/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* A poor man's --whole-archive for EGL drivers */
-void *_eglMain(void *);
-void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-nouveau/target.c b/src/gallium/targets/egl-nouveau/target.c
new file mode 100644 (file)
index 0000000..49545c6
--- /dev/null
+++ b/src/gallium/targets/egl-nouveau/target.c
@@ -0,0 +1,8 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
+
+/* A poor man's --whole-archive for EGL drivers */
+void *_eglMain(void *);
+void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-radeon/Makefile b/src/gallium/targets/egl-radeon/Makefile
index 8fcca2682655c6ca910114280ff08f41743c571f..c988b48cd04c2b5c9934b6f711cf91ed74c17fa8 100644 (file)
--- a/src/gallium/targets/egl-radeon/Makefile
+++ b/src/gallium/targets/egl-radeon/Makefile
@@ -2,7 +2,7 @@ TOP = ../../../..
 include $(TOP)/configs/current
 
 EGL_DRIVER_NAME = radeon
-EGL_DRIVER_SOURCES = dummy.c
+EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS = -ldrm_radeon
 
 EGL_DRIVER_PIPES = \

diff --git a/src/gallium/targets/egl-radeon/dummy.c b/src/gallium/targets/egl-radeon/dummy.c
deleted file mode 100644 (file)
index 3181d0b..0000000
--- a/src/gallium/targets/egl-radeon/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* A poor man's --whole-archive for EGL drivers */
-void *_eglMain(void *);
-void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-radeon/target.c b/src/gallium/targets/egl-radeon/target.c
new file mode 100644 (file)
index 0000000..03b982a
--- /dev/null
+++ b/src/gallium/targets/egl-radeon/target.c
@@ -0,0 +1,8 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("radeon", "radeon")
+
+/* A poor man's --whole-archive for EGL drivers */
+void *_eglMain(void *);
+void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-vmwgfx/Makefile b/src/gallium/targets/egl-vmwgfx/Makefile
index a9f6874b98120d6911ac9a7abbd317aabd8f2e85..a25bf8885d4acb5fad8006d7a2cfe031544c8d31 100644 (file)
--- a/src/gallium/targets/egl-vmwgfx/Makefile
+++ b/src/gallium/targets/egl-vmwgfx/Makefile
@@ -2,7 +2,7 @@ TOP = ../../../..
 include $(TOP)/configs/current
 
 EGL_DRIVER_NAME = vmwgfx
-EGL_DRIVER_SOURCES = dummy.c
+EGL_DRIVER_SOURCES = target.c
 EGL_DRIVER_LIBS =
 
 EGL_DRIVER_PIPES = \

diff --git a/src/gallium/targets/egl-vmwgfx/dummy.c b/src/gallium/targets/egl-vmwgfx/dummy.c
deleted file mode 100644 (file)
index 3181d0b..0000000
--- a/src/gallium/targets/egl-vmwgfx/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* A poor man's --whole-archive for EGL drivers */
-void *_eglMain(void *);
-void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/egl-vmwgfx/target.c b/src/gallium/targets/egl-vmwgfx/target.c
new file mode 100644 (file)
index 0000000..39a829a
--- /dev/null
+++ b/src/gallium/targets/egl-vmwgfx/target.c
@@ -0,0 +1,7 @@
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("vmwgfx", "vmwgfx")
+
+/* A poor man's --whole-archive for EGL drivers */
+void *_eglMain(void *);
+void *_eglWholeArchive = (void *) _eglMain;

diff --git a/src/gallium/targets/xorg-i915/Makefile b/src/gallium/targets/xorg-i915/Makefile
index 18f07d6d8f217595db179e5c096c198fc137fed6..4f9202b0520b58e104dd5cd87f083202e5e50e40 100644 (file)
--- a/src/gallium/targets/xorg-i915/Makefile
+++ b/src/gallium/targets/xorg-i915/Makefile
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = modesetting_drv.so
 
 C_SOURCES = \
+       intel_target.c \
        intel_xorg.c
 
 DRIVER_DEFINES = \

diff --git a/src/gallium/targets/xorg-i915/intel_target.c b/src/gallium/targets/xorg-i915/intel_target.c
new file mode 100644 (file)
index 0000000..4eff93c
--- /dev/null
+++ b/src/gallium/targets/xorg-i915/intel_target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("modesetting", "i915")

diff --git a/src/gallium/targets/xorg-i965/Makefile b/src/gallium/targets/xorg-i965/Makefile
index 2b0c7d6fdf67ec8fef9dcfafed427670edb3e021..b23a2deab991b53196c99df9a0300e3ff97fc21f 100644 (file)
--- a/src/gallium/targets/xorg-i965/Makefile
+++ b/src/gallium/targets/xorg-i965/Makefile
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = i965g_drv.so
 
 C_SOURCES = \
+       intel_target.c \
        intel_xorg.c
 
 DRIVER_DEFINES = \

diff --git a/src/gallium/targets/xorg-i965/intel_target.c b/src/gallium/targets/xorg-i965/intel_target.c
new file mode 100644 (file)
index 0000000..2b0f545
--- /dev/null
+++ b/src/gallium/targets/xorg-i965/intel_target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("i965g", "i915")

diff --git a/src/gallium/targets/xorg-nouveau/Makefile b/src/gallium/targets/xorg-nouveau/Makefile
index f50872362f663d2c6f28f4e3d7ad43428df31f25..066ec6a813001bf2fb068df03526c173b8ce9a73 100644 (file)
--- a/src/gallium/targets/xorg-nouveau/Makefile
+++ b/src/gallium/targets/xorg-nouveau/Makefile
@@ -4,6 +4,7 @@ include $(TOP)/configs/current
 LIBNAME = modesetting_drv.so
 
 C_SOURCES = \
+       nouveau_target.c \
        nouveau_xorg.c
 
 DRIVER_DEFINES = \

diff --git a/src/gallium/targets/xorg-nouveau/nouveau_target.c b/src/gallium/targets/xorg-nouveau/nouveau_target.c
new file mode 100644 (file)
index 0000000..e16e86c
--- /dev/null
+++ b/src/gallium/targets/xorg-nouveau/nouveau_target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("nouveau", "nouveau")

diff --git a/src/gallium/targets/xorg-radeon/radeon_target.c b/src/gallium/targets/xorg-radeon/radeon_target.c
new file mode 100644 (file)
index 0000000..06b6482
--- /dev/null
+++ b/src/gallium/targets/xorg-radeon/radeon_target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("radeon", "radeon")

diff --git a/src/gallium/targets/xorg-vmwgfx/Makefile b/src/gallium/targets/xorg-vmwgfx/Makefile
index c0ff999116533913c491e658ad8e3d879457cd6e..0cc9be212b4926a30e89284071b593f1c63f17c2 100644 (file)
--- a/src/gallium/targets/xorg-vmwgfx/Makefile
+++ b/src/gallium/targets/xorg-vmwgfx/Makefile
@@ -8,6 +8,7 @@ C_SOURCES = \
        vmw_video.c \
        vmw_ioctl.c \
        vmw_ctrl.c \
+       vmw_target.c \
        vmw_screen.c
 
 DRIVER_INCLUDES = \

diff --git a/src/gallium/targets/xorg-vmwgfx/vmw_target.c b/src/gallium/targets/xorg-vmwgfx/vmw_target.c
new file mode 100644 (file)
index 0000000..3d1990f
--- /dev/null
+++ b/src/gallium/targets/xorg-vmwgfx/vmw_target.c
@@ -0,0 +1,4 @@
+
+#include "target-helpers/drm_api_compat.h"
+
+DRM_API_COMPAT_STRUCT("vmwgfx", "vmwgfx")