Module: wine Branch: master Commit: 9c0bf89ed09ef529ebd544efe7274513583b5825 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c0bf89ed09ef529ebd544efe7...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Sun Dec 27 19:57:23 2009 +0100
wined3d: Let "SetupForBlit()" figure out the target's width and height on its own.
---
dlls/wined3d/context.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a0d16c9..c3c90ea 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1624,16 +1624,16 @@ static inline void set_blit_dimension(UINT width, UINT height) { * Params: * This: Device to activate the context for * context: Context to setup - * width: render target width - * height: render target height * *****************************************************************************/ /* Context activation is done by the caller. */ -static inline void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *context, UINT width, UINT height) +static void SetupForBlit(IWineD3DDeviceImpl *This, struct wined3d_context *context) { int i; const struct StateEntry *StateTable = This->StateTable; const struct wined3d_gl_info *gl_info = context->gl_info; + UINT width = ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Width; + UINT height = ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Height; DWORD sampler;
TRACE("Setting up context %p for blitting\n", context); @@ -2205,9 +2205,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI break;
case CTXUSAGE_BLIT: - SetupForBlit(device, context, - ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Width, - ((IWineD3DSurfaceImpl *)context->current_rt)->currentDesc.Height); + SetupForBlit(device, context); break;
default: