March 2009 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d10core: Implement ID3D10Device::IASetInputLayout().
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: de7749b3fbf447399f8d1b22268e6043302a7bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7749b3fbf447399f8d1b222… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Implement ID3D10Device::IASetInputLayout(). --- dlls/d3d10core/device.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ff31b53..336ae85 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -166,7 +166,12 @@ static void STDMETHODCALLTYPE d3d10_device_PSSetConstantBuffers(ID3D10Device *if static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device *iface, ID3D10InputLayout *input_layout) { - FIXME("iface %p, input_layout %p stub!\n", iface, input_layout); + struct d3d10_device *This = (struct d3d10_device *)iface; + + TRACE("iface %p, input_layout %p\n", iface, input_layout); + + IWineD3DDevice_SetVertexDeclaration(This->wined3d_device, + ((struct d3d10_input_layout *)input_layout)->wined3d_decl); } static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *iface,

1 0

Henri Verbeet : wined3d: Care for things like pitch and blocksize when copying DXT surfaces.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 0591442469b8dfe28b05fb001d6b2338448d54aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=0591442469b8dfe28b05fb001… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 wined3d: Care for things like pitch and blocksize when copying DXT surfaces. --- dlls/wined3d/surface_base.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 8d9d941..4b1629d 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1664,6 +1664,10 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst /* Handle first the FOURCC surfaces... */ if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_FOURCC) { + UINT block_width; + UINT block_height; + UINT block_byte_size; + TRACE("Fourcc -> Fourcc copy\n"); if (trans) FIXME("trans arg not supported when a FOURCC surface is involved\n"); @@ -1675,8 +1679,37 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst ret = WINED3DERR_WRONGTEXTUREFORMAT; goto error; } - /* FIXME: Watch out that the size is correct for FOURCC surfaces */ - memcpy(dbuf, sbuf, This->resource.size); + + if (This->resource.format_desc->format == WINED3DFMT_DXT1) + { + block_width = 4; + block_height = 4; + block_byte_size = 8; + } + else if (This->resource.format_desc->format == WINED3DFMT_DXT2 + || This->resource.format_desc->format == WINED3DFMT_DXT3 + || This->resource.format_desc->format == WINED3DFMT_DXT4 + || This->resource.format_desc->format == WINED3DFMT_DXT5) + { + block_width = 4; + block_height = 4; + block_byte_size = 16; + } + else + { + FIXME("Unsupported FourCC format %s.\n", debug_d3dformat(This->resource.format_desc->format)); + block_width = 1; + block_height = 1; + block_byte_size = This->resource.format_desc->byte_count; + } + + for (y = 0; y < h; y += block_height) + { + memcpy(dbuf, sbuf, (w / block_width) * block_byte_size); + dbuf += dlock.Pitch; + sbuf += slock.Pitch; + } + goto error; } if ((sEntry->Flags & WINED3DFMT_FLAG_FOURCC) && !(dEntry->Flags & WINED3DFMT_FLAG_FOURCC))

1 0

