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

Chris Robinson : quartz: Release objects when pins fail to connect.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: d8dc9fb319e48d23b72ea8d9fb286dc22888393b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8dc9fb319e48d23b72ea8d9f… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Mar 14 06:42:37 2007 -0700 quartz: Release objects when pins fail to connect. --- dlls/quartz/pin.c | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 28d461a..b3aa042 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -79,31 +79,40 @@ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const * connected pin */ if (SUCCEEDED(hr)) { + This->pMemInputPin = NULL; hr = IPin_QueryInterface(pReceivePin, &IID_IMemInputPin, (LPVOID)&This->pMemInputPin); if (SUCCEEDED(hr)) - hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pMemAlloc); - - if (hr == VFW_E_NO_ALLOCATOR) { - /* Input pin provides no allocator, use standard memory allocator */ - hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAlloc); + hr = IMemInputPin_GetAllocator(This->pMemInputPin, &pMemAlloc); - if (SUCCEEDED(hr)) + if (hr == VFW_E_NO_ALLOCATOR) { - hr = IMemInputPin_NotifyAllocator(This->pMemInputPin, pMemAlloc, FALSE); + /* Input pin provides no allocator, use standard memory allocator */ + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)&pMemAlloc); + + if (SUCCEEDED(hr)) + { + hr = IMemInputPin_NotifyAllocator(This->pMemInputPin, pMemAlloc, FALSE); + } } - } - if (SUCCEEDED(hr)) - hr = IMemAllocator_SetProperties(pMemAlloc, &This->allocProps, &actual); + if (SUCCEEDED(hr)) + hr = IMemAllocator_SetProperties(pMemAlloc, &This->allocProps, &actual); - if (pMemAlloc) - IMemAllocator_Release(pMemAlloc); + if (pMemAlloc) + IMemAllocator_Release(pMemAlloc); + } /* break connection if we couldn't get the allocator */ if (FAILED(hr)) + { + if (This->pMemInputPin) + IMemInputPin_Release(This->pMemInputPin); + This->pMemInputPin = NULL; + IPin_Disconnect(pReceivePin); + } } if (FAILED(hr)) @@ -1069,6 +1078,8 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const } } + This->pReader = NULL; + This->pAlloc = NULL; if (SUCCEEDED(hr)) { hr = IPin_QueryInterface(pReceivePin, &IID_IAsyncReader, (LPVOID *)&This->pReader); @@ -1095,6 +1106,15 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin); } + else + { + if (This->pReader) + IAsyncReader_Release(This->pReader); + This->pReader = NULL; + if (This->pAlloc) + IMemAllocator_Release(This->pAlloc); + This->pAlloc = NULL; + } } LeaveCriticalSection(This->pin.pCritSec); return hr;

1 0

