diff options
| author | Jakob Bornecrantz <[email protected]> | 2009-02-25 01:54:03 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2009-02-25 02:00:29 +0100 |
| commit | d7c6ffbc5f658979b6cddf0b2b6b1165c8d45511 (patch) | |
| tree | 4d0d76c9a4ec4e20a86c86b669b23e7ea0178127 /src/gallium | |
| parent | 36348ff1da9064ac93802dc4e10cef74de0a1f47 (diff) | |
intel: Adopt to the new drm_api.h
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/winsys/drm/intel/gem/intel_be_api.c | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/intel/gem/intel_be_device.c | 6 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/intel/gem/intel_be_device.h | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_api.c b/src/gallium/winsys/drm/intel/gem/intel_be_api.c index 6cffed51347..e79ff0c6a3d 100644 --- a/src/gallium/winsys/drm/intel/gem/intel_be_api.c +++ b/src/gallium/winsys/drm/intel/gem/intel_be_api.c @@ -1,12 +1,14 @@ #include "intel_be_api.h" +#include "i915simple/i915_winsys.h" struct drm_api drm_api_hocks = { /* intel_be_context.c */ .create_context = intel_be_create_context, - /* intel_be_screen.c */ + /* intel_be_device.c */ .create_screen = intel_be_create_screen, + .buffer_from_texture = i915_get_texture_buffer, .buffer_from_handle = intel_be_buffer_from_handle, .handle_from_buffer = intel_be_handle_from_buffer, }; diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_device.c b/src/gallium/winsys/drm/intel/gem/intel_be_device.c index 1c771b4ff59..c0ba8340069 100644 --- a/src/gallium/winsys/drm/intel/gem/intel_be_device.c +++ b/src/gallium/winsys/drm/intel/gem/intel_be_device.c @@ -133,10 +133,10 @@ err: } struct pipe_buffer * -intel_be_buffer_from_handle(struct pipe_winsys *winsys, +intel_be_buffer_from_handle(struct pipe_screen *screen, const char* name, unsigned handle) { - struct intel_be_device *dev = intel_be_device(winsys); + struct intel_be_device *dev = intel_be_device(screen->winsys); struct intel_be_buffer *buffer = CALLOC_STRUCT(intel_be_buffer); if (!buffer) @@ -163,7 +163,7 @@ err: } unsigned -intel_be_handle_from_buffer(struct pipe_winsys *winsys, +intel_be_handle_from_buffer(struct pipe_screen *screen, struct pipe_buffer *buf) { drm_intel_bo *bo = intel_bo(buf); diff --git a/src/gallium/winsys/drm/intel/gem/intel_be_device.h b/src/gallium/winsys/drm/intel/gem/intel_be_device.h index c4837e65fac..5bf7d3fc4f1 100644 --- a/src/gallium/winsys/drm/intel/gem/intel_be_device.h +++ b/src/gallium/winsys/drm/intel/gem/intel_be_device.h @@ -52,7 +52,7 @@ struct intel_be_buffer { * Takes a reference. */ struct pipe_buffer * -intel_be_buffer_from_handle(struct pipe_winsys *winsys, +intel_be_buffer_from_handle(struct pipe_screen *screen, const char* name, unsigned handle); /** @@ -61,7 +61,7 @@ intel_be_buffer_from_handle(struct pipe_winsys *winsys, * If buffer is destroyed handle may become invalid. */ unsigned -intel_be_handle_from_buffer(struct pipe_winsys *winsys, +intel_be_handle_from_buffer(struct pipe_screen *screen, struct pipe_buffer *buffer); static INLINE struct intel_be_buffer * |