Henri Verbeet : d3d10core: Set the initial buffer data, when present.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 4ccbc948a16eb84180381bd9e2359484e91e2c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ccbc948a16eb84180381bd9e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Set the initial buffer data, when present. --- dlls/d3d10core/device.c | 2 +- dlls/wined3d/device.c | 27 +++++++++++++++++++++++++-- include/wine/wined3d.idl | 1 + 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index bd82316..b0eae7f 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -620,7 +620,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBuffer(ID3D10Device *iface, wined3d_desc.misc_flags = desc->MiscFlags; hr = IWineD3DDevice_CreateBuffer(This->wined3d_device, &wined3d_desc, - (IUnknown *)object, &object->wined3d_buffer); + data ? data->pSysMem : NULL, (IUnknown *)object, &object->wined3d_buffer); if (FAILED(hr)) { ERR("CreateBuffer failed, returning %#x\n", hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0f6885f..aebcfaf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -435,13 +435,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetParent(IWineD3DDevice *iface, IUnkno } static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, - struct wined3d_buffer_desc *desc, IUnknown *parent, IWineD3DBuffer **buffer) + struct wined3d_buffer_desc *desc, const void *data, IUnknown *parent, IWineD3DBuffer **buffer) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_buffer *object; HRESULT hr; - TRACE("iface %p, desc %p, parent %p, buffer %p\n", iface, desc, parent, buffer); + TRACE("iface %p, desc %p, data %p, parent %p, buffer %p\n", iface, desc, data, parent, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) @@ -471,6 +471,29 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, TRACE("size %#x, usage=%#x, format %s, memory @ %p, iface @ %p\n", object->resource.size, object->resource.usage, debug_d3dformat(object->resource.format_desc->format), object->resource.allocatedMemory, object); + if (data) + { + BYTE *ptr; + + hr = IWineD3DBuffer_Map((IWineD3DBuffer *)object, 0, desc->byte_width, &ptr, 0); + if (FAILED(hr)) + { + ERR("Failed to map buffer, hr %#x\n", hr); + IWineD3DBuffer_Release((IWineD3DBuffer *)object); + return hr; + } + + memcpy(ptr, data, desc->byte_width); + + hr = IWineD3DBuffer_Unmap((IWineD3DBuffer *)object); + if (FAILED(hr)) + { + ERR("Failed to unmap buffer, hr %#x\n", hr); + IWineD3DBuffer_Release((IWineD3DBuffer *)object); + return hr; + } + } + *buffer = (IWineD3DBuffer *)object; return WINED3D_OK; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index ad6197f..604781b 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2909,6 +2909,7 @@ interface IWineD3DDevice : IWineD3DBase { HRESULT CreateBuffer( [in] struct wined3d_buffer_desc *desc, + [in] const void *data, [in] IUnknown *parent, [out] IWineD3DBuffer **buffer );

1 0

Henri Verbeet : d3d10core: Implement ID3D10Device::IASetVertexBuffers().
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 9ef184c168f47ae0c611b288c7ca0e9f45ce3fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ef184c168f47ae0c611b288c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 31 09:38:14 2009 +0200 d3d10core: Implement ID3D10Device::IASetVertexBuffers(). --- dlls/d3d10core/device.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 336ae85..bd82316 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -178,8 +178,17 @@ static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device *ifac UINT start_slot, UINT buffer_count, ID3D10Buffer *const *buffers, const UINT *strides, const UINT *offsets) { - FIXME("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p stub!\n", + struct d3d10_device *This = (struct d3d10_device *)iface; + unsigned int i; + + TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p\n", iface, start_slot, buffer_count, buffers, strides, offsets); + + for (i = 0; i < buffer_count; ++i) + { + IWineD3DDevice_SetStreamSource(This->wined3d_device, start_slot, + ((struct d3d10_buffer *)buffers[i])->wined3d_buffer, offsets[i], strides[i]); + } } static void STDMETHODCALLTYPE d3d10_device_IASetIndexBuffer(ID3D10Device *iface,

1 0

Damjan Jovanovic : winemenubuilder: Use the user-dirs desktop directory instead of hardcoding ~/Desktop.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 612d47d3b573d19b3d8f195a8e70d8b718d2addf URL: http://source.winehq.org/git/wine.git/?a=commit;h=612d47d3b573d19b3d8f195a8… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Mar 30 20:06:31 2009 +0200 winemenubuilder: Use the user-dirs desktop directory instead of hardcoding ~/Desktop. --- programs/winemenubuilder/winemenubuilder.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0c42b30..96d3c0f 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -146,6 +146,7 @@ typedef struct static char *xdg_config_dir; static char *xdg_data_dir; +static char *xdg_desktop_dir; /* Icon extraction routines * @@ -1382,7 +1383,7 @@ static BOOL InvokeShellLinker( IShellLinkW *sl, LPCWSTR link, BOOL bWait ) lastEntry = link_name; else ++lastEntry; - location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { r = !write_desktop_entry(location, lastEntry, escaped_path, escaped_args, escaped_description, work_dir, icon_name); @@ -1464,7 +1465,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link lastEntry = link_name; else ++lastEntry; - location = heap_printf("%s/Desktop/%s.desktop", getenv("HOME"), lastEntry); + location = heap_printf("%s/%s.desktop", xdg_desktop_dir, lastEntry); if (location) { r = !write_desktop_entry(location, lastEntry, "winebrowser", escaped_urlPath, NULL, NULL, NULL); @@ -1705,6 +1706,16 @@ static CHAR *next_token( LPSTR *p ) static BOOL init_xdg(void) { + WCHAR shellDesktopPath[MAX_PATH]; + HRESULT hr = SHGetFolderPathW(NULL, CSIDL_DESKTOP, NULL, SHGFP_TYPE_CURRENT, shellDesktopPath); + if (SUCCEEDED(hr)) + xdg_desktop_dir = wine_get_unix_file_name(shellDesktopPath); + if (xdg_desktop_dir == NULL) + { + WINE_ERR("error looking up the desktop directory\n"); + return FALSE; + } + if (getenv("XDG_CONFIG_HOME")) xdg_config_dir = heap_printf("%s/menus/applications-merged", getenv("XDG_CONFIG_HOME")); else @@ -1730,6 +1741,7 @@ static BOOL init_xdg(void) } HeapFree(GetProcessHeap(), 0, xdg_config_dir); } + WINE_ERR("out of memory\n"); return FALSE; } @@ -1744,7 +1756,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show BOOL bURL = FALSE; int ret = 0; - init_xdg(); + if (!init_xdg()) + return 1; for( p = cmdline; p && *p; ) {

1 0

Igor Tarasov : comctl32: CCS_VERT flips toolbar separators orientation.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 88b64d486d865679ace4eb942df2855ce71310a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b64d486d865679ace4eb942… Author: Igor Tarasov <tarasov.igor(a)gmail.com> Date: Mon Mar 30 21:05:40 2009 +0500 comctl32: CCS_VERT flips toolbar separators orientation. --- dlls/comctl32/toolbar.c | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 5ef701d..92a1366 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -492,9 +492,9 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info /*********************************************************************** -* TOOLBAR_DrawDDFlatSeparator +* TOOLBAR_DrawFlatHorizontalSeparator * -* This function draws the separator that was flagged as BTNS_DROPDOWN. +* This function draws horizontal separator for toolbars having CCS_VERT style. * In this case, the separator is a pixel high line of COLOR_BTNSHADOW, * followed by a pixel high line of COLOR_BTNHIGHLIGHT. These separators * are horizontal as opposed to the vertical separators for not dropdown @@ -503,7 +503,7 @@ TOOLBAR_DrawFlatSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *info * FIXME: It is possible that the height of each line is really SM_CYBORDER. */ static void -TOOLBAR_DrawDDFlatSeparator (const RECT *lpRect, HDC hdc, +TOOLBAR_DrawFlatHorizontalSeparator (const RECT *lpRect, HDC hdc, const TOOLBAR_INFO *infoPtr) { RECT myrect; @@ -855,8 +855,8 @@ TOOLBAR_DrawButton (HWND hwnd, TBUTTON_INFO *btnPtr, HDC hdc, DWORD dwBaseCustDr /* empirical tests show that iBitmap can/will be non-zero */ /* when drawing the vertical bar... */ if ((dwStyle & TBSTYLE_FLAT) /* && (btnPtr->iBitmap == 0) */) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) - TOOLBAR_DrawDDFlatSeparator (&rc, hdc, infoPtr); + if (dwStyle & CCS_VERT) + TOOLBAR_DrawFlatHorizontalSeparator (&rc, hdc, infoPtr); else TOOLBAR_DrawFlatSeparator (&rc, hdc, infoPtr); } @@ -1330,10 +1330,9 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ /* */ - /* BTNS_DROPDOWN separators are treated as buttons for */ - /* width. - GA 8/01 */ + /* horizontal separators are treated as buttons for width */ if ((btnPtr[i].fsStyle & BTNS_SEP) && - !(btnPtr[i].fsStyle & BTNS_DROPDOWN)) + !(infoPtr->dwStyle & CCS_VERT)) cx = (btnPtr[i].iBitmap > 0) ? btnPtr[i].iBitmap : SEPARATOR_WIDTH; else @@ -1689,7 +1688,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ if (btnPtr->fsStyle & BTNS_SEP) { - if (btnPtr->fsStyle & BTNS_DROPDOWN) { + if (infoPtr->dwStyle & CCS_VERT) { cy = (btnPtr->iBitmap > 0) ? btnPtr->iBitmap : SEPARATOR_WIDTH; cx = infoPtr->nButtonWidth; @@ -1762,7 +1761,7 @@ TOOLBAR_LayoutToolbar(HWND hwnd) /* UNDOCUMENTED: If a separator has a non zero bitmap index, */ /* it is the actual width of the separator. This is used for */ /* custom controls in toolbars. */ - if ( !(btnPtr->fsStyle & BTNS_DROPDOWN)) + if ( !(infoPtr->dwStyle & CCS_VERT)) y += cy + ( (btnPtr->iBitmap > 0 ) ? btnPtr->iBitmap : SEPARATOR_WIDTH) * 2 /3; else

1 0

Alexandre Julliard : include: Try to avoid socklen_t redefinition in winsock.h.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: a6aa7771d3b7db21819ce8f07518f85149404039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6aa7771d3b7db21819ce8f07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 12:19:03 2009 +0200 include: Try to avoid socklen_t redefinition in winsock.h. --- include/winsock.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/winsock.h b/include/winsock.h index 537e16a..6870197 100644 --- a/include/winsock.h +++ b/include/winsock.h @@ -79,12 +79,14 @@ # define fd_set unix_fd_set # define timeval unix_timeval # define select unix_select +# define socklen_t unix_socklen_t # include <sys/types.h> # include <time.h> # include <stdlib.h> # undef fd_set # undef timeval # undef select +# undef socklen_t # undef FD_SETSIZE # undef FD_CLR # undef FD_SET

1 0

Tobias Jakobi : wined3d: Add pow2Matrix_identity flag to BaseTextureClass struct.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 31f8cd9621f6074293eeac21745adfce7cefdaef URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f8cd9621f6074293eeac217… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:12:50 2009 +0100 wined3d: Add pow2Matrix_identity flag to BaseTextureClass struct. New flag helps to quickly find out whether the pow2Matrix is a identity matrix (no texcoord fixup needed) or not. --- dlls/wined3d/basetexture.c | 1 + dlls/wined3d/device.c | 18 +++++++++++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 8349064..caf2148 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -35,6 +35,7 @@ void basetexture_init(struct IWineD3DBaseTextureClass *texture, UINT levels, DWO texture->dirty = TRUE; texture->srgbDirty = TRUE; texture->is_srgb = FALSE; + texture->pow2Matrix_identity = TRUE; } void basetexture_cleanup(IWineD3DBaseTexture *iface) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5d3f400..0f6885f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1233,6 +1233,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, (Width != pow2Width || Height != pow2Height) && !((Format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) && (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX))) { + if ((Width != 1) || (Height != 1)) { + object->baseTexture.pow2Matrix_identity = FALSE; + } + object->baseTexture.pow2Matrix[0] = (float)Width; object->baseTexture.pow2Matrix[5] = (float)Height; object->baseTexture.pow2Matrix[10] = 1.0; @@ -1241,8 +1245,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, object->cond_np2 = TRUE; object->baseTexture.minMipLookup = minMipLookup_noFilter; } else { - object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); - object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + if ((Width != pow2Width) || (Height != pow2Height)) { + object->baseTexture.pow2Matrix_identity = FALSE; + object->baseTexture.pow2Matrix[0] = (((float)Width) / ((float)pow2Width)); + object->baseTexture.pow2Matrix[5] = (((float)Height) / ((float)pow2Height)); + } else { + object->baseTexture.pow2Matrix[0] = 1.0; + object->baseTexture.pow2Matrix[5] = 1.0; + } + object->baseTexture.pow2Matrix[10] = 1.0; object->baseTexture.pow2Matrix[15] = 1.0; object->target = GL_TEXTURE_2D; @@ -1540,7 +1551,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface pow2EdgeLength = 1; while (pow2EdgeLength < EdgeLength) pow2EdgeLength <<= 1; - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) || (EdgeLength == pow2EdgeLength)) { /* Precalculated scaling for 'faked' non power of two texture coords */ object->baseTexture.pow2Matrix[ 0] = 1.0; object->baseTexture.pow2Matrix[ 5] = 1.0; @@ -1552,6 +1563,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface object->baseTexture.pow2Matrix[ 5] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[10] = ((float)EdgeLength) / ((float)pow2EdgeLength); object->baseTexture.pow2Matrix[15] = 1.0; + object->baseTexture.pow2Matrix_identity = FALSE; } if (object->resource.format_desc->Flags & WINED3DFMT_FLAG_FILTERING) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fdd28da..abab9dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1384,6 +1384,7 @@ typedef struct IWineD3DBaseTextureClass LONG bindCount; DWORD sampler; BOOL is_srgb; + BOOL pow2Matrix_identity; const struct min_lookup *minMipLookup; const GLenum *magLookup; void (*internal_preload)(IWineD3DBaseTexture *iface, enum WINED3DSRGB srgb);

1 0

Tobias Jakobi : wined3d: Add texrect_fixup bitfield to ps_compile_args struct.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 1b335dfaaa8fc2f2a45c5979beecaae84e019ae3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b335dfaaa8fc2f2a45c5979b… Author: Tobias Jakobi <liquid.acid(a)gmx.net> Date: Thu Mar 26 03:15:21 2009 +0100 wined3d: Add texrect_fixup bitfield to ps_compile_args struct. Initialization of the bitfield done in find_ps_compile_args based on the previously introduced pow2Matrix_identity flag. --- dlls/wined3d/pixelshader.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/pixelshader.c b/dlls/wined3d/pixelshader.c index a974ca5..de609a7 100644 --- a/dlls/wined3d/pixelshader.c +++ b/dlls/wined3d/pixelshader.c @@ -460,6 +460,7 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp memset(args, 0, sizeof(*args)); /* FIXME: Make sure all bits are set */ args->srgb_correction = stateblock->renderState[WINED3DRS_SRGBWRITEENABLE] ? 1 : 0; + args->texrect_fixup = 0; for(i = 0; i < MAX_FRAGMENT_SAMPLERS; i++) { if(shader->baseShader.reg_maps.samplers[i] == 0) continue; @@ -469,6 +470,11 @@ void find_ps_compile_args(IWineD3DPixelShaderImpl *shader, IWineD3DStateBlockImp continue; } args->color_fixup[i] = tex->resource.format_desc->color_fixup; + + /* Flag samplers that need NP2 texcoord fixup. */ + if(!tex->baseTexture.pow2Matrix_identity) { + args->texrect_fixup |= (1 << i); + } } if (shader->baseShader.reg_maps.shader_version >= WINED3DPS_VERSION(3,0)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abab9dc..8907b0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -446,11 +446,15 @@ enum fogmode { */ struct ps_compile_args { struct color_fixup_desc color_fixup[MAX_FRAGMENT_SAMPLERS]; - BOOL srgb_correction; enum vertexprocessing_mode vp_mode; enum fogmode fog; /* Projected textures(ps 1.0-1.3) */ /* Texture types(2D, Cube, 3D) in ps 1.x */ + BOOL srgb_correction; + WORD texrect_fixup; + /* Bitmap for texture rect coord fixups (16 samplers max currently). + D3D9 has a limit of 16 samplers and the fixup is superfluous + in D3D10 (unconditional NP2 support mandatory). */ }; #define MAX_ATTRIBS 16

1 0

Alexandre Julliard : inetcomm: Include ws2tcpip.h before anything else.
by Alexandre Julliard March 31, 2009

March 31, 2009

Module: wine Branch: master Commit: 2e8d68d68301d3f6a4a4874a38d29dd5203161fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e8d68d68301d3f6a4a4874a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 31 12:12:13 2009 +0200 inetcomm: Include ws2tcpip.h before anything else. --- dlls/inetcomm/internettransport.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/inetcomm/internettransport.c b/dlls/inetcomm/internettransport.c index f0499bc..af4772c 100644 --- a/dlls/inetcomm/internettransport.c +++ b/dlls/inetcomm/internettransport.c @@ -20,19 +20,15 @@ #define COBJMACROS -#include <stdarg.h> -#include <stdio.h> - +#include "ws2tcpip.h" #include "windef.h" -#include "winbase.h" #include "winnt.h" -#include "winuser.h" -#include "winsock2.h" -#include "ws2tcpip.h" #include "objbase.h" #include "ole2.h" #include "mimeole.h" +#include <stdio.h> + #include "wine/debug.h" #include "inetcomm_private.h"

1 0