Skip to contentSkip to conversation

gallium/nouveau: use pre-calculated stride for resource_get_handle

PATCH In review Marcin Slusarz 1 participant 2 messages Oct 4, 2012 1 message not in the archive

lore
Share & tools
lore

Marcin Slusarz

author
#0 lore raw

PATCH 1/1 gallium/nouveau: use pre-calculated stride for resource_get_handle

Fixes FDO#55294.

---
 src/gallium/drivers/nv30/nv30_miptree.c | 3 +--
 src/gallium/drivers/nv50/nv50_miptree.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
src/gallium/drivers/nv30/nv30_miptree.c +1 -2
index 5a9a63b..9700fa8 100644
@@ -56,8 +56,7 @@ nv30_miptree_get_handle(struct pipe_screen *pscreen,
    if (!mt || !mt->base.bo)
       return FALSE;
 
-   stride = util_format_get_stride(mt->base.base.format,
-                                   mt->base.base.width0);
+   stride = mt->level[0].pitch;
 
    return nouveau_screen_bo_get_handle(pscreen, mt->base.bo, stride, handle);
 }
src/gallium/drivers/nv50/nv50_miptree.c +1 -2
index 7b8dfb8..70e8c77 100644
@@ -133,8 +133,7 @@ nv50_miptree_get_handle(struct pipe_screen *pscreen,
    if (!mt || !mt->base.bo)
       return FALSE;
 
-   stride = util_format_get_stride(mt->base.base.format,
-                                   mt->base.base.width0);
+   stride = mt->level[0].pitch;
 
    return nouveau_screen_bo_get_handle(pscreen,
                                        mt->base.bo,
Signature · 1 line
1.7.12

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#2 lore raw
Quoted 2 lines · Marcin Slusarz

Fixes FDO#55294.
---

BTW, I'd like to also apply it to 9.0 branch.

Quoted 33 lines
 src/gallium/drivers/nv30/nv30_miptree.c | 3 +--
 src/gallium/drivers/nv50/nv50_miptree.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
src/gallium/drivers/nv30/nv30_miptree.c +1 -2
index 5a9a63b..9700fa8 100644
@@ -56,8 +56,7 @@ nv30_miptree_get_handle(struct pipe_screen *pscreen,
    if (!mt || !mt->base.bo)
       return FALSE;
 
-   stride = util_format_get_stride(mt->base.base.format,
-                                   mt->base.base.width0);
+   stride = mt->level[0].pitch;
 
    return nouveau_screen_bo_get_handle(pscreen, mt->base.bo, stride, handle);
 }
src/gallium/drivers/nv50/nv50_miptree.c +1 -2
index 7b8dfb8..70e8c77 100644
@@ -133,8 +133,7 @@ nv50_miptree_get_handle(struct pipe_screen *pscreen,
    if (!mt || !mt->base.bo)
       return FALSE;
 
-   stride = util_format_get_stride(mt->base.base.format,
-                                   mt->base.base.width0);
+   stride = mt->level[0].pitch;
 
    return nouveau_screen_bo_get_handle(pscreen,
                                        mt->base.bo,