intel: Adopt to the new drm_api.h

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 6cffed51347dc19444ebe98fb3dc04580c23c61a..e79ff0c6a3d0f042bc63190f326a207c16b792bf 100644 (file)
--- 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 1c771b4ff59b662864fe87995c9e53b2162d2054..c0ba83400694dabae36a1ddcdf8f319cb609e468 100644 (file)
--- 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 c4837e65fac0cc353ca00fca7e9cec9b68368dd3..5bf7d3fc4f14d475682a404b0df932d861288142 100644 (file)
--- 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 *