April 2010 - Wine-Commits - list.winehq.org

Aric Stewart : include: Include fMergeNeutralItems in the SCRIPT_CONTROL Structure.
by Alexandre Julliard April 12, 2010

April 12, 2010

Module: wine Branch: master Commit: adfe42ca3f46a43615f4073fbd2403b4a76e0c8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfe42ca3f46a43615f4073fb… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 9 14:21:12 2010 -0500 include: Include fMergeNeutralItems in the SCRIPT_CONTROL Structure. --- include/usp10.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/usp10.h b/include/usp10.h index 6dc7584..315f2d7 100644 --- a/include/usp10.h +++ b/include/usp10.h @@ -99,7 +99,8 @@ typedef struct tag_SCRIPT_CONTROL { DWORD fNeutralOverride :1; DWORD fNumericOverride :1; DWORD fLegacyBidiClass :1; - DWORD fReserved :8; + DWORD fMergeNeutralItems :1; + DWORD fReserved :7; } SCRIPT_CONTROL; typedef struct {

1 0

André Hentschel : Website: German translation of 1.1. 42 release news item
by Jeremy Newman April 12, 2010

April 12, 2010

Module: website Branch: master Commit: d03d2a3112b2af8c0671334b8e4775b65d9757f2 URL: http://source.winehq.org/git/website.git/?a=commit;h=d03d2a3112b2af8c067133… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 3 14:55:42 2010 +0200 Website: German translation of 1.1.42 release news item --- news/de/2010040201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/de/2010040201.xml b/news/de/2010040201.xml new file mode 100644 index 0000000..7deef50 --- /dev/null +++ b/news/de/2010040201.xml @@ -0,0 +1,18 @@ +<news> +<date>2. April 2010</date> +<title>Wine 1.1.42 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.42 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.42">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für gemeinsame 32/64-Bit Installationen.</li> + <li>Dwarf Debuginfo Unterstützung für bessere Backtraces.</li> + <li>Unterstützung für mehr Standard Aktionen in MSI.</li> + <li>Das TIFF Bildformat wird in WinCodecs unterstützt.</li> + <li>Etliche Direct3D Verbesserungen.</li> + <li>Behebungen der Shell für bessere Internet Explorer Unterstützung.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.42.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Piotr Caban : msvcr90: Added __clean_type_info_names_internal stub.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 8ead1b575051b12a6f8d34157245b6c031ca5a01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ead1b575051b12a6f8d34157… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 9 17:00:26 2010 +0200 msvcr90: Added __clean_type_info_names_internal stub. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.c | 8 ++++++++ dlls/msvcr90/msvcr90.spec | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9d77dc2..d7d0395 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -142,7 +142,7 @@ @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv @ extern __badioinfo msvcrt.__badioinfo -@ stub __clean_type_info_names_internal +@ cdecl __clean_type_info_names_internal(ptr) msvcr90.__clean_type_info_names_internal @ stub __control87_2 @ stub __create_locale @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index c3515ee..0941443 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -114,3 +114,11 @@ char** CDECL __sys_errlist(void) { return (char**)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_sys_errlist"); } + +/********************************************************************* + * __clean_type_info_names_internal (MSVCR90.@) + */ +void CDECL __clean_type_info_names_internal(void *p) +{ + FIXME("(%p) stub\n", p); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 1d66b0b..9bfa23d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -139,7 +139,7 @@ @ extern __argc msvcrt.__argc @ extern __argv msvcrt.__argv @ extern __badioinfo msvcrt.__badioinfo -@ stub __clean_type_info_names_internal +@ cdecl __clean_type_info_names_internal(ptr) @ stub __control87_2 @ stub __create_locale @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA

1 0

Roderick Colenbrander : wined3d: Add an initial implementation of arbfp_blit_surface.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 76a971277976cc65826d7b05c2ed161eb0cd46c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76a971277976cc65826d7b05c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:51 2010 +0200 wined3d: Add an initial implementation of arbfp_blit_surface. --- dlls/wined3d/arb_program_shader.c | 55 +++++++++++++++++++++++++++++++++++++ dlls/wined3d/surface.c | 16 ++++++++++- dlls/wined3d/wined3d_private.h | 7 +++++ 3 files changed, 77 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 086bdb3..44c4ab0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6895,6 +6895,61 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum bli } } +HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, + IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, enum blit_operation blit_op, + DWORD Filter) +{ + struct wined3d_context *context; + IWineD3DSwapChainImpl *dst_swapchain = NULL; + RECT dst_rect = *dst_rect_in; + + /* Now load the surface */ + surface_internal_preload((IWineD3DSurface *)src_surface, SRGB_RGB); + + /* Activate the destination context, set it up for blitting */ + context = context_acquire(device, (IWineD3DSurface *)dst_surface, CTXUSAGE_BLIT); + + /* The coordinates of the ddraw front buffer are always fullscreen ('screen coordinates', + * while OpenGL coordinates are window relative. + * Also beware of the origin difference(top left vs bottom left). + * Also beware that the front buffer's surface size is screen width x screen height, + * whereas the real gl drawable size is the size of the window. + */ + IWineD3DSurface_GetContainer((IWineD3DSurface *)dst_surface, &IID_IWineD3DSwapChain, (void **)&dst_swapchain); + if (dst_swapchain) IWineD3DSwapChain_Release((IWineD3DSwapChain *)dst_swapchain); + if (dst_swapchain && (IWineD3DSurface *)dst_surface == dst_swapchain->frontBuffer) + { + RECT windowsize; + POINT offset = {0,0}; + UINT h; + ClientToScreen(context->win_handle, &offset); + GetClientRect(context->win_handle, &windowsize); + h = windowsize.bottom - windowsize.top; + dst_rect.left -= offset.x; dst_rect.right -=offset.x; + dst_rect.top -= offset.y; dst_rect.bottom -=offset.y; + dst_rect.top += dst_surface->currentDesc.Height - h; dst_rect.bottom += dst_surface->currentDesc.Height - h; + } + + arbfp_blit_set((IWineD3DDevice *)device, src_surface); + + ENTER_GL(); + + /* Draw a textured quad */ + draw_textured_quad(src_surface, src_rect, &dst_rect, Filter); + + LEAVE_GL(); + + /* Leave the opengl state valid for blitting */ + arbfp_blit_unset((IWineD3DDevice *)device); + + wglFlush(); /* Flush to ensure ordering across contexts. */ + + context_release(context); + + IWineD3DSurface_ModifyLocation((IWineD3DSurface *)dst_surface, SFLAG_INDRAWABLE, TRUE); + return WINED3D_OK; +} + static HRESULT arbfp_blit_color_fill(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect, DWORD fill_color) { FIXME("Color filling not implemented by arbfp_blit\n"); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ddbdcfd..1a9b6b0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -287,7 +287,7 @@ static inline void surface_get_rect(IWineD3DSurfaceImpl *This, const RECT *rect_ } /* GL locking and context activation is done by the caller */ -static void draw_textured_quad(IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) +void draw_textured_quad(IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) { IWineD3DBaseTextureImpl *texture; struct blt_info info; @@ -3859,6 +3859,20 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const return WINED3D_OK; } + if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) + && arbfp_blit.blit_supported(&myDevice->adapter->gl_info, BLIT_OP_BLIT, + &src_rect, Src->resource.usage, Src->resource.pool, Src->resource.format_desc, + &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) + { + HRESULT hr = arbfp_blit_surface(myDevice, Src, &src_rect, This, &dst_rect, BLIT_OP_BLIT, Filter); + + /* Clear the palette as the surface didn't have a palette attached, it would confuse GetPalette and other calls */ + if(paletteOverride) + Src->palette = NULL; + + return hr; + } + /* Color keying: Check if we have to do a color keyed blt, * and if not check if a color key is activated. * diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c574b9e..09e1b81 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1190,6 +1190,11 @@ extern const struct blit_shader ffp_blit DECLSPEC_HIDDEN; extern const struct blit_shader arbfp_blit DECLSPEC_HIDDEN; extern const struct blit_shader cpu_blit DECLSPEC_HIDDEN; +/* Temporary blit_shader helper functions */ +HRESULT arbfp_blit_surface(IWineD3DDeviceImpl *device, IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, + IWineD3DSurfaceImpl *dst_surface, const RECT *dst_rect_in, enum blit_operation blit_op, + DWORD Filter) DECLSPEC_HIDDEN; + typedef enum ContextUsage { CTXUSAGE_RESOURCELOAD = 1, /* Only loads textures: No State is applied */ CTXUSAGE_DRAWPRIM = 2, /* OpenGL states are set up for blitting DirectDraw surfaces */ @@ -2160,6 +2165,8 @@ void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, U void get_drawable_size_backbuffer(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_fbo(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; +void draw_textured_quad(IWineD3DSurfaceImpl *src_surface, const RECT *src_rect, + const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) DECLSPEC_HIDDEN; void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) DECLSPEC_HIDDEN; /* Surface flags: */

1 0

Vincent Povirk : gdiplus: Print the GdipCreateHalftonePalette FIXME only once.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 9a4618a4ba6bc98f50de68ad72b944e820b68d98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a4618a4ba6bc98f50de68ad7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 10:32:22 2010 -0500 gdiplus: Print the GdipCreateHalftonePalette FIXME only once. --- dlls/gdiplus/graphics.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 18dae2d..7510fa0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4481,7 +4481,12 @@ GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) { - FIXME("\n"); + static int calls; + + TRACE("\n"); + + if (!calls++) + FIXME("stub\n"); return NULL; }

1 0

Austin English : imm32: Quiet ImmGetOpenStatus fixme.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 8f77dd8aff469b85ea662452284a045fdee7d990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f77dd8aff469b85ea6624522… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Apr 9 10:56:41 2010 -0500 imm32: Quiet ImmGetOpenStatus fixme. --- dlls/imm32/imm.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 2898e5e..2a85b70 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1643,10 +1643,15 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) BOOL WINAPI ImmGetOpenStatus(HIMC hIMC) { InputContextData *data = hIMC; + static int i; if (!data) return FALSE; - FIXME("(%p): semi-stub\n", hIMC); + + TRACE("(%p): semi-stub\n", hIMC); + + if (!i++) + FIXME("(%p): semi-stub\n", hIMC); return data->IMC.fOpen; }

