summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2010-06-23 23:03:28 +0200
committerJakob Bornecrantz <[email protected]>2010-06-23 23:15:07 +0200
commitcf91accc93b9f172b2f7c970f39e69b268a5bb26 (patch)
treeb8eb030cea7d76b0a26a20cc8a35415991aacbe5
parent10e3b9f4d029df5c6c01a5d76c9085c48d82ac43 (diff)
nouveau: Move bootstrap code to targets
Well sorta, at least I removed the drm_api dependancy and the target can layer anything it wants to now.
-rw-r--r--src/gallium/targets/dri-nouveau/target.c17
-rw-r--r--src/gallium/targets/egl-nouveau/target.c17
-rw-r--r--src/gallium/targets/xorg-nouveau/nouveau_target.c17
-rw-r--r--src/gallium/winsys/nouveau/drm/nouveau_drm_public.h9
-rw-r--r--src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c18
-rw-r--r--src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.h2
6 files changed, 57 insertions, 23 deletions
diff --git a/src/gallium/targets/dri-nouveau/target.c b/src/gallium/targets/dri-nouveau/target.c
index e16e86cd3d8..ca3ec53029a 100644
--- a/src/gallium/targets/dri-nouveau/target.c
+++ b/src/gallium/targets/dri-nouveau/target.c
@@ -1,4 +1,17 @@
-#include "target-helpers/drm_api_compat.h"
+#include "state_tracker/drm_driver.h"
+#include "nouveau/drm/nouveau_drm_public.h"
-DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
+static struct pipe_screen *
+create_screen(int fd)
+{
+ struct pipe_screen *screen;
+
+ screen = nouveau_drm_screen_create(fd);
+ if (!screen)
+ return NULL;
+
+ return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen)
diff --git a/src/gallium/targets/egl-nouveau/target.c b/src/gallium/targets/egl-nouveau/target.c
index 49545c63e11..7d0b141e5a2 100644
--- a/src/gallium/targets/egl-nouveau/target.c
+++ b/src/gallium/targets/egl-nouveau/target.c
@@ -1,7 +1,20 @@
-#include "target-helpers/drm_api_compat.h"
+#include "state_tracker/drm_driver.h"
+#include "nouveau/drm/nouveau_drm_public.h"
-DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
+static struct pipe_screen *
+create_screen(int fd)
+{
+ struct pipe_screen *screen;
+
+ screen = nouveau_drm_screen_create(fd);
+ if (!screen)
+ return NULL;
+
+ return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen)
/* A poor man's --whole-archive for EGL drivers */
void *_eglMain(void *);
diff --git a/src/gallium/targets/xorg-nouveau/nouveau_target.c b/src/gallium/targets/xorg-nouveau/nouveau_target.c
index e16e86cd3d8..ca3ec53029a 100644
--- a/src/gallium/targets/xorg-nouveau/nouveau_target.c
+++ b/src/gallium/targets/xorg-nouveau/nouveau_target.c
@@ -1,4 +1,17 @@
-#include "target-helpers/drm_api_compat.h"
+#include "state_tracker/drm_driver.h"
+#include "nouveau/drm/nouveau_drm_public.h"
-DRM_API_COMPAT_STRUCT("nouveau", "nouveau")
+static struct pipe_screen *
+create_screen(int fd)
+{
+ struct pipe_screen *screen;
+
+ screen = nouveau_drm_screen_create(fd);
+ if (!screen)
+ return NULL;
+
+ return screen;
+}
+
+DRM_DRIVER_DESCRIPTOR("nouveau", "nouveau", create_screen)
diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_public.h b/src/gallium/winsys/nouveau/drm/nouveau_drm_public.h
new file mode 100644
index 00000000000..67b7c4429df
--- /dev/null
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_public.h
@@ -0,0 +1,9 @@
+
+#ifndef __NOUVEAU_DRM_PUBLIC_H__
+#define __NOUVEAU_DRM_PUBLIC_H__
+
+struct pipe_screen;
+
+struct pipe_screen *nouveau_drm_screen_create(int drmFD);
+
+#endif
diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
index 418f1d708a7..660dbd0c332 100644
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.c
@@ -5,6 +5,7 @@
#include "util/u_inlines.h"
#include "nouveau_drm_winsys.h"
+#include "nouveau_drm_public.h"
#include "nouveau_drmif.h"
#include "nouveau_channel.h"
@@ -22,8 +23,8 @@ nouveau_drm_destroy_winsys(struct pipe_winsys *s)
FREE(nv_winsys);
}
-static struct pipe_screen *
-nouveau_drm_create_screen(struct drm_api *api, int fd)
+struct pipe_screen *
+nouveau_drm_screen_create(int fd)
{
struct nouveau_winsys *nvws;
struct pipe_winsys *ws;
@@ -70,16 +71,3 @@ nouveau_drm_create_screen(struct drm_api *api, int fd)
return nvws->pscreen;
}
-
-static struct drm_api nouveau_drm_api_hooks = {
- .name = "nouveau",
- .driver_name = "nouveau",
- .create_screen = nouveau_drm_create_screen,
- .destroy = NULL,
-};
-
-struct drm_api *
-drm_api_create() {
- return &nouveau_drm_api_hooks;
-}
-
diff --git a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.h b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.h
index ae3ab17d743..9e529ecad3d 100644
--- a/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.h
+++ b/src/gallium/winsys/nouveau/drm/nouveau_drm_winsys.h
@@ -1,8 +1,6 @@
#ifndef __NOUVEAU_DRM_WINSYS_H__
#define __NOUVEAU_DRM_WINSYS_H__
-#include "state_tracker/drm_api.h"
-
#include "util/u_simple_screen.h"
#include "nouveau_dri.h"