diff options
author | Jakob Bornecrantz <jakob@vmware.com> | 2010-06-01 04:38:24 +0100 |
---|---|---|
committer | Jakob Bornecrantz <jakob@vmware.com> | 2010-06-06 13:02:49 +0100 |
commit | c7015877beedd9831402755dbc58afddcbbd5339 (patch) | |
tree | 14c52040d9d43c652f17ce5c2cec6419011c0cf9 /src/gallium/winsys/i915/drm/i915_drm_winsys.c | |
parent | 9ff10b67bc1d69bef96cb24627481ab939ec1aa6 (diff) |
i915g: Move bootstrap code to targets
Diffstat (limited to 'src/gallium/winsys/i915/drm/i915_drm_winsys.c')
-rw-r--r-- | src/gallium/winsys/i915/drm/i915_drm_winsys.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/gallium/winsys/i915/drm/i915_drm_winsys.c b/src/gallium/winsys/i915/drm/i915_drm_winsys.c index 5a6b45e6c9..83651b4c47 100644 --- a/src/gallium/winsys/i915/drm/i915_drm_winsys.c +++ b/src/gallium/winsys/i915/drm/i915_drm_winsys.c @@ -1,14 +1,11 @@ #include <stdio.h> -#include "state_tracker/drm_api.h" +#include "state_tracker/drm_driver.h" #include "i915_drm_winsys.h" +#include "i915_drm_public.h" #include "util/u_memory.h" -#include "i915/i915_context.h" -#include "i915/i915_screen.h" - -#include "trace/tr_drm.h" /* * Helper functions @@ -48,8 +45,8 @@ i915_drm_winsys_destroy(struct i915_winsys *iws) FREE(idws); } -static struct pipe_screen * -i915_drm_create_screen(struct drm_api *api, int drmFD) +struct i915_winsys * +i915_drm_winsys_create(int drmFD) { struct i915_drm_winsys *idws; unsigned int deviceID; @@ -75,19 +72,5 @@ i915_drm_create_screen(struct drm_api *api, int drmFD) idws->dump_cmd = debug_get_bool_option("INTEL_DUMP_CMD", FALSE); - return i915_screen_create(&idws->base); -} - -static struct drm_api i915_drm_api = -{ - .name = "i915", - .driver_name = "i915", - .create_screen = i915_drm_create_screen, - .destroy = NULL, -}; - -struct drm_api * -drm_api_create() -{ - return trace_drm_create(&i915_drm_api); + return &idws->base; } |