ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Use the texture dimension helpers in surface_blt_special(). 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-04-07 19:37:59 +02:00 committed by Alexandre Julliard
parent 35fdf09643
commit 8c3b0aead5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/wined3d/surface.c
View File

@ -2662,6 +2662,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
if ((src_swapchain || src_surface == rt) && !dst_swapchain) if ((src_swapchain || src_surface == rt) && !dst_swapchain)
{ {
unsigned int src_width, src_height;
/* Blit from render target to texture */ /* Blit from render target to texture */
BOOL stretchx; BOOL stretchx;
@ -2695,8 +2696,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE
* back buffer. This is slower than reading line per line, thus not used for flipping * back buffer. This is slower than reading line per line, thus not used for flipping
* -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied
* pixel by pixel. */ * pixel by pixel. */
if (!stretchx || dst_rect->right - dst_rect->left > src_surface->resource.width src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level);
|| dst_rect->bottom - dst_rect->top > src_surface->resource.height) src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level);
if (!stretchx || dst_rect->right - dst_rect->left > src_width
|| dst_rect->bottom - dst_rect->top > src_height)
{ {
TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n");
fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter); fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter);