[PATCH 2/5] wined3d: NP2 emulation is not allowed on array textures.

Henri Verbeet hverbeet at codeweavers.com
Sun May 22 11:23:08 CDT 2016


Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
 dlls/wined3d/surface.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2f00e87..5534e73 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -784,13 +784,9 @@ static void surface_download_data(struct wined3d_surface *surface, const struct
 
     if (surface->texture_target == GL_TEXTURE_2D_ARRAY)
     {
-        /* We don't expect to ever need to emulate NP2 textures when we have EXT_texture_array. */
+        /* NP2 emulation is not allowed on array textures. */
         if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED)
-        {
-            FIXME("Cannot download surface %p, level %u, layer %u.\n",
-                    surface, surface->texture_level, surface->texture_layer);
-            return;
-        }
+            ERR("Array texture %p uses NP2 emulation.\n", texture);
 
         WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n");
 
-- 
2.1.4




More information about the wine-patches mailing list