Chris Robinson : quartz: Disconnect pins when their filter is removed.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 54f4a4a779dd534f900586c7eed640d0e07ceafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=54f4a4a779dd534f900586c7e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Mar 14 07:19:17 2007 -0700 quartz: Disconnect pins when their filter is removed. --- dlls/quartz/filtergraph.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 724feda..044ff01 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -416,7 +416,17 @@ static HRESULT WINAPI GraphBuilder_RemoveFilter(IGraphBuilder *iface, { if (This->ppFiltersInGraph[i] == pFilter) { - /* FIXME: disconnect pins */ + IEnumPins *penumpins; + hr = IBaseFilter_EnumPins(pFilter, &penumpins); + if (SUCCEEDED(hr)) { + IPin *ppin; + while(IEnumPins_Next(penumpins, 1, &ppin, NULL) == S_OK) { + IPin_Disconnect(ppin); + IPin_Release(ppin); + } + IEnumPins_Release(penumpins); + } + hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, This->pFilterNames[i]); if (SUCCEEDED(hr)) {

1 0

Stefan Dösinger : wined3d: Store an array of contexts in the swapchain.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 90fe64cee017dc5e835dc1b1ab22f76b14ccab53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90fe64cee017dc5e835dc1b1a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 4 17:31:06 2007 +0100 wined3d: Store an array of contexts in the swapchain. This is a preparation for using multiple contexts on one drawable to handle multithreading. --- dlls/wined3d/context.c | 8 ++++---- dlls/wined3d/device.c | 17 +++++++++++------ dlls/wined3d/swapchain.c | 16 ++++++++++------ dlls/wined3d/wined3d_private.h | 5 +++-- 4 files changed, 28 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90fe64cee017dc5e835dc…

1 0

A C Hurst : wined3d: Fix struct size calculation in EnumTextureFormats.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 8f14d4639dc86d58a1d4be5f1a92a4ced165028c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f14d4639dc86d58a1d4be5f1… Author: A C Hurst <A.Hurst(a)sheffield.ac.uk> Date: Sat Mar 17 22:22:38 2007 +0000 wined3d: Fix struct size calculation in EnumTextureFormats. --- dlls/ddraw/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 0814921..231e2cd 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1207,7 +1207,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, sdesc.dwSize = sizeof(sdesc); sdesc.dwFlags = DDSD_PIXELFORMAT | DDSD_CAPS; sdesc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - sdesc.ddpfPixelFormat.dwSize = sizeof(sdesc.ddpfPixelFormat.dwSize); + sdesc.ddpfPixelFormat.dwSize = sizeof(sdesc.ddpfPixelFormat); PixelFormat_WineD3DtoDD(&sdesc.ddpfPixelFormat, FormatList[i]); TRACE("Enumerating WineD3DFormat %d\n", FormatList[i]);

1 0

Kai Blin : netapi32: Downgrade a FIXME and an ERR to a trace to not clutter test output on handled error conditions .
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 4b4518532a797a97e0a8ffc3cd6ed3d9a5031e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4518532a797a97e0a8ffc3c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Mar 18 19:52:29 2007 +0100 netapi32: Downgrade a FIXME and an ERR to a trace to not clutter test output on handled error conditions. --- dlls/netapi32/access.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 94d8b23..a839012 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -91,7 +91,7 @@ static BOOL NETAPI_IsKnownUser(LPCWSTR UserName) #define NETAPI_ForceKnownUser(UserName, FailureCode) \ if (!NETAPI_IsKnownUser(UserName)) \ { \ - FIXME("Can't find information for user %s\n", \ + TRACE("Can't find information for user %s\n", \ debugstr_w(UserName)); \ return FailureCode; \ } @@ -296,7 +296,7 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, return NERR_InternalError; } default: - ERR("Invalid level %d is specified\n", level); + TRACE("Invalid level %d is specified\n", level); return ERROR_INVALID_LEVEL; } return NERR_Success;

1 0

Chris Robinson : quartz: Hold a reference on a filter while sending data to it.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 52529c923d8e0712fa42a2ca340d5e8f46a57035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52529c923d8e0712fa42a2ca3… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Mar 14 06:39:58 2007 -0700 quartz: Hold a reference on a filter while sending data to it. --- dlls/quartz/pin.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 9cc05da..28d461a 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -880,6 +880,7 @@ HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample) { HRESULT hr = S_OK; IMemInputPin * pMemConnected = NULL; + PIN_INFO pinInfo; EnterCriticalSection(This->pin.pCritSec); { @@ -889,9 +890,10 @@ HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample) { /* we don't have the lock held when using This->pMemInputPin, * so we need to AddRef it to stop it being deleted while we are - * using it. */ + * using it. Same with its filter. */ pMemConnected = This->pMemInputPin; IMemInputPin_AddRef(pMemConnected); + hr = IPin_QueryPinInfo(This->pin.pConnectedTo, &pinInfo); } } LeaveCriticalSection(This->pin.pCritSec); @@ -902,9 +904,11 @@ HRESULT OutputPin_SendSample(OutputPin * This, IMediaSample * pSample) * then it causes some problems (most notably with the native Video * Renderer) if we are re-entered for whatever reason */ hr = IMemInputPin_Receive(pMemConnected, pSample); - IMemInputPin_Release(pMemConnected); + IBaseFilter_Release(pinInfo.pFilter); } - + if (pMemConnected) + IMemInputPin_Release(pMemConnected); + return hr; } @@ -1155,6 +1159,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) REFERENCE_TIME rtCurrent; ALLOCATOR_PROPERTIES allocProps; + PIN_INFO pinInfo; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -1175,6 +1180,8 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) REFERENCE_TIME rtSampleStop; DWORD_PTR dwUser; + pinInfo.pFilter = NULL; + TRACE("Process sample\n"); hr = IMemAllocator_GetBuffer(This->pAlloc, &pSample, NULL, NULL, 0); @@ -1195,10 +1202,15 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) hr = IAsyncReader_WaitForNext(This->pReader, 10000, &pSample, &dwUser); if (SUCCEEDED(hr)) + hr = IPin_QueryPinInfo((IPin*)&This->pin, &pinInfo); + + if (SUCCEEDED(hr)) hr = This->fnSampleProc(This->pin.pUserData, pSample); else ERR("Processing error: %x\n", hr); - + + if (pinInfo.pFilter) + IBaseFilter_Release(pinInfo.pFilter); if (pSample) IMediaSample_Release(pSample); }

