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 <axel.davy@ens.fr>

diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 16e19f655535146d1a91893a5be3ed08c51f8200..1744b538717b7871af1502bc1473a96aff6518fd 100644 (file)
--- 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)