=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Reject height scaled repacked np2 textures.
Alexandre Julliard
julliard at winehq.org
Wed Feb 12 13:44:40 CST 2014
Module: wine
Branch: master
Commit: 2728e7b8879868e6210ebd78d5fcffe0aaab11e3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2728e7b8879868e6210ebd78d5fcffe0aaab11e3
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Wed Feb 12 12:24:25 2014 +0100
wined3d: Reject height scaled repacked np2 textures.
---
dlls/wined3d/surface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 8a34807..371f3bc 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -695,9 +695,9 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface)
if (pow2Width > surface->resource.width || pow2Height > surface->resource.height)
{
/* TODO: Add support for non power two compressed textures. */
- if (surface->resource.format->flags & WINED3DFMT_FLAG_COMPRESSED)
+ if (surface->resource.format->flags & (WINED3DFMT_FLAG_COMPRESSED | WINED3DFMT_FLAG_HEIGHT_SCALE))
{
- FIXME("(%p) Compressed non-power-two textures are not supported w(%d) h(%d)\n",
+ FIXME("(%p) Compressed or height scaled non-power-two textures are not supported w(%d) h(%d)\n",
surface, surface->resource.width, surface->resource.height);
return WINED3DERR_NOTAVAILABLE;
}
More information about the wine-cvs
mailing list