intel: Adopt to the new drm_api.h

This commit is contained in:
Jakob Bornecrantz
2009-02-25 01:54:03 +01:00
parent 36348ff1da
commit d7c6ffbc5f
3 changed files with 8 additions and 6 deletions
@@ -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,
};
@@ -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);
@@ -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 *