Henri Verbeet : wined3d: Don't print FIXMEs for misaligned surface maps.
Alexandre Julliard
julliard at winehq.org
Wed Nov 9 13:29:41 CST 2011
Module: wine
Branch: master
Commit: b6c7a3dbc88a02ac0e430624fe8008875e43ed2c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6c7a3dbc88a02ac0e430624fe8008875e43ed2c
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Nov 8 20:48:55 2011 +0100
wined3d: Don't print FIXMEs for misaligned surface maps.
---
dlls/wined3d/surface.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 5d32512..06a36b3 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -3719,15 +3719,11 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface,
if ((rect->left & width_mask) || (rect->right & width_mask)
|| (rect->top & height_mask) || (rect->bottom & height_mask))
{
- switch (surface->resource.pool)
- {
- case WINED3DPOOL_DEFAULT:
- WARN("Partial block lock with WINED3DPOOL_DEFAULT\n");
- return WINED3DERR_INVALIDCALL;
+ WARN("Map rect %s is misaligned for %ux%u blocks.\n",
+ wine_dbgstr_rect(rect), format->block_width, format->block_height);
- default:
- FIXME("Partial block lock with %s\n", debug_d3dpool(surface->resource.pool));
- }
+ if (surface->resource.pool == WINED3DPOOL_DEFAULT)
+ return WINED3DERR_INVALIDCALL;
}
}
More information about the wine-cvs
mailing list