Mesa (master): vc4: Drop a weird argument in the BOs-from-handles API.

[Eric Anholt]

Module: Mesa
Branch: master
Commit: 113044e1b9d8f70a26f826f7c03adcbbc8ecb138
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=113044e1b9d8f70a26f826f7c03adcbbc8ecb138

Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 16 16:11:27 2014 -0800

vc4: Drop a weird argument in the BOs-from-handles API.

---

 src/gallium/drivers/vc4/vc4_resource.c |    4 +++-
 src/gallium/drivers/vc4/vc4_screen.c   |    5 +----
 src/gallium/drivers/vc4/vc4_screen.h   |    3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/vc4/vc4_resource.c b/src/gallium/drivers/vc4/vc4_resource.c
index a00ce71..df4c207 100644
--- a/src/gallium/drivers/vc4/vc4_resource.c
+++ b/src/gallium/drivers/vc4/vc4_resource.c
@@ -372,12 +372,14 @@ vc4_resource_from_handle(struct pipe_screen *pscreen,
                 return NULL;
 
         rsc->tiled = false;
-        rsc->bo = vc4_screen_bo_from_handle(pscreen, handle, &slice->stride);
+        rsc->bo = vc4_screen_bo_from_handle(pscreen, handle);
         if (!rsc->bo)
                 goto fail;
 
 #ifdef USE_VC4_SIMULATOR
         slice->stride = align(prsc->width0 * rsc->cpp, 16);
+#else
+        slice->stride = handle->stride;
 #endif
         slice->tiling = VC4_TILING_FORMAT_LINEAR;
 
diff --git a/src/gallium/drivers/vc4/vc4_screen.c b/src/gallium/drivers/vc4/vc4_screen.c
index f42e022..98c51c1 100644
--- a/src/gallium/drivers/vc4/vc4_screen.c
+++ b/src/gallium/drivers/vc4/vc4_screen.c
@@ -489,8 +489,7 @@ vc4_screen_bo_get_handle(struct pipe_screen *pscreen,
 
 struct vc4_bo *
 vc4_screen_bo_from_handle(struct pipe_screen *pscreen,
-                          struct winsys_handle *whandle,
-                          unsigned *out_stride)
+                          struct winsys_handle *whandle)
 {
         struct vc4_screen *screen = vc4_screen(pscreen);
         struct vc4_bo *bo;
@@ -508,7 +507,5 @@ vc4_screen_bo_from_handle(struct pipe_screen *pscreen,
                 return NULL;
         }
 
-        *out_stride = whandle->stride;
-
         return bo;
 }
diff --git a/src/gallium/drivers/vc4/vc4_screen.h b/src/gallium/drivers/vc4/vc4_screen.h
index 3819bda..4a8b1f4 100644
--- a/src/gallium/drivers/vc4/vc4_screen.h
+++ b/src/gallium/drivers/vc4/vc4_screen.h
@@ -70,8 +70,7 @@ boolean vc4_screen_bo_get_handle(struct pipe_screen *pscreen,
                                  struct winsys_handle *whandle);
 struct vc4_bo *
 vc4_screen_bo_from_handle(struct pipe_screen *pscreen,
-                          struct winsys_handle *whandle,
-                          unsigned *out_stride);
+                          struct winsys_handle *whandle);
 
 extern uint32_t vc4_debug;