Module: wine Branch: master Commit: 7fb0ff9e89711c22a510d11b91d516ab2f46c7fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb0ff9e89711c22a510d11b91...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Mar 17 16:30:05 2016 +0100
wined3d: Explicitly check for WINED3DUSAGE_TEXTURE when validating surface dimensions in surface_private_setup().
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d61034a..846b78f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -558,7 +558,7 @@ static HRESULT surface_private_setup(struct wined3d_surface *surface) }
if ((surface->pow2Width > gl_info->limits.texture_size || surface->pow2Height > gl_info->limits.texture_size) - && !(texture->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + && (texture->resource.usage & WINED3DUSAGE_TEXTURE)) { /* One of three options: * 1: Do the same as we do with NPOT and scale the texture, (any