summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorStéphane Marchesin <[email protected]>2015-04-01 20:00:08 -0700
committerStéphane Marchesin <[email protected]>2015-04-01 20:13:37 -0700
commit70eed78cacd711e663068e78a8430372cc5fabf1 (patch)
tree39c1144a0cb29e0616ff75a3b06a5ae95f801ba0 /src/gallium/drivers
parenta03d0ba78f33e43df2ca7a9e4c58fdc9fbc9876a (diff)
i915g: Implement EGL_EXT_image_dma_buf_import
This adds all the plumbing to get EGL_EXT_image_dma_buf_import in i915g. Signed-off-by: Stéphane Marchesin <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/i915/i915_resource_texture.c2
-rw-r--r--src/gallium/drivers/i915/i915_winsys.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/i915/i915_resource_texture.c b/src/gallium/drivers/i915/i915_resource_texture.c
index 36fb3e28a75..dc8f4d1c903 100644
--- a/src/gallium/drivers/i915/i915_resource_texture.c
+++ b/src/gallium/drivers/i915/i915_resource_texture.c
@@ -989,7 +989,7 @@ i915_texture_from_handle(struct pipe_screen * screen,
assert(screen);
- buffer = iws->buffer_from_handle(iws, whandle, &tiling, &stride);
+ buffer = iws->buffer_from_handle(iws, whandle, template->height0, &tiling, &stride);
/* Only supports one type */
if ((template->target != PIPE_TEXTURE_2D &&
diff --git a/src/gallium/drivers/i915/i915_winsys.h b/src/gallium/drivers/i915/i915_winsys.h
index 6cf802fe073..509e6cca13b 100644
--- a/src/gallium/drivers/i915/i915_winsys.h
+++ b/src/gallium/drivers/i915/i915_winsys.h
@@ -176,6 +176,7 @@ struct i915_winsys {
struct i915_winsys_buffer *
(*buffer_from_handle)(struct i915_winsys *iws,
struct winsys_handle *whandle,
+ unsigned height,
enum i915_winsys_buffer_tile *tiling,
unsigned *stride);