diff options
| author | Chia-I Wu <[email protected]> | 2013-06-12 16:21:00 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2013-06-12 17:46:52 +0800 |
| commit | cdfb2163c4cf6b54b6d8ba61f5460a29f58e3184 (patch) | |
| tree | ab3a4dc322d583db7d279d2376bb36f9dd166c4f /src/gallium/targets | |
| parent | 6fe0453c339b6e894e0ee8d2200e7638a43ed21e (diff) | |
ilo: get rid of function tables in winsys
We are moving toward making struct intel_bo alias drm_intel_bo. As a first
step, we cannot have function tables.
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/dri-ilo/target.c | 7 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/egl_pipe.c | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/gallium/targets/dri-ilo/target.c b/src/gallium/targets/dri-ilo/target.c index c27cb4745c7..451827a4309 100644 --- a/src/gallium/targets/dri-ilo/target.c +++ b/src/gallium/targets/dri-ilo/target.c @@ -1,7 +1,6 @@ #include "state_tracker/drm_driver.h" #include "target-helpers/inline_debug_helper.h" -#include "intel/drm/intel_drm_public.h" -#include "intel/drm/intel_winsys.h" +#include "intel/intel_winsys.h" #include "ilo/ilo_public.h" static struct pipe_screen * @@ -10,13 +9,13 @@ create_screen(int fd) struct intel_winsys *iws; struct pipe_screen *screen; - iws = intel_drm_winsys_create(fd); + iws = intel_winsys_create_for_fd(fd); if (!iws) return NULL; screen = ilo_screen_create(iws); if (!screen) { - iws->destroy(iws); + intel_winsys_destroy(iws); return NULL; } diff --git a/src/gallium/targets/egl-static/egl_pipe.c b/src/gallium/targets/egl-static/egl_pipe.c index e1a1ad2ec73..57a3233530f 100644 --- a/src/gallium/targets/egl-static/egl_pipe.c +++ b/src/gallium/targets/egl-static/egl_pipe.c @@ -33,7 +33,7 @@ #include "i915/i915_public.h" #include "target-helpers/inline_wrapper_sw_helper.h" /* for ilo */ -#include "intel/drm/intel_drm_public.h" +#include "intel/intel_winsys.h" #include "ilo/ilo_public.h" /* for nouveau */ #include "nouveau/drm/nouveau_drm_public.h" @@ -80,7 +80,7 @@ pipe_ilo_create_screen(int fd) struct intel_winsys *iws; struct pipe_screen *screen; - iws = intel_drm_winsys_create(fd); + iws = intel_winsys_create_for_fd(fd); if (!iws) return NULL; |