From c4e85202cbdde001d0ca0e607797a9b7a1d772c4 Mon Sep 17 00:00:00 2001 From: Axel Davy Date: Mon, 7 Mar 2016 23:03:25 +0100 Subject: [PATCH] st/nine: Format conversion for volumes in UpdateTexture We were doing the conversion for surfaces, but not yet volumes. Now that volumes can do conversion, use it. Signed-off-by: Axel Davy --- src/gallium/state_trackers/nine/device9.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 16e19f65553..1744b538717 100644 --- a/src/gallium/state_trackers/nine/device9.c +++ b/src/gallium/state_trackers/nine/device9.c @@ -1431,14 +1431,6 @@ NineDevice9_UpdateTexture( struct NineDevice9 *This, struct NineVolumeTexture9 *dst = NineVolumeTexture9(dstb); struct NineVolumeTexture9 *src = NineVolumeTexture9(srcb); - /* Wine tests say XRGB -> ARGB should actually do something. - * For now do this improper conversion, but in the future it - * would be better to implement it properly */ - user_assert(srcb->format == dstb->format || - (srcb->format == D3DFMT_A8R8G8B8 && dstb->format == D3DFMT_X8R8G8B8) || - (srcb->format == D3DFMT_X8R8G8B8 && dstb->format == D3DFMT_A8R8G8B8), - D3D_OK); - if (src->dirty_box.width == 0) return D3D_OK; for (l = 0; l <= last_dst_level; ++l, ++m) -- 2.30.2