March 2010 - Wine-commits - list.winehq.org

Stefan Dösinger : wined3d: Use FBOs when the onscreen depth stencil format isn't suitable.
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: dc918d43946462ad4c04ed373cda72d1ebe9b6d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc918d43946462ad4c04ed373… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 28 16:42:32 2010 +0200 wined3d: Use FBOs when the onscreen depth stencil format isn't suitable. This allows proper support of float depth buffers when rendering to onscreen surfaces. --- dlls/wined3d/context.c | 66 +++++++++++++++++++++++++++++++++++++++------- dlls/wined3d/swapchain.c | 2 +- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 738746e..e218088 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1929,6 +1929,57 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) context->draw_buffer_dirty = TRUE; } +static inline void context_set_render_offscreen(struct wined3d_context *context, const struct StateEntry *StateTable, + BOOL offscreen) +{ + if (context->render_offscreen == offscreen) return; + + Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); + Context_MarkStateDirty(context, STATE_VDECL, StateTable); + Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); + Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); + Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + context->render_offscreen = offscreen; +} + +static BOOL match_depth_stencil_format(const struct wined3d_format_desc *existing, + const struct wined3d_format_desc *required) +{ + short existing_depth, existing_stencil, required_depth, required_stencil; + + if(existing == required) return TRUE; + if((existing->Flags & WINED3DFMT_FLAG_FLOAT) != (required->Flags & WINED3DFMT_FLAG_FLOAT)) return FALSE; + + getDepthStencilBits(existing, &existing_depth, &existing_stencil); + getDepthStencilBits(required, &required_depth, &required_stencil); + + if(existing_depth < required_depth) return FALSE; + /* If stencil bits are used the exact amount is required - otherwise wrapping + * won't work correctly */ + if(required_stencil && required_stencil != existing_stencil) return FALSE; + return TRUE; +} +/* The caller provides a context */ +static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, struct wined3d_context *context) +{ + /* Onscreen surfaces are always in a swapchain */ + IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) device->stencilBufferTarget; + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) ((IWineD3DSurfaceImpl *)context->current_rt)->container; + + if (!depth_stencil) return; + if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->resource.format_desc)) return; + + /* TODO: If the requested format would satisfy the needs of the existing one(reverse match), + * or no onscreen depth buffer was created, the OpenGL drawable could be changed to the new + * format. */ + WARN("Depth stencil format is not supported by WGL, rendering the backbuffer in an FBO\n"); + + /* The currently active context is the necessary context to access the swapchain's onscreen buffers */ + IWineD3DSurface_LoadLocation(context->current_rt, SFLAG_INTEXTURE, NULL); + swapchain->render_to_fbo = TRUE; + context_set_render_offscreen(context, device->StateTable, TRUE); +} + /* Context activation is done by the caller. */ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceImpl *device, enum ContextUsage usage) { @@ -1939,6 +1990,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI case CTXUSAGE_CLEAR: case CTXUSAGE_DRAWPRIM: if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); ENTER_GL(); context_apply_fbo_state(context); LEAVE_GL(); @@ -1951,6 +2003,7 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI case CTXUSAGE_BLIT: if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); if (context->render_offscreen) { FIXME("Activating for CTXUSAGE_BLIT for an offscreen target with ORM_FBO. This should be avoided.\n"); @@ -2043,21 +2096,14 @@ static void context_apply_state(struct wined3d_context *context, IWineD3DDeviceI static void context_setup_target(IWineD3DDeviceImpl *device, struct wined3d_context *context, IWineD3DSurface *target) { - BOOL old_render_offscreen = context->render_offscreen; + BOOL old_render_offscreen = context->render_offscreen, render_offscreen; const struct StateEntry *StateTable = device->StateTable; if (!target) return; else if (context->current_rt == target) return; - context->render_offscreen = surface_is_offscreen(target); + render_offscreen = surface_is_offscreen(target); - if (context->render_offscreen != old_render_offscreen) - { - Context_MarkStateDirty(context, STATE_TRANSFORM(WINED3DTS_PROJECTION), StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); - } + context_set_render_offscreen(context, StateTable, render_offscreen); /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 14a741b..2daa08c 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -811,7 +811,7 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface if (!present_parameters->EnableAutoDepthStencil || swapchain->presentParms.AutoDepthStencilFormat != WINED3DFMT_D24_UNORM_S8_UINT) { - FIXME("Add OpenGL context recreation support to SetDepthStencilSurface\n"); + FIXME("Add OpenGL context recreation support to context_validate_onscreen_formats\n"); } swapchain->ds_format = getFormatDescEntry(WINED3DFMT_D24_UNORM_S8_UINT, gl_info); swapchain->context[0] = context_create(swapchain, (IWineD3DSurfaceImpl *)swapchain->frontBuffer,

1 0

Paul Vriens : d3d9/tests: Initialize a variable (Coverity).
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: cc20a0da59797ca15de20079668e545548b5fa3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc20a0da59797ca15de200796… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Mar 31 10:54:37 2010 +0200 d3d9/tests: Initialize a variable (Coverity). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d73a469..2695b46 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2220,7 +2220,7 @@ static void stretchrect_test(IDirect3DDevice9 *device) IDirect3DSurface9 *surf_offscreen32 = NULL, *surf_offscreen64 = NULL, *surf_offscreen_dest64 = NULL; IDirect3DSurface9 *surf_temp32 = NULL, *surf_temp64 = NULL; IDirect3DSurface9 *orig_rt = NULL; - IDirect3DSurface9 *backbuffer; + IDirect3DSurface9 *backbuffer = NULL; DWORD color; RECT src_rect64 = {0, 0, 64, 64};

1 0

Henri Verbeet : wined3d: Cleanup variable naming in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 61ca407151649dc763950414e076ea7c640afee9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61ca407151649dc763950414e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:56 2010 +0200 wined3d: Cleanup variable naming in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 126 ++++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61ca407151649dc763950…

1 0

Henri Verbeet : wined3d: Get rid of some mostly useless local variables in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 3af090969302546c4893b64d2db254c3953ac3ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af090969302546c4893b64d2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:57 2010 +0200 wined3d: Get rid of some mostly useless local variables in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4de5c86..b6e80fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5161,8 +5161,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, const struct wined3d_format_desc *dst_format; CONVERT_TYPES convert = NO_CONVERSION; struct wined3d_context *context; - WINED3DPOOL src_pool, dst_pool; - WINED3DSURFACE_DESC winedesc; const unsigned char *data; UINT update_w, update_h; UINT src_w, src_h; @@ -5175,15 +5173,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, iface, src_surface, wine_dbgstr_rect(src_rect), dst_surface, wine_dbgstr_point(dst_point)); - IWineD3DSurface_GetDesc(src_surface, &winedesc); - src_w = winedesc.width; - src_h = winedesc.height; - src_pool = winedesc.pool; - - IWineD3DSurface_GetDesc(dst_surface, &winedesc); - dst_pool = winedesc.pool; - - if (src_pool != WINED3DPOOL_SYSTEMMEM || dst_pool != WINED3DPOOL_DEFAULT) + if (src_impl->resource.pool != WINED3DPOOL_SYSTEMMEM || dst_impl->resource.pool != WINED3DPOOL_DEFAULT) { WARN("source %p must be SYSTEMMEM and dest %p must be DEFAULT, returning WINED3DERR_INVALIDCALL\n", src_surface, dst_surface); @@ -5221,6 +5211,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, surface_internal_preload(dst_surface, SRGB_RGB); IWineD3DSurface_BindTexture(dst_surface, FALSE); + src_w = src_impl->currentDesc.Width; + src_h = src_impl->currentDesc.Height; update_w = src_rect ? src_rect->right - src_rect->left : src_w; update_h = src_rect ? src_rect->bottom - src_rect->top : src_h;

1 0

Henri Verbeet : wined3d: Remove a redundant initialization in IWineD3DDeviceImpl_UpdateSurface().
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 91db9f8bd33be44e5605c5d86ba28234b4325966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91db9f8bd33be44e5605c5d86… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 31 11:28:58 2010 +0200 wined3d: Remove a redundant initialization in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b6e80fb..c6f8d9b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5159,10 +5159,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; const struct wined3d_format_desc *src_format; const struct wined3d_format_desc *dst_format; - CONVERT_TYPES convert = NO_CONVERSION; struct wined3d_context *context; const unsigned char *data; UINT update_w, update_h; + CONVERT_TYPES convert; UINT src_w, src_h; UINT dst_x, dst_y; DWORD sampler;

1 0

Alexandre Julliard : ntdll/tests: Port functions use the 64-bit structure on Wow64.
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 9608085bf613eec350fc3d7f4c35dd44ca114f33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9608085bf613eec350fc3d7f4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 14:20:09 2010 +0200 ntdll/tests: Port functions use the 64-bit structure on Wow64. --- dlls/ntdll/tests/port.c | 188 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 137 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9608085bf613eec350fc3…

1 0

Alexandre Julliard : ntdll/tests: Don't free a string that wasn't allocated .
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 71ce9dae679d66abbab0e98e30501305adf9a31f URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ce9dae679d66abbab0e98e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 14:20:19 2010 +0200 ntdll/tests: Don't free a string that wasn't allocated. --- dlls/ntdll/tests/file.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3d28d80..7540d78 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -247,7 +247,6 @@ static void create_file_test(void) todo_wine ok( status == STATUS_INVALID_PARAMETER, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); - pRtlFreeUnicodeString( &nameW ); } static void open_file_test(void)

1 0

Alexandre Julliard : configure: Don' t build rpcss or winemenubuilder for Wow64.
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 2f375cc6ea45c00b235bf34ce563e01f43d4ecc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f375cc6ea45c00b235bf34ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 31 12:53:12 2010 +0200 configure: Don't build rpcss or winemenubuilder for Wow64. --- configure | 2 ++ configure.ac | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure b/configure index f133705..6725765 100755 --- a/configure +++ b/configure @@ -4119,10 +4119,12 @@ then enable_fonts=${enable_fonts:-no} enable_include=${enable_include:-no} + enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} enable_wineboot=${enable_wineboot:-no} enable_winedbg=${enable_winedbg:-no} + enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi diff --git a/configure.ac b/configure.ac index 349a25a..835a128 100644 --- a/configure.ac +++ b/configure.ac @@ -191,10 +191,12 @@ then AC_SUBST([WOW64_DISABLE],[\#]) enable_fonts=${enable_fonts:-no} enable_include=${enable_include:-no} + enable_rpcss=${enable_rpcss:-no} enable_server=${enable_server:-no} enable_tools=${enable_tools:-no} enable_wineboot=${enable_wineboot:-no} enable_winedbg=${enable_winedbg:-no} + enable_winemenubuilder=${enable_winemenubuilder:-no} test "x$libdir" != "x\${exec_prefix}/lib" || libdir="\${exec_prefix}/lib32" fi

1 0

Roderick Colenbrander : wined3d: Use RECT instead of WINED3DRECT in stretch_rect_fbo.
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: ae26d9defde31bafa23b17bc97318fa25aeb8d6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae26d9defde31bafa23b17bc9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:18:58 2010 +0200 wined3d: Use RECT instead of WINED3DRECT in stretch_rect_fbo. --- dlls/wined3d/device.c | 44 ++++++++++++++++++++----------------- dlls/wined3d/surface.c | 47 +++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 41 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae26d9defde31bafa23b1…

1 0

Roderick Colenbrander : wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_direct.
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: 7f1f61e28e695d5e6a86e69500425022933929c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1f61e28e695d5e6a86e6950… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue Mar 30 22:18:59 2010 +0200 wined3d: Use RECT instead of WINED3DRECT in fb_copy_to_texture_direct. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3630da2..f028d10 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3409,7 +3409,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DS * with single pixel copy calls */ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3DSurface *SrcSurface, - const WINED3DRECT *srect, const WINED3DRECT *drect, BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) + const RECT *src_rect, const RECT *dst_rect, BOOL upsidedown, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DDeviceImpl *myDevice = This->resource.device; float xrel, yrel; @@ -3436,8 +3436,8 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } checkGLcall("glReadBuffer"); - xrel = (float) (srect->x2 - srect->x1) / (float) (drect->x2 - drect->x1); - yrel = (float) (srect->y2 - srect->y1) / (float) (drect->y2 - drect->y1); + xrel = (float) (src_rect->right - src_rect->left) / (float) (dst_rect->right - dst_rect->left); + yrel = (float) (src_rect->bottom - src_rect->top) / (float) (dst_rect->bottom - dst_rect->top); if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) { @@ -3460,18 +3460,18 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do */ glCopyTexSubImage2D(This->texture_target, This->texture_level, - drect->x1 /*xoffset */, drect->y1 /* y offset */, - srect->x1, Src->currentDesc.Height - srect->y2, - drect->x2 - drect->x1, drect->y2 - drect->y1); + dst_rect->left /*xoffset */, dst_rect->top /* y offset */, + src_rect->left, Src->currentDesc.Height - src_rect->bottom, + dst_rect->right - dst_rect->left, dst_rect->bottom - dst_rect->top); } else { - UINT yoffset = Src->currentDesc.Height - srect->y1 + drect->y1 - 1; + UINT yoffset = Src->currentDesc.Height - src_rect->top + dst_rect->top - 1; /* I have to process this row by row to swap the image, * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time * * However, stretching in x direction can be avoided if not necessary */ - for(row = drect->y1; row < drect->y2; row++) { + for(row = dst_rect->top; row < dst_rect->bottom; row++) { if ((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) { /* Well, that stuff works, but it's very slow. @@ -3479,15 +3479,15 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D */ UINT col; - for(col = drect->x1; col < drect->x2; col++) { + for(col = dst_rect->left; col < dst_rect->right; col++) { glCopyTexSubImage2D(This->texture_target, This->texture_level, - drect->x1 + col /* x offset */, row /* y offset */, - srect->x1 + col * xrel, yoffset - (int) (row * yrel), 1, 1); + dst_rect->left + col /* x offset */, row /* y offset */, + src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } } else { glCopyTexSubImage2D(This->texture_target, This->texture_level, - drect->x1 /* x offset */, row /* y offset */, - srect->x1, yoffset - (int) (row * yrel), drect->x2-drect->x1, 1); + dst_rect->left /* x offset */, row /* y offset */, + src_rect->left, yoffset - (int) (row * yrel), dst_rect->right-dst_rect->left, 1); } } } @@ -3994,7 +3994,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const } else if((!stretchx) || dst_rect.right - dst_rect.left > Src->currentDesc.Width || dst_rect.bottom - dst_rect.top > Src->currentDesc.Height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy\n"); - fb_copy_to_texture_direct(This, SrcSurface, (WINED3DRECT*)&src_rect, (WINED3DRECT*)&dst_rect, upsideDown, Filter); + fb_copy_to_texture_direct(This, SrcSurface, &src_rect, &dst_rect, upsideDown, Filter); } else { TRACE("Using hardware stretching to flip / stretch the texture\n"); fb_copy_to_texture_hwstretch(This, SrcSurface, srcSwapchain, (WINED3DRECT*)&src_rect, (WINED3DRECT*)&dst_rect, upsideDown, Filter);

1 0