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

wined3d: Use the context's window handle in stretch_rect_fbo().

This commit is contained in:
Henri Verbeet 2010-03-15 21:07:26 +01:00 committed by Alexandre Julliard
parent 18ec2525a4
commit 7b0b16fafe
1 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/wined3d/device.c
View File

@ -5425,19 +5425,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DeletePatch(IWineD3DDevice *iface, UINT
return WINED3DERR_INVALIDCALL; return WINED3DERR_INVALIDCALL;
} }
static IWineD3DSwapChain *get_swapchain(IWineD3DSurface *target) {
HRESULT hr;
IWineD3DSwapChain *swapchain;
hr = IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain);
if (SUCCEEDED(hr)) {
IWineD3DSwapChain_Release((IUnknown *)swapchain);
return swapchain;
}
return NULL;
}
static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface, static void color_fill_fbo(IWineD3DDevice *iface, IWineD3DSurface *surface,
const WINED3DRECT *rect, const float color[4]) const WINED3DRECT *rect, const float color[4])
{ {
@ -5827,7 +5814,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED
{ {
IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface;
GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */ GLbitfield mask = GL_COLOR_BUFFER_BIT; /* TODO: Support blitting depth/stencil surfaces */
IWineD3DSwapChain *src_swapchain, *dst_swapchain;
const struct wined3d_gl_info *gl_info; const struct wined3d_gl_info *gl_info;
struct wined3d_context *context; struct wined3d_context *context;
GLenum gl_filter; GLenum gl_filter;
@ -5857,12 +5843,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED
IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL);
IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL);
/* Attach src surface to src fbo */ if (!surface_is_offscreen(src_surface)) context = context_acquire(This, src_surface, CTXUSAGE_RESOURCELOAD);
src_swapchain = get_swapchain(src_surface); else if (!surface_is_offscreen(dst_surface)) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD);
dst_swapchain = get_swapchain(dst_surface);
if (src_swapchain) context = context_acquire(This, src_surface, CTXUSAGE_RESOURCELOAD);
else if (dst_swapchain) context = context_acquire(This, dst_surface, CTXUSAGE_RESOURCELOAD);
else context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); else context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD);
gl_info = context->gl_info; gl_info = context->gl_info;
@ -5876,8 +5858,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED
if(buffer == GL_FRONT) { if(buffer == GL_FRONT) {
RECT windowsize; RECT windowsize;
UINT h; UINT h;
ClientToScreen(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &offset); ClientToScreen(context->win_handle, &offset);
GetClientRect(((IWineD3DSwapChainImpl *)src_swapchain)->win_handle, &windowsize); GetClientRect(context->win_handle, &windowsize);
h = windowsize.bottom - windowsize.top; h = windowsize.bottom - windowsize.top;
src_rect->x1 -= offset.x; src_rect->x2 -=offset.x; src_rect->x1 -= offset.x; src_rect->x2 -=offset.x;
src_rect->y1 = offset.y + h - src_rect->y1; src_rect->y1 = offset.y + h - src_rect->y1;
@ -5912,8 +5894,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED
if(buffer == GL_FRONT) { if(buffer == GL_FRONT) {
RECT windowsize; RECT windowsize;
UINT h; UINT h;
ClientToScreen(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &offset); ClientToScreen(context->win_handle, &offset);
GetClientRect(((IWineD3DSwapChainImpl *)dst_swapchain)->win_handle, &windowsize); GetClientRect(context->win_handle, &windowsize);
h = windowsize.bottom - windowsize.top; h = windowsize.bottom - windowsize.top;
dst_rect->x1 -= offset.x; dst_rect->x2 -=offset.x; dst_rect->x1 -= offset.x; dst_rect->x2 -=offset.x;
dst_rect->y1 = offset.y + h - dst_rect->y1; dst_rect->y1 = offset.y + h - dst_rect->y1;