Henri Verbeet : wined3d: NP2 emulation is not allowed on array textures.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 23 10:27:44 CDT 2016
Module: wine
Branch: master
Commit: 3e29f952f953f66db5677a0be74bc75fd869bc68
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e29f952f953f66db5677a0be74bc75fd869bc68
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sun May 22 18:23:08 2016 +0200
wined3d: NP2 emulation is not allowed on array textures.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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");
More information about the wine-cvs
mailing list