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

Maarten Lankhorst : winealsa.drv: Ignore unused bytes in wave headers.
by Alexandre Julliard 12 Apr '10

12 Apr '10

Module: wine Branch: master Commit: 8f6d268ee42a9726fcffb01568791df73adcd867 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6d268ee42a9726fcffb0156… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Apr 8 21:54:50 2010 +0200 winealsa.drv: Ignore unused bytes in wave headers. --- dlls/winealsa.drv/waveout.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index 5c3787b..df0027f 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -256,7 +256,7 @@ static int wodPlayer_WriteMaxFrags(WINE_WAVEDEV* wwo, DWORD* frames) written = 0; wwo->dwPartialOffset += snd_pcm_frames_to_bytes(wwo->pcm, written); - if ( wwo->dwPartialOffset >= lpWaveHdr->dwBufferLength) { + if (wwo->dwPartialOffset + wwo->format.Format.nBlockAlign - 1 >= lpWaveHdr->dwBufferLength) { /* this will be used to check if the given wave header has been fully played or not... */ wwo->dwPartialOffset = lpWaveHdr->dwBufferLength; /* If we wrote all current wavehdr, skip to the next one */

1 0

André Hentschel : Website: German translation of 1.1. 42 release news item
by Jeremy Newman 12 Apr '10

12 Apr '10

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

Roderick Colenbrander : wined3d: Add an initial implementation of arbfp_blit_surface.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Alexandre Julliard : gdi32: Avoid some rounding errors in AngleArc.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Piotr Caban : msvcr90: Added __clean_type_info_names_internal stub.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Vincent Povirk : gdiplus: Print the GdipCreateHalftonePalette FIXME only once.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Vincent Povirk : gdiplus: Print the GdipGetFamilyName FIXME only once.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Austin English : imm32: Quiet ImmGetOpenStatus fixme.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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

Roderick Colenbrander : wined3d: Move X8L8V8U8 surface conversion to the format table.
by Alexandre Julliard 09 Apr '10

09 Apr '10

Module: wine Branch: master Commit: 7df7ce40c32e12565281af06761378ca1c3e9388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7df7ce40c32e12565281af067… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Apr 8 22:49:49 2010 +0200 wined3d: Move X8L8V8U8 surface conversion to the format table. --- dlls/wined3d/surface.c | 57 ----------------------------------------------- dlls/wined3d/utils.c | 58 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 39029b1..4f10c88 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2247,20 +2247,6 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ } break; - case WINED3DFMT_R8G8_SNORM_L8X8_UNORM: - *convert = CONVERT_X8L8V8U8; - desc->conv_byte_count = 4; - if (gl_info->supported[NV_TEXTURE_SHADER]) - { - /* Use formats from gl table. It is a bit unfortunate, but the conversion - * is needed to set the X format to 255 to get 1.0 for alpha when sampling - * the texture. OpenGL can't use GL_DSDT8_MAG8_NV as internal format with - * the needed type and format parameter, so the internal format contains a - * 4th component, which is returned as alpha - */ - } - break; - case WINED3DFMT_L4A4_UNORM: /* WINED3DFMT_L4A4_UNORM exists as an internal gl format, but for some reason there is not * format+type combination to load it. Thus convert it to A8L8, then load it @@ -2612,49 +2598,6 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI break; } - case CONVERT_X8L8V8U8: - { - unsigned int x, y; - const DWORD *Source; - unsigned char *Dest; - - if (gl_info->supported[NV_TEXTURE_SHADER]) - { - /* This implementation works with the fixed function pipeline and shaders - * without further modification after converting the surface. - */ - for(y = 0; y < height; y++) { - Source = (const DWORD *)(src + y * pitch); - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - long color = (*Source++); - /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ - /* V */ Dest[1] = ((color >> 8 ) & 0xff); /* V */ - /* U */ Dest[0] = (color & 0xff); /* U */ - /* I */ Dest[3] = 255; /* X */ - Dest += 4; - } - } - } else { - /* Doesn't work correctly with the fixed function pipeline, but can work in - * shaders if the shader is adjusted. (There's no use for this format in gl's - * standard fixed function pipeline anyway). - */ - for(y = 0; y < height; y++) { - Source = (const DWORD *)(src + y * pitch); - Dest = dst + y * outpitch; - for (x = 0; x < width; x++ ) { - long color = (*Source++); - /* B */ Dest[0] = ((color >> 16) & 0xff); /* L */ - /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ - /* R */ Dest[2] = (color & 0xff) + 128; /* U */ - Dest += 4; - } - } - } - break; - } - case CONVERT_A4L4: { unsigned int x, y; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bda0bde..9a3e762 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -263,6 +263,56 @@ static void convert_r8g8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT widt } } +static void convert_r8g8_snorm_l8x8_unorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const DWORD *Source; + unsigned char *Dest; + + /* Doesn't work correctly with the fixed function pipeline, but can work in + * shaders if the shader is adjusted. (There's no use for this format in gl's + * standard fixed function pipeline anyway). + */ + for(y = 0; y < height; y++) + { + Source = (const DWORD *)(src + y * pitch); + Dest = dst + y * pitch; + for (x = 0; x < width; x++ ) + { + long color = (*Source++); + /* B */ Dest[0] = ((color >> 16) & 0xff); /* L */ + /* G */ Dest[1] = ((color >> 8 ) & 0xff) + 128; /* V */ + /* R */ Dest[2] = (color & 0xff) + 128; /* U */ + Dest += 4; + } + } +} + +static void convert_r8g8_snorm_l8x8_unorm_nv(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) +{ + unsigned int x, y; + const DWORD *Source; + unsigned char *Dest; + + /* This implementation works with the fixed function pipeline and shaders + * without further modification after converting the surface. + */ + for(y = 0; y < height; y++) + { + Source = (const DWORD *)(src + y * pitch); + Dest = dst + y * pitch; + for (x = 0; x < width; x++ ) + { + long color = (*Source++); + /* L */ Dest[2] = ((color >> 16) & 0xff); /* L */ + /* V */ Dest[1] = ((color >> 8 ) & 0xff); /* V */ + /* U */ Dest[0] = (color & 0xff); /* U */ + /* I */ Dest[3] = 255; /* X */ + Dest += 4; + } + } +} + static void convert_r8g8b8a8_snorm(const BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height) { unsigned int x, y; @@ -507,13 +557,13 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, NV_TEXTURE_SHADER, NULL}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_RGB8, GL_RGB8, 0, - GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 0, + GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - WINED3D_GL_EXT_NONE, NULL}, + WINED3D_GL_EXT_NONE, &convert_r8g8_snorm_l8x8_unorm}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, GL_DSDT8_MAG8_INTENSITY8_NV, GL_DSDT8_MAG8_INTENSITY8_NV, 0, - GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, 0, + GL_DSDT_MAG_VIB_NV, GL_UNSIGNED_INT_8_8_S8_S8_REV_NV, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, - NV_TEXTURE_SHADER, NULL}, + NV_TEXTURE_SHADER, &convert_r8g8_snorm_l8x8_unorm_nv}, {WINED3DFMT_R8G8B8A8_SNORM, GL_RGBA8, GL_RGBA8, 0, GL_BGRA, GL_UNSIGNED_BYTE, 4, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING,

1 0

Roderick Colenbrander : wined3d: Add an initial fbo_blit_supported implementation.
by Alexandre Julliard 09 Apr '10

09 Apr '10

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