1 0

Vincent Povirk : gdiplus: Print the GdipGetFamilyName FIXME only once.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: 541d7a5ab2627fbb4f83fd97eaa57160af7a1705 URL: http://source.winehq.org/git/wine.git/?a=commit;h=541d7a5ab2627fbb4f83fd97e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Apr 9 10:34:52 2010 -0500 gdiplus: Print the GdipGetFamilyName FIXME only once. --- dlls/gdiplus/font.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 6e58f98..37cca71 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -643,12 +643,14 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily* FontFamily, GpFontFamily** GpStatus WINGDIPAPI GdipGetFamilyName (GDIPCONST GpFontFamily *family, WCHAR *name, LANGID language) { + static int lang_fixme; + if (family == NULL) return InvalidParameter; TRACE("%p, %p, %d\n", family, name, language); - if (language != LANG_NEUTRAL) + if (language != LANG_NEUTRAL && !lang_fixme++) FIXME("No support for handling of multiple languages!\n"); lstrcpynW (name, family->FamilyName, LF_FACESIZE);

1 0

Alexandre Julliard : gdi32: Avoid some rounding errors in AngleArc.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: bd5ccea53f088fca4a8716c876587abd3ee9e8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5ccea53f088fca4a8716c87… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 9 18:16:08 2010 +0200 gdi32: Avoid some rounding errors in AngleArc. --- dlls/gdi32/painting.c | 8 ++++---- dlls/gdi32/tests/path.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/painting.c b/dlls/gdi32/painting.c index fa498e0..1bcdc23 100644 --- a/dlls/gdi32/painting.c +++ b/dlls/gdi32/painting.c @@ -854,8 +854,8 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F if(!dc) return FALSE; /* Calculate the end point */ - x2 = x + cos((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; - y2 = y - sin((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius; + x2 = GDI_ROUND( x + cos((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius ); + y2 = GDI_ROUND( y - sin((eStartAngle+eSweepAngle)*M_PI/180) * dwRadius ); if(!PATH_IsPathOpen(dc->path) && dc->funcs->pAngleArc) { @@ -863,8 +863,8 @@ BOOL WINAPI AngleArc(HDC hdc, INT x, INT y, DWORD dwRadius, FLOAT eStartAngle, F result = dc->funcs->pAngleArc( dc->physDev, x, y, dwRadius, eStartAngle, eSweepAngle ); } else { /* do it using ArcTo */ - x1 = x + cos(eStartAngle*M_PI/180) * dwRadius; - y1 = y - sin(eStartAngle*M_PI/180) * dwRadius; + x1 = GDI_ROUND( x + cos(eStartAngle*M_PI/180) * dwRadius ); + y1 = GDI_ROUND( y - sin(eStartAngle*M_PI/180) * dwRadius ); arcdir = SetArcDirection( hdc, eSweepAngle >= 0 ? AD_COUNTERCLOCKWISE : AD_CLOCKWISE); result = ArcTo( hdc, x-dwRadius, y-dwRadius, x+dwRadius, y+dwRadius, diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index 4a8ea6d..66cd039 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -260,9 +260,9 @@ static const path_test_t anglearc_path[] = { {245, 200, PT_BEZIERTO, 0, 0}, /* 5 */ {200, 245, PT_BEZIERTO, 0, 0}, /* 6 */ {200, 300, PT_BEZIERTO, 0, 0}, /* 7 */ - {200, 300, PT_BEZIERTO, 0, 2}, /* 8 */ - {200, 300, PT_BEZIERTO, 0, 2}, /* 9 */ - {200, 300, PT_BEZIERTO, 0, 2}, /* 10 */ + {200, 300, PT_BEZIERTO, 0, 0}, /* 8 */ + {200, 300, PT_BEZIERTO, 0, 0}, /* 9 */ + {200, 300, PT_BEZIERTO, 0, 0}, /* 10 */ {231, 260, PT_LINETO, 0, 0}, /* 11 */ {245, 235, PT_BEZIERTO, 0, 0}, /* 12 */ {271, 220, PT_BEZIERTO, 0, 0}, /* 13 */ @@ -289,7 +289,7 @@ static void test_anglearc(void) CloseFigure(hdc); EndPath(hdc); - ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t), 1); + ok_path(hdc, "anglearc_path", anglearc_path, sizeof(anglearc_path)/sizeof(path_test_t), 0); done: ReleaseDC(0, hdc); }

1 0

Roderick Colenbrander : wined3d: Add an initial fbo_blit_supported implementation.
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: f1ca14cb5ba259b8eab9bccbb9a4813027c3beb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ca14cb5ba259b8eab9bccbb… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Mar 31 13:54:57 2010 +0200 wined3d: Add an initial fbo_blit_supported implementation. --- dlls/wined3d/surface.c | 67 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4f10c88..ddbdcfd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -989,17 +989,6 @@ void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) } } -static inline BOOL surface_can_stretch_rect(IWineD3DSurfaceImpl *src, IWineD3DSurfaceImpl *dst) -{ - return ((src->resource.format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src->resource.usage & WINED3DUSAGE_RENDERTARGET)) - && ((dst->resource.format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst->resource.usage & WINED3DUSAGE_RENDERTARGET)) - && (src->resource.format_desc->format == dst->resource.format_desc->format - || (is_identity_fixup(src->resource.format_desc->color_fixup) - && is_identity_fixup(dst->resource.format_desc->color_fixup))); -} - static BOOL surface_convert_color_to_argb(IWineD3DSurfaceImpl *This, DWORD color, DWORD *argb_color) { IWineD3DDeviceImpl *device = This->resource.device; @@ -3606,6 +3595,13 @@ static inline void fb_copy_to_texture_hwstretch(IWineD3DSurfaceImpl *This, IWine IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INTEXTURE, TRUE); } +/* Until the blit_shader is ready, define some prototypes here. */ +static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, + const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, + const struct wined3d_format_desc *src_format_desc, + const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, + const struct wined3d_format_desc *dst_format_desc); + /* Not called from the VTable */ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const RECT *DestRect, IWineD3DSurface *SrcSurface, const RECT *SrcRect, DWORD Flags, const WINEDDBLTFX *DDBltFx, @@ -3801,9 +3797,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const * FBO support, so it doesn't really make sense to try and make it work with different offscreen rendering * backends. */ - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && myDevice->adapter->gl_info.fbo_ops.glBlitFramebuffer - && surface_can_stretch_rect(Src, This)) + if (fbo_blit_supported(&myDevice->adapter->gl_info, BLIT_OP_BLIT, + &src_rect, Src->resource.usage, Src->resource.pool, Src->resource.format_desc, + &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) { stretch_rect_fbo((IWineD3DDevice *)myDevice, SrcSurface, &src_rect, (IWineD3DSurface *)This, &dst_rect, Filter); @@ -3845,10 +3841,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const Src->palette = This->palette; } - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO - && myDevice->adapter->gl_info.fbo_ops.glBlitFramebuffer - && !(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && surface_can_stretch_rect(Src, This)) + if (!(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) + && fbo_blit_supported(&myDevice->adapter->gl_info, BLIT_OP_BLIT, + &src_rect, Src->resource.usage, Src->resource.pool, Src->resource.format_desc, + &dst_rect, This->resource.usage, This->resource.pool, This->resource.format_desc)) { TRACE("Using stretch_rect_fbo\n"); /* The source is always a texture, but never the currently active render target, and the texture @@ -5125,3 +5121,38 @@ const struct blit_shader cpu_blit = { cpu_blit_supported, cpu_blit_color_fill }; + +static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_operation blit_op, + const RECT *src_rect, DWORD src_usage, WINED3DPOOL src_pool, + const struct wined3d_format_desc *src_format_desc, + const RECT *dst_rect, DWORD dst_usage, WINED3DPOOL dst_pool, + const struct wined3d_format_desc *dst_format_desc) +{ + if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) + return FALSE; + + /* We only support blitting. Things like color keying / color fill should + * be handled by other blitters. + */ + if (blit_op != BLIT_OP_BLIT) + return FALSE; + + /* Source and/or destination need to be on the GL side */ + if (src_pool == WINED3DPOOL_SYSTEMMEM || dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + + if(!((src_format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (src_usage & WINED3DUSAGE_RENDERTARGET)) + && ((dst_format_desc->Flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + return FALSE; + + if (!is_identity_fixup(src_format_desc->color_fixup) || + !is_identity_fixup(dst_format_desc->color_fixup)) + return FALSE; + + if (!(src_format_desc->format == dst_format_desc->format + || (is_identity_fixup(src_format_desc->color_fixup) + && is_identity_fixup(dst_format_desc->color_fixup)))) + return FALSE; + + return TRUE; +}

1 0

Roderick Colenbrander : wined3d: Move srgb checks away from d3dfmt_get_conv .
by Alexandre Julliard April 9, 2010

April 9, 2010

Module: wine Branch: master Commit: a4559e761b07038ce954e3c157001146a4f4c2a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4559e761b07038ce954e3c15… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:46 2010 +0200 wined3d: Move srgb checks away from d3dfmt_get_conv. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/surface.c | 67 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 43 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dc3e1af..3b87878 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5202,7 +5202,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, * surface to the destination's sysmem copy. If surface conversion is * needed, use BltFast instead to copy in sysmem and use regular surface * loading. */ - d3dfmt_get_conv(dst_impl, FALSE, TRUE, &dummy_desc, &convert, FALSE); + d3dfmt_get_conv(dst_impl, FALSE, TRUE, &dummy_desc, &convert); if (convert != NO_CONVERSION) return IWineD3DSurface_BltFast(dst_surface, dst_x, dst_y, src_surface, src_rect, 0); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cde239a..f9ca8d3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -720,9 +720,23 @@ static void surface_download_data(IWineD3DSurfaceImpl *This, const struct wined3 * correct texture. */ /* Context activation is done by the caller. */ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, GLsizei width, GLsizei height, const GLvoid *data) + const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height, const GLvoid *data) { - GLenum internal = format_desc->glInternal; + GLenum internal; + + if (srgb) + { + internal = format_desc->glGammaInternal; + } + else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET + && surface_is_offscreen((IWineD3DSurface *)This)) + { + internal = format_desc->rtInternal; + } + else + { + internal = format_desc->glInternal; + } TRACE("This %p, internal %#x, width %d, height %d, format %#x, type %#x, data %p.\n", This, internal, width, height, format_desc->glFormat, format_desc->glType, data); @@ -783,11 +797,25 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, const struct wined3d_ * the correct texture. */ /* Context activation is done by the caller. */ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct wined3d_gl_info *gl_info, - const struct wined3d_format_desc *format_desc, GLsizei width, GLsizei height) + const struct wined3d_format_desc *format_desc, BOOL srgb, GLsizei width, GLsizei height) { BOOL enable_client_storage = FALSE; const BYTE *mem = NULL; - GLenum internal = format_desc->glInternal; + GLenum internal; + + if (srgb) + { + internal = format_desc->glGammaInternal; + } + else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET + && surface_is_offscreen((IWineD3DSurface *)This)) + { + internal = format_desc->rtInternal; + } + else + { + internal = format_desc->glInternal; + } if (format_desc->heightscale != 1.0f && format_desc->heightscale != 0.0f) height *= format_desc->heightscale; @@ -1475,7 +1503,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) GLint prevRead; BOOL alloc_flag = srgb ? SFLAG_SRGBALLOCATED : SFLAG_ALLOCATED; - d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert, srgb); + d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &desc, &convert); /* Activate the surface to read from. In some situations it isn't the currently active target(e.g. backbuffer * locking during offscreen rendering). RESOURCELOAD is ok because glCopyTexSubImage2D isn't affected by any @@ -1518,7 +1546,7 @@ static void read_from_framebuffer_texture(IWineD3DSurfaceImpl *This, BOOL srgb) if (!(This->Flags & alloc_flag)) { - surface_allocate_surface(This, gl_info, &desc, This->pow2Width, This->pow2Height); + surface_allocate_surface(This, gl_info, &desc, srgb, This->pow2Width, This->pow2Height); This->Flags |= alloc_flag; } @@ -1553,7 +1581,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ if (surface->Flags & alloc_flag) return; - d3dfmt_get_conv(surface, TRUE, TRUE, &desc, &convert, srgb); + d3dfmt_get_conv(surface, TRUE, TRUE, &desc, &convert); if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; else surface->Flags &= ~SFLAG_CONVERTED; @@ -1569,7 +1597,7 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, const struct wined3d_ } surface_bind_and_dirtify(surface, srgb); - surface_allocate_surface(surface, gl_info, &desc, width, height); + surface_allocate_surface(surface, gl_info, &desc, srgb, width, height); surface->Flags |= alloc_flag; } @@ -2113,10 +2141,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_ReleaseDC(IWineD3DSurface *iface, HDC IWineD3DSurface Internal (No mapping to directx api) parts follow ****************************************************** */ -HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format_desc *desc, CONVERT_TYPES *convert, BOOL srgb_mode) +HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, struct wined3d_format_desc *desc, CONVERT_TYPES *convert) { BOOL colorkey_active = need_alpha_ck && (This->CKeyFlags & WINEDDSD_CKSRCBLT); - const struct wined3d_format_desc *glDesc = This->resource.format_desc; IWineD3DDeviceImpl *device = This->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL blit_supported = FALSE; @@ -2126,18 +2153,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ *desc = *This->resource.format_desc; *convert = NO_CONVERSION; - /* TODO: the caller should perform this check */ - if(srgb_mode) { - desc->glInternal = glDesc->glGammaInternal; - } - else if (This->resource.usage & WINED3DUSAGE_RENDERTARGET - && surface_is_offscreen((IWineD3DSurface *) This)) - { - desc->glInternal = glDesc->rtInternal; - } else { - desc->glInternal = glDesc->glInternal; - } - /* Ok, now look if we have to do any conversion */ switch(This->resource.format_desc->format) { @@ -4773,7 +4788,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D IWineD3DSurfaceImpl_LoadLocation(iface, SFLAG_INSYSMEM, rect); } - d3dfmt_get_conv(This, TRUE /* We need color keying */, FALSE /* We won't use textures */, &desc, &convert, FALSE); + d3dfmt_get_conv(This, TRUE /* We need color keying */, FALSE /* We won't use textures */, &desc, &convert); /* The width is in 'length' not in bytes */ width = This->currentDesc.Width; @@ -4831,7 +4846,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D struct wined3d_context *context = NULL; d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, - &desc, &convert, FALSE); + &desc, &convert); if(srgb) { if((This->Flags & (SFLAG_INTEXTURE | SFLAG_INSYSMEM)) == SFLAG_INTEXTURE) { @@ -4902,7 +4917,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D TRACE("non power of two support\n"); if (mem || (This->Flags & SFLAG_PBO)) { - surface_upload_data(This, gl_info, &desc, + surface_upload_data(This, gl_info, &desc, srgb, This->currentDesc.Width, This->currentDesc.Height, mem); } } else { @@ -4911,7 +4926,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D */ if (mem || (This->Flags & SFLAG_PBO)) { - surface_upload_data(This, gl_info, &desc, This->glRect.right - This->glRect.left, + surface_upload_data(This, gl_info, &desc, srgb, This->glRect.right - This->glRect.left, This->glRect.bottom - This->glRect.top, mem); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fc0a457..f12bd2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2242,7 +2242,7 @@ typedef enum { } CONVERT_TYPES; HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_texturing, - struct wined3d_format_desc *desc, CONVERT_TYPES *convert, BOOL srgb_mode) DECLSPEC_HIDDEN; + struct wined3d_format_desc *desc, CONVERT_TYPES *convert) DECLSPEC_HIDDEN; void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey) DECLSPEC_HIDDEN; BOOL palette9_changed(IWineD3DSurfaceImpl *This) DECLSPEC_HIDDEN;

1 0