Henri Verbeet : wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
Alexandre Julliard
julliard at winehq.org
Tue Aug 23 12:44:59 CDT 2011
Module: wine
Branch: master
Commit: f58e55ec6c19d65689b273938f168287797362da
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58e55ec6c19d65689b273938f168287797362da
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Mon Aug 22 21:02:42 2011 +0200
wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
---
dlls/wined3d/surface.c | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index 2fc08d8..04a6dec 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -1682,6 +1682,16 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC
surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE);
return WINED3D_OK;
}
+
+ if (arbfp_blit.blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT,
+ &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format,
+ &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))
+ {
+ TRACE("Using arbfp blit.\n");
+
+ if (SUCCEEDED(arbfp_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect)))
+ return WINED3D_OK;
+ }
}
}
@@ -5504,14 +5514,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa
TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface);
- if (!(flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE))
- && arbfp_blit.blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT,
- src_rect, src_surface->resource.usage, src_surface->resource.pool,
- src_surface->resource.format,
- dst_rect, dst_surface->resource.usage, dst_surface->resource.pool,
- dst_surface->resource.format))
- return arbfp_blit_surface(device, Filter, src_surface, src_rect, dst_surface, dst_rect);
-
if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT,
src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format,
dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))
More information about the wine-cvs
mailing list