1 0

Stefan Dösinger : wined3d/ddraw: Forward DDSCL_MULTITHREADED to wined3d.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 022e88434262e8623bb7867f83e0ef10aaba7502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022e88434262e8623bb7867f8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Mar 4 17:03:03 2007 +0100 wined3d/ddraw: Forward DDSCL_MULTITHREADED to wined3d. --- dlls/d3d8/directx.c | 4 ++++ dlls/d3d9/directx.c | 5 +++++ dlls/ddraw/ddraw.c | 16 +++++++++++----- dlls/wined3d/device.c | 17 +++++++++++++++++ dlls/wined3d/wined3d_private_types.h | 5 ++++- include/wine/wined3d_interface.h | 2 ++ include/wine/wined3d_types.h | 1 - 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 1349f57..e05d647 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -377,6 +377,10 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->FullScreen_PresentationInterval; + if(BehaviourFlags & D3DCREATE_MULTITHREADED) { + IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); + } + hr = IWineD3DDevice_Init3D(object->WineD3DDevice, &localParameters, D3D8CB_CreateAdditionalSwapChain); pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1c34637..f15aa4d 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -367,6 +367,10 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapte localParameters.FullScreen_RefreshRateInHz = pPresentationParameters->FullScreen_RefreshRateInHz; localParameters.PresentationInterval = pPresentationParameters->PresentationInterval; + if(BehaviourFlags & D3DCREATE_MULTITHREADED) { + IWineD3DDevice_SetMultithreaded(object->WineD3DDevice); + } + hr = IWineD3DDevice_Init3D(object->WineD3DDevice, &localParameters, D3D9CB_CreateAdditionalSwapChain); pPresentationParameters->BackBufferWidth = localParameters.BackBufferWidth; @@ -389,6 +393,7 @@ static HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapte HeapFree(GetProcessHeap(), 0, object); *ppReturnedDeviceInterface = NULL; } + return hr; } diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 3270e41..ac95ddf 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -323,7 +323,8 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface) * DDSCL_SETFOCUSWINDOW may only be used with DDSCL_NOWINDOWCHANGES * * Handled flags: DDSCL_NORMAL, DDSCL_FULLSCREEN, DDSCL_EXCLUSIVE, - * DDSCL_SETFOCUSWINDOW (partially) + * DDSCL_SETFOCUSWINDOW (partially), + * DDSCL_MULTITHREADED (work in progress) * * Unhandled flags, which should be implemented * DDSCL_SETDEVICEWINDOW: Sets a window specially used for rendering (I don't @@ -334,8 +335,7 @@ IDirectDrawImpl_Release(IDirectDraw7 *iface) * Unsure about these: DDSCL_FPUSETUP DDSCL_FPURESERVE * * These seem not really imporant for wine - * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX, - * DDSCL_MULTITHREDED + * DDSCL_ALLOWREBOOT, DDSCL_NOWINDOWCHANGES, DDSCL_ALLOWMODEX * * Returns: * DD_OK if the cooperative level was set successfully @@ -501,13 +501,19 @@ IDirectDrawImpl_SetCooperativeLevel(IDirectDraw7 *iface, } } + if(cooplevel & DDSCL_MULTITHREADED && !(This->cooperative_level & DDSCL_MULTITHREADED)) + { + FIXME("DirectDraw is not thread safe yet\n"); + + /* Enable thread safety in wined3d */ + IWineD3DDevice_SetMultithreaded(This->wineD3DDevice); + } + /* Unhandled flags */ if(cooplevel & DDSCL_ALLOWREBOOT) WARN("(%p) Unhandled flag DDSCL_ALLOWREBOOT, harmless\n", This); if(cooplevel & DDSCL_ALLOWMODEX) WARN("(%p) Unhandled flag DDSCL_ALLOWMODEX, harmless\n", This); - if(cooplevel & DDSCL_MULTITHREADED) - FIXME("(%p) Unhandled flag DDSCL_MULTITHREADED, Uh Oh...\n", This); if(cooplevel & DDSCL_FPUSETUP) WARN("(%p) Unhandled flag DDSCL_FPUSETUP, harmless\n", This); if(cooplevel & DDSCL_FPUPRESERVE) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0d4cdd0..4c6a1db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1830,6 +1830,22 @@ static void WINAPI IWineD3DDeviceImpl_SetFullscreen(IWineD3DDevice *iface, BOOL This->ddraw_fullscreen = fullscreen; } +/* Enables thead safety in the wined3d device and its resources. Called by DirectDraw + * from SetCooperativeLeven if DDSCL_MULTITHREADED is specified, and by d3d8/9 from + * CreateDevice if D3DCREATE_MULTITHREADED is passed. + * + * There is no way to deactivate thread safety once it is enabled + */ +static void WINAPI IWineD3DDeviceImpl_SetMultithreaded(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + FIXME("No thread safety in wined3d yet\n"); + + /*For now just store the flag(needed in case of ddraw) */ + This->createParms.BehaviorFlags |= WINED3DCREATE_MULTITHREADED; + + return; +} + static HRESULT WINAPI IWineD3DDeviceImpl_SetDisplayMode(IWineD3DDevice *iface, UINT iSwapChain, WINED3DDISPLAYMODE* pMode) { DEVMODEW devmode; IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; @@ -5779,6 +5795,7 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_Init3D, IWineD3DDeviceImpl_Uninit3D, IWineD3DDeviceImpl_SetFullscreen, + IWineD3DDeviceImpl_SetMultithreaded, IWineD3DDeviceImpl_EvictManagedResources, IWineD3DDeviceImpl_GetAvailableTextureMem, IWineD3DDeviceImpl_GetBackBuffer, diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 5531a80..01f5d26 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -299,5 +299,8 @@ typedef enum _WINED3DSHADER_INSTRUCTION_OPCODE_TYPE { #define WINED3DSHADER_VERSION_MINOR(version) (((version) >> 0) & 0xFF) #define WINED3DPS_END() 0x0000FFFF #define WINED3DVS_END() 0x0000FFFF - + +/* Multithreaded flag. Removed from the public header to signal that IWineD3D::CreateDevice ignores it */ +#define WINED3DCREATE_MULTITHREADED 0x00000004 + #endif diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index aaee89e..7842076 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -356,6 +356,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(Init3D)(THIS_ WINED3DPRESENT_PARAMETERS* pPresentationParameters, D3DCB_CREATEADDITIONALSWAPCHAIN D3DCB_CreateAdditionalSwapChain); STDMETHOD(Uninit3D)(THIS, D3DCB_DESTROYSURFACEFN pFn, D3DCB_DESTROYSWAPCHAINFN pFn2); STDMETHOD_(void, SetFullscreen)(THIS_ BOOL fullscreen); + STDMETHOD_(void, SetMultithreaded)(THIS); STDMETHOD(EvictManagedResources)(THIS) PURE; STDMETHOD_(UINT, GetAvailableTextureMem)(THIS) PURE; STDMETHOD(GetBackBuffer)(THIS_ UINT iSwapChain, UINT BackBuffer, WINED3DBACKBUFFER_TYPE, struct IWineD3DSurface** ppBackBuffer) PURE; @@ -492,6 +493,7 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_Init3D(p, a, b) (p)->lpVtbl->Init3D(p, a, b) #define IWineD3DDevice_Uninit3D(p, a, b) (p)->lpVtbl->Uninit3D(p, a, b) #define IWineD3DDevice_SetFullscreen(p, a) (p)->lpVtbl->SetFullscreen(p, a) +#define IWineD3DDevice_SetMultithreaded(p) (p)->lpVtbl->SetMultithreaded(p) #define IWineD3DDevice_EvictManagedResources(p) (p)->lpVtbl->EvictManagedResources(p) #define IWineD3DDevice_GetAvailableTextureMem(p) (p)->lpVtbl->GetAvailableTextureMem(p) #define IWineD3DDevice_GetBackBuffer(p,a,b,c,d) (p)->lpVtbl->GetBackBuffer(p,a,b,c,d) diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 6f0a28d..bd63f71 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1569,7 +1569,6 @@ typedef enum _WINED3DSURFTYPE { /* IWineD3D::CreateDevice behaviour flags */ #define WINED3DCREATE_FPU_PRESERVE 0x00000002 -#define WINED3DCREATE_MULTITHREADED 0x00000004 #define WINED3DCREATE_PUREDEVICE 0x00000010 #define WINED3DCREATE_SOFTWARE_VERTEXPROCESSING 0x00000020 #define WINED3DCREATE_HARDWARE_VERTEXPROCESSING 0x00000040

1 0

Stefan Dösinger : wined3d: Fix client gl unit selection.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 65c447082a4f3c526da98f7fc648cbec6f9244ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=65c447082a4f3c526da98f7fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 16 22:02:12 2007 +0100 wined3d: Fix client gl unit selection. I forgot that when re-enabling register combiners during the state management rewrite. --- dlls/wined3d/state.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2a567b8..aa9d0ab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -2408,9 +2408,9 @@ static inline void loadNumberedArrays(IWineD3DStateBlockImpl *stateblock, WineDi /* Used from 2 different functions, and too big to justify making it inlined */ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVertexStridedData *sd) { unsigned int textureNo = 0; - unsigned int texture_idx = 0; UINT *offset = stateblock->streamOffset; GLint curVBO = GL_SUPPORT(ARB_VERTEX_BUFFER_OBJECT) ? -1 : 0; + unsigned int mapped_stage = 0; TRACE("Using fast vertex array code\n"); @@ -2714,7 +2714,7 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte /* Texture coords -------------------------------------------*/ - for (textureNo = 0, texture_idx = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { + for (textureNo = 0; textureNo < GL_LIMITS(texture_stages); ++textureNo) { /* The code below uses glClientActiveTexture and glMultiTexCoord* which are all part of the GL_ARB_multitexture extension. */ /* Abort if we don't support the extension. */ if (!GL_SUPPORT(ARB_MULTITEXTURE)) { @@ -2722,27 +2722,27 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte continue; } - if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || stateblock->textures[textureNo]*/ TRUE) { - /* Select the correct texture stage */ - GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); - } - if (stateblock->textures[textureNo] != NULL) { int coordIdx = stateblock->textureState[textureNo][WINED3DTSS_TEXCOORDINDEX]; + mapped_stage = stateblock->wineD3DDevice->texUnitMap[textureNo]; + /* The gl texture unit will never be -1 for a bound texture */ + GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); + checkGLcall("glClientActiveTextureARB"); + if (coordIdx >= MAX_TEXTURES) { VTRACE(("tex: %d - Skip tex coords, as being system generated\n", textureNo)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_idx, 0, 0, 0, 1)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); } else if (sd->u.s.texCoords[coordIdx].lpData == NULL && sd->u.s.texCoords[coordIdx].VBO == 0) { VTRACE(("Bound texture but no texture coordinates supplied, so skipping\n")); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + texture_idx, 0, 0, 0, 1)); + GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + mapped_stage, 0, 0, 0, 1)); } else { TRACE("Setting up texture %u, idx %d, cordindx %u, data %p\n", - textureNo, texture_idx, coordIdx, sd->u.s.texCoords[coordIdx].lpData); + textureNo, mapped_stage, coordIdx, sd->u.s.texCoords[coordIdx].lpData); if(curVBO != sd->u.s.texCoords[coordIdx].VBO) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, sd->u.s.texCoords[coordIdx].VBO)); checkGLcall("glBindBufferARB"); @@ -2760,10 +2760,10 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, WineDirect3DVerte glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } - if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || stateblock->textures[textureNo]*/ TRUE) ++texture_idx; } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - for (textureNo = texture_idx; textureNo < GL_LIMITS(textures); ++textureNo) { + /* The number of the mapped stages increses monotonic, so we're fine to use the last used one */ + for (textureNo = mapped_stage + 1; textureNo < GL_LIMITS(textures); ++textureNo) { GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + textureNo)); glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1));

1 0

Stefan Dösinger : wined3d: Remove some old stuff.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 9789f993ce267469e704d3635c071674fcb74475 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9789f993ce267469e704d3635… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 16 22:04:03 2007 +0100 wined3d: Remove some old stuff. --- dlls/wined3d/device.c | 3 --- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4c6a1db..4633a9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -70,9 +70,6 @@ static inline Display *get_display( HDC hdc ) return display; } -/* allocate one pbuffer per surface */ -BOOL pbuffer_per_surface = FALSE; - /* static function declarations */ static void WINAPI IWineD3DDeviceImpl_AddResource(IWineD3DDevice *iface, IWineD3DResource *resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0fa6b6..3ec80de 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1023,7 +1023,6 @@ struct IWineD3DSurfaceImpl UINT pow2Width; UINT pow2Height; - UINT pow2Size; /* Oversized texture */ RECT glRect;

1 0

Stefan Dösinger : wined3d: Activate a context before doing opengl calls.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: fcb83e7111c0f3b24344c67433461c3ec1082e62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb83e7111c0f3b24344c6743… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Mar 17 23:00:39 2007 +0100 wined3d: Activate a context before doing opengl calls. --- dlls/wined3d/basetexture.c | 4 ++- dlls/wined3d/context.c | 10 ++++++++ dlls/wined3d/cubetexture.c | 12 ++++++++++ dlls/wined3d/device.c | 39 ++++++++++++++++++++++++++++++++ dlls/wined3d/indexbuffer.c | 11 ++++++++- dlls/wined3d/surface.c | 51 ++++++++++++++++++++--------------------- dlls/wined3d/swapchain.c | 2 + dlls/wined3d/texture.c | 10 ++++++++ dlls/wined3d/utils.c | 11 ++------ dlls/wined3d/vertexbuffer.c | 15 ++++++++++- dlls/wined3d/volumetexture.c | 4 +++ 11 files changed, 131 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcb83e7111c0f3b24344c…

1 0