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

Stefan Dösinger : d3d8: Store the fvf in the d3d8 vertex buffer.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: ff16f3067716b39b3a7f6112d409f8d006fdb568 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff16f3067716b39b3a7f6112d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 14:10:29 2009 +0200 d3d8: Store the fvf in the d3d8 vertex buffer. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 1 + dlls/d3d8/vertexbuffer.c | 2 +- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 1464588..01a475e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -326,6 +326,8 @@ struct IDirect3DVertexBuffer8Impl /* Parent reference */ LPDIRECT3DDEVICE8 parentDevice; + + DWORD fvf; }; /* --------------------- */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 42c6c81..352018f 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -739,6 +739,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 EnterCriticalSection(&d3d8_cs); hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, (IUnknown *)object); LeaveCriticalSection(&d3d8_cs); + object->fvf = FVF; if (D3D_OK != hrc) { diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index bcbb47f..569efa2 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -194,7 +194,7 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 pDesc->Usage = desc.Usage; pDesc->Pool = desc.Pool; pDesc->Size = desc.Size; - pDesc->FVF = desc.FVF; + pDesc->FVF = This->fvf; pDesc->Format = d3dformat_from_wined3dformat(desc.Format); }

1 0

Stefan Dösinger : d3d9: Store the FVF in the d3d9 vertex buffer.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 77e6dcca02080c065fa1d68d2cf6077b882e0cf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e6dcca02080c065fa1d68d2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 10:48:42 2009 +0200 d3d9: Store the FVF in the d3d9 vertex buffer. --- dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/vertexbuffer.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8436b1d..9338f97 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -329,6 +329,8 @@ typedef struct IDirect3DVertexBuffer9Impl /* Parent reference */ LPDIRECT3DDEVICE9EX parentDevice; + + DWORD fvf; } IDirect3DVertexBuffer9Impl; /* --------------------- */ diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index 63cac92..d13ebef 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -197,8 +197,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 pDesc->Usage = desc.Usage; pDesc->Pool = desc.Pool; pDesc->Size = desc.Size; - pDesc->FVF = desc.FVF; pDesc->Type = D3DRTYPE_VERTEXBUFFER; + pDesc->FVF = This->fvf; } @@ -245,6 +245,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface object->lpVtbl = &Direct3DVertexBuffer9_Vtbl; object->ref = 1; + object->fvf = FVF; EnterCriticalSection(&d3d9_cs); hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs);

1 0

Stefan Dösinger : wined3d: Remove the buffer fvf.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: f0efa9741353b9a7871eab17508404ffafb5fb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0efa9741353b9a7871eab175… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 6 14:16:59 2009 +0200 wined3d: Remove the buffer fvf. --- dlls/d3d8/device.c | 7 +++++-- dlls/d3d9/device.c | 3 ++- dlls/d3d9/vertexbuffer.c | 4 +++- dlls/ddraw/vertexbuffer.c | 3 ++- dlls/wined3d/buffer.c | 5 ++++- dlls/wined3d/device.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 3 --- include/wine/wined3d.idl | 4 ++-- 8 files changed, 23 insertions(+), 17 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 352018f..057d895 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -737,7 +737,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 object->lpVtbl = &Direct3DVertexBuffer8_Vtbl; object->ref = 1; EnterCriticalSection(&d3d8_cs); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), NULL, + (IUnknown *)object); LeaveCriticalSection(&d3d8_cs); object->fvf = FVF; @@ -1662,10 +1664,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVI static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 iface, UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; + IDirect3DVertexBuffer8Impl *dest = (IDirect3DVertexBuffer8Impl *) pDestBuffer; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d8_cs); - hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer8Impl *)pDestBuffer)->wineD3DVertexBuffer, NULL, Flags); + hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, NULL, Flags, dest->fvf); LeaveCriticalSection(&d3d8_cs); return hr; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0d335fc..bfbfe97 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1449,10 +1449,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DVertexDeclaration9Impl *Decl = (IDirect3DVertexDeclaration9Impl *) pVertexDecl; HRESULT hr; + IDirect3DVertexBuffer9Impl *dest = (IDirect3DVertexBuffer9Impl *) pDestBuffer; TRACE("(%p) Relay\n" , This); EnterCriticalSection(&d3d9_cs); - hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, ((IDirect3DVertexBuffer9Impl *)pDestBuffer)->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags); + hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags, dest->fvf); LeaveCriticalSection(&d3d9_cs); return hr; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d13ebef..71a9ca7 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -247,7 +247,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9EX iface object->ref = 1; object->fvf = FVF; EnterCriticalSection(&d3d9_cs); - hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, FVF, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), pSharedHandle, (IUnknown *)object); + hrc = IWineD3DDevice_CreateVertexBuffer(This->WineD3DDevice, Size, Usage & WINED3DUSAGE_MASK, + 0 /* fvf for ddraw only */, (WINED3DPOOL) Pool, &(object->wineD3DVertexBuffer), + pSharedHandle, (IUnknown *)object); LeaveCriticalSection(&d3d9_cs); if (hrc != D3D_OK) { diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index de94791..df7528b 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -384,7 +384,8 @@ IDirect3DVertexBufferImpl_ProcessVertices(IDirect3DVertexBuffer7 *iface, Count, This->wineD3DVertexBuffer, NULL /* Output vdecl */, - Flags); + Flags, + This->fvf); /* Restore the states if needed */ if(doClip != oldClip) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 1945474..0c53c23 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -317,11 +317,15 @@ static BOOL buffer_find_decl(struct wined3d_buffer *This) * processing, FLOAT4 POSITIONT with fixed function, and FLOAT16 if * GL_NV_half_float is not supported. * + * Note for d3d8 and d3d9: * The vertex buffer FVF doesn't help with finding them, we have to use * the decoded vertex declaration and pick the things that concern the * current buffer. A problem with this is that this can change between * draws, so we have to validate the information and reprocess the buffer * if it changes, and avoid false positives for performance reasons. + * WineD3D doesn't even know the vertex buffer any more, it is managed + * by the client libraries and passed to SetStreamSource and ProcessVertices + * as needed. * * We have to distinguish between vertex shaders and fixed function to * pick the way we access the strided vertex information. @@ -938,7 +942,6 @@ static HRESULT STDMETHODCALLTYPE buffer_GetDesc(IWineD3DBuffer *iface, WINED3DBU desc->Usage = This->resource.usage; desc->Pool = This->resource.pool; desc->Size = This->resource.size; - desc->FVF = This->fvf; return WINED3D_OK; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d0fcf59..fc968db 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -552,8 +552,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac TRACE("(%p) : Size=%d, Usage=0x%08x, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DBuffer *)object; - object->fvf = FVF; - /* Observations show that drawStridedSlow is faster on dynamic VBs than converting + * drawStridedFast (half-life 2). * @@ -4506,11 +4504,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPixelShaderConstantF( #define copy_and_next(dest, src, size) memcpy(dest, src, size); dest += (size) static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIndex, DWORD dwCount, - const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags) + const struct wined3d_stream_info *stream_info, struct wined3d_buffer *dest, DWORD dwFlags, + DWORD DestFVF) { char *dest_ptr, *dest_conv = NULL, *dest_conv_addr = NULL; unsigned int i; - DWORD DestFVF = dest->fvf; WINED3DVIEWPORT vp; WINED3DMATRIX mat, proj_mat, view_mat, world_mat; BOOL doClip; @@ -4866,7 +4864,8 @@ static HRESULT process_vertices_strided(IWineD3DDeviceImpl *This, DWORD dwDestIn #undef copy_and_next static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, UINT SrcStartIndex, UINT DestIndex, - UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags) + UINT VertexCount, IWineD3DBuffer *pDestBuffer, IWineD3DVertexDeclaration *pVertexDecl, DWORD Flags, + DWORD DestFVF) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; struct wined3d_stream_info stream_info; @@ -4912,7 +4911,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, } return process_vertices_strided(This, DestIndex, VertexCount, &stream_info, - (struct wined3d_buffer *)pDestBuffer, Flags); + (struct wined3d_buffer *)pDestBuffer, Flags, DestFVF); } /***** diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 59944a4..4076912 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,9 +2095,6 @@ struct wined3d_buffer UINT dirty_end; LONG lock_count; - /* legacy vertex buffers */ - DWORD fvf; - /* conversion stuff */ UINT conversion_count; UINT draw_count; diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index b33b8ca..f6e5ef5 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -1869,7 +1869,6 @@ typedef struct _WINED3DBUFFER_DESC DWORD Usage; WINED3DPOOL Pool; UINT Size; - DWORD FVF; } WINED3DBUFFER_DESC; typedef struct glDescriptor @@ -3349,7 +3348,8 @@ interface IWineD3DDevice : IWineD3DBase [in] UINT vertex_count, [in] IWineD3DBuffer *dest_buffer, [in] IWineD3DVertexDeclaration *declaration, - [in] DWORD flags + [in] DWORD flags, + [in] DWORD DestFVF ); HRESULT BeginStateBlock( );

1 0

Stefan Dösinger : d3d: Remove the format from index buffers.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: cb1c9dcda9267b2826ecfaf061dd557957a0b5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1c9dcda9267b2826ecfaf06… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 10:50:31 2009 +0200 d3d: Remove the format from index buffers. --- dlls/d3d8/d3d8_private.h | 2 ++ dlls/d3d8/device.c | 7 +++++-- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 7 ++++--- dlls/d3d9/indexbuffer.c | 5 +++-- dlls/d3d9/vertexbuffer.c | 2 +- dlls/ddraw/device.c | 5 +++-- dlls/ddraw/direct3d.c | 2 +- dlls/ddraw/surface.c | 2 +- dlls/wined3d/buffer.c | 1 - dlls/wined3d/device.c | 15 +++++++-------- dlls/wined3d/stateblock.c | 13 +++++++++---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 5 ++--- 16 files changed, 42 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb1c9dcda9267b2826ecf…

1 0

Christian Costa : mciqtz32: Implement MCI_STATUS.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 5ab983e979e0b63c1bd3d8455d46ed4b97069024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab983e979e0b63c1bd3d8455… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Apr 8 23:22:50 2009 +0200 mciqtz32: Implement MCI_STATUS. --- dlls/mciqtz32/mciqtz.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 79 insertions(+), 1 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 874b876..0cd973b 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -336,6 +336,84 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa return 0; } +/*************************************************************************** + * MCIQTZ_mciStatus [internal] + */ +static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpParms) +{ + WINE_MCIQTZ* wma; + + TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + + if (!lpParms) + return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIQTZ_mciGetOpenDev(wDevID); + if (!wma) + return MCIERR_INVALID_DEVICE_ID; + + if (!(dwFlags & MCI_STATUS_ITEM)) { + WARN("No status item specified\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + switch (lpParms->dwItem) { + case MCI_STATUS_LENGTH: + FIXME("MCI_STATUS_LENGTH not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_POSITION: + { + HRESULT hr; + REFTIME curpos; + IMediaPosition* pmpos; + + hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaPosition, (LPVOID*)&pmpos); + if (FAILED(hr)) { + FIXME("Cannot get IMediaPostion interface (hr = %x)\n", hr); + return MCIERR_INTERNAL; + } + + hr = IMediaPosition_get_CurrentPosition(pmpos, &curpos); + if (FAILED(hr)) { + FIXME("Cannot get position (hr = %x)\n", hr); + IMediaPosition_Release(pmpos); + return MCIERR_INTERNAL; + } + + IMediaPosition_Release(pmpos); + lpParms->dwReturn = curpos / 10000; + + break; + } + case MCI_STATUS_NUMBER_OF_TRACKS: + FIXME("MCI_STATUS_NUMBER_OF_TRACKS not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MODE: + FIXME("MCI_STATUS_MODE not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_MEDIA_PRESENT: + FIXME("MCI_STATUS_MEDIA_PRESENT not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_TIME_FORMAT: + FIXME("MCI_STATUS_TIME_FORMAT not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_READY: + FIXME("MCI_STATUS_READY not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + case MCI_STATUS_CURRENT_TRACK: + FIXME("MCI_STATUS_CURRENT_TRACK not implemented yet\n"); + return MCIERR_UNRECOGNIZED_COMMAND; + default: + FIXME("Unknown command %08X\n", lpParms->dwItem); + return MCIERR_UNRECOGNIZED_COMMAND; + } + + if (dwFlags & MCI_NOTIFY) + mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); + + return 0; +} + /*======================================================================* * MCI QTZ entry points * *======================================================================*/ @@ -371,12 +449,12 @@ LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_CLOSE_DRIVER: return MCIQTZ_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); case MCI_PLAY: return MCIQTZ_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); case MCI_SEEK: return MCIQTZ_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); + case MCI_STATUS: return MCIQTZ_mciStatus (dwDevID, dwParam1, (LPMCI_DGV_STATUS_PARMSW) dwParam2); case MCI_RECORD: case MCI_STOP: case MCI_SET: case MCI_PAUSE: case MCI_RESUME: - case MCI_STATUS: case MCI_GETDEVCAPS: case MCI_INFO: case MCI_PUT:

1 0

Henri Verbeet : wined3d: Only update the swizzle and use map for streams that are actually used in device_stream_info_from_strided ().
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 877e252681b4d75abc2392704479ab78f332670d URL: http://source.winehq.org/git/wine.git/?a=commit;h=877e252681b4d75abc2392704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:27 2009 +0200 wined3d: Only update the swizzle and use map for streams that are actually used in device_stream_info_from_strided(). This fixes a regression introduced by d7c7c768507a923902e9178f98343e22e4e22652 and exposed by ef2d70418383f03c6bf701caeb67129acc6d2453. Unfortunately having EXT_vertex_array_bgra support masks the problem, which is why the regression tests didn't catch it. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f44d75d..d0fcf59 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -352,6 +352,8 @@ void device_stream_info_from_strided(IWineD3DDeviceImpl *This, for (i = 0; i < sizeof(stream_info->elements) / sizeof(*stream_info->elements); ++i) { + if (!stream_info->elements[i].format_desc) continue; + if (!GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) && stream_info->elements[i].format_desc->format == WINED3DFMT_A8R8G8B8) { stream_info->swizzle_map |= 1 << i;

1 0

Henri Verbeet : wined3d: Add a separate function for converting write masks to strings.
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: d299f865f7d6b40773e1eea374c952130320d5f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d299f865f7d6b40773e1eea37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:28 2009 +0200 wined3d: Add a separate function for converting write masks to strings. --- dlls/wined3d/glsl_shader.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3301cc2..39881db 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1179,23 +1179,29 @@ static void shader_glsl_get_register_name(const DWORD param, const DWORD addr_to strcat(regstr, tmpStr); } +static void shader_glsl_write_mask_to_str(DWORD write_mask, char *str) +{ + *str++ = '.'; + if (write_mask & WINED3DSP_WRITEMASK_0) *str++ = 'x'; + if (write_mask & WINED3DSP_WRITEMASK_1) *str++ = 'y'; + if (write_mask & WINED3DSP_WRITEMASK_2) *str++ = 'z'; + if (write_mask & WINED3DSP_WRITEMASK_3) *str++ = 'w'; + *str = '\0'; +} + /* Get the GLSL write mask for the destination register */ static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { - char *ptr = write_mask; DWORD mask = param & WINED3DSP_WRITEMASK_ALL; if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) { mask = WINED3DSP_WRITEMASK_0; - } else { - *ptr++ = '.'; - if (param & WINED3DSP_WRITEMASK_0) *ptr++ = 'x'; - if (param & WINED3DSP_WRITEMASK_1) *ptr++ = 'y'; - if (param & WINED3DSP_WRITEMASK_2) *ptr++ = 'z'; - if (param & WINED3DSP_WRITEMASK_3) *ptr++ = 'w'; + *write_mask = '\0'; + } + else + { + shader_glsl_write_mask_to_str(mask, write_mask); } - - *ptr = '\0'; return mask; } @@ -2462,7 +2468,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) if (shader_version < WINED3DPS_VERSION(1,4)) { char coord_mask[6]; - shader_glsl_get_write_mask(mask, coord_mask); + shader_glsl_write_mask_to_str(mask, coord_mask); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, swizzle, NULL, "T%u%s", sampler_idx, coord_mask); } else { @@ -2839,7 +2845,7 @@ static void pshader_glsl_texbem(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(sampler_type, 0, &sample_function); mask = sample_function.coord_mask; - shader_glsl_get_write_mask(mask, coord_mask); + shader_glsl_write_mask_to_str(mask, coord_mask); /* with projective textures, texbem only divides the static texture coord, not the displacement, * so we can't let the GL handle this. @@ -2854,7 +2860,7 @@ static void pshader_glsl_texbem(const struct wined3d_shader_instruction *ins) case WINED3DTTFF_COUNT4: case WINED3DTTFF_DISABLE: div_mask = WINED3DSP_WRITEMASK_3; break; } - shader_glsl_get_write_mask(div_mask, coord_div_mask); + shader_glsl_write_mask_to_str(div_mask, coord_div_mask); shader_addline(ins->buffer, "T%u%s /= T%u%s;\n", sampler_idx, coord_mask, sampler_idx, coord_div_mask); }

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_dst_param to shader_glsl_get_write_mask().
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: f3e5e92a18b6f10ab48d7f896620a0bc4d1b9d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e5e92a18b6f10ab48d7f896… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:28 2009 +0200 wined3d: Pass a struct wined3d_shader_dst_param to shader_glsl_get_write_mask(). --- dlls/wined3d/glsl_shader.c | 46 ++++++++++++++++++++++---------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 39881db..dc2a9fc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1190,10 +1190,11 @@ static void shader_glsl_write_mask_to_str(DWORD write_mask, char *str) } /* Get the GLSL write mask for the destination register */ -static DWORD shader_glsl_get_write_mask(const DWORD param, char *write_mask) { - DWORD mask = param & WINED3DSP_WRITEMASK_ALL; +static DWORD shader_glsl_get_write_mask(const struct wined3d_shader_dst_param *param, char *write_mask) +{ + DWORD mask = param->write_mask; - if (shader_is_scalar(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(param->register_type, param->register_idx)) { mask = WINED3DSP_WRITEMASK_0; *write_mask = '\0'; @@ -1269,7 +1270,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(wined3d_dst->token, wined3d_dst->addr_token, glsl_dst->reg_name, &is_color, ins); - return shader_glsl_get_write_mask(wined3d_dst->token, glsl_dst->mask_str); + return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } /* Append the destination part of the instruction to the buffer, return the effective write mask */ @@ -1669,7 +1670,7 @@ static void shader_glsl_cross(const struct wined3d_shader_instruction *ins) glsl_src_param_t src1_param; char dst_mask[6]; - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_append_dst(ins->buffer, ins); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], src_mask, &src0_param); shader_glsl_add_src_param(ins, ins->src[1], ins->src_addr[1], src_mask, &src1_param); @@ -1792,7 +1793,7 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) shader_addline(ins->buffer, "tmp0.w = 1.0;\n"); shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->buffer, "tmp0%s);\n", dst_mask); } else { DWORD write_mask; @@ -1952,7 +1953,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) || (src1reg == dstreg && src1regtype == dstregtype) || (src2reg == dstreg && src2regtype == dstregtype)) { - write_mask = shader_glsl_get_write_mask(dst.token, mask_char); + write_mask = shader_glsl_get_write_mask(&dst, mask_char); if (!write_mask) continue; shader_addline(ins->buffer, "tmp0%s = (", mask_char); temp_destination = TRUE; @@ -1970,7 +1971,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) } if(temp_destination) { - shader_glsl_get_write_mask(ins->dst[0].token, mask_char); + shader_glsl_get_write_mask(&ins->dst[0], mask_char); shader_glsl_append_dst(ins->buffer, ins); shader_addline(ins->buffer, "tmp0%s);\n", mask_char); } @@ -2147,7 +2148,7 @@ static void shader_glsl_lit(const struct wined3d_shader_instruction *ins) char dst_mask[6]; shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_1, &src1_param); @@ -2194,7 +2195,7 @@ static void shader_glsl_dst(const struct wined3d_shader_instruction *ins) char dst_mask[6]; shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_1, &src0y_param); shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], WINED3DSP_WRITEMASK_2, &src0z_param); @@ -2523,16 +2524,15 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) { /* FIXME: Make this work for more than just 2D textures */ SHADER_BUFFER *buffer = ins->buffer; - DWORD write_mask; - char dst_mask[6]; - - write_mask = shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(write_mask, dst_mask); + DWORD write_mask = shader_glsl_append_dst(ins->buffer, ins); if (ins->reg_maps->shader_version != WINED3DPS_VERSION(1,4)) { - DWORD reg = ins->dst[0].register_idx; - shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", reg, dst_mask); + char dst_mask[6]; + + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); + shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", + ins->dst[0].register_idx, dst_mask); } else { DWORD reg = ins->src[0] & WINED3DSP_REGNUM_MASK; DWORD src_mod = ins->src[0] & WINED3DSP_SRCMOD_MASK; @@ -2752,7 +2752,7 @@ static void pshader_glsl_texm3x3(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, ins->src[0], ins->src_addr[0], src_mask, &src0_param); shader_glsl_append_dst(ins->buffer, ins); - shader_glsl_get_write_mask(ins->dst[0].token, dst_mask); + shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->buffer, "vec4(tmp0.xy, dot(T%u.xyz, %s), 1.0)%s);\n", reg, src0_param.param_str, dst_mask); current_state->current_row = 0; @@ -3016,7 +3016,7 @@ static void pshader_glsl_input_pack(IWineD3DPixelShader *iface, SHADER_BUFFER *b usage = semantics_in[i].usage; usage_idx = semantics_in[i].usage_idx; - shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); + shader_glsl_get_write_mask(&semantics_in[i].reg, reg_mask); switch (usage) { @@ -3142,7 +3142,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in usage = semantics_in[i].usage; usage_idx = semantics_in[i].usage_idx; - set[map[i]] = shader_glsl_get_write_mask(semantics_in[i].reg.token, reg_mask); + set[map[i]] = shader_glsl_get_write_mask(&semantics_in[i].reg, reg_mask); if(!semantics_out) { switch(usage) { @@ -3184,7 +3184,7 @@ static void handle_ps3_input(SHADER_BUFFER *buffer, const WineD3D_GL_Info *gl_in usage_out = semantics_out[j].usage; usage_idx_out = semantics_out[j].usage_idx; - shader_glsl_get_write_mask(semantics_out[j].reg.token, reg_mask_out); + shader_glsl_get_write_mask(&semantics_out[j].reg, reg_mask_out); if(usage == usage_out && usage_idx == usage_idx_out) { @@ -3291,7 +3291,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs usage = semantics_out[i].usage; usage_idx = semantics_out[i].usage_idx; - writemask = shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); + writemask = shader_glsl_get_write_mask(&semantics_out[i].reg, reg_mask); switch(usage) { case WINED3DDECLUSAGE_COLOR: @@ -3344,7 +3344,7 @@ static GLhandleARB generate_param_reorder_function(IWineD3DVertexShader *vertexs usage = semantics_out[i].usage; usage_idx = semantics_out[i].usage_idx; - shader_glsl_get_write_mask(semantics_out[i].reg.token, reg_mask); + shader_glsl_get_write_mask(&semantics_out[i].reg, reg_mask); switch(usage) { case WINED3DDECLUSAGE_POSITION:

1 0

Henri Verbeet : wined3d: Explicitly pass parameter properties to shader_glsl_get_register_name().
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: ff58255f4edd2b56c7f05025df8336c1d69db3a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff58255f4edd2b56c7f05025d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:28 2009 +0200 wined3d: Explicitly pass parameter properties to shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 109 ++++++++++++++++++++++++------------------- 1 files changed, 61 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff58255f4edd2b56c7f05…

1 0

Henri Verbeet : wined3d: Get rid of a redundant strcat in shader_glsl_get_register_name().
by Alexandre Julliard 09 Apr '09

09 Apr '09

Module: wine Branch: master Commit: 3a0eb81cea5301103da362e2594ca828fc8bc6a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a0eb81cea5301103da362e25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 9 09:58:29 2009 +0200 wined3d: Get rid of a redundant strcat in shader_glsl_get_register_name(). --- dlls/wined3d/glsl_shader.c | 85 +++++++++++++++++++++----------------------- 1 files changed, 41 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3a0eb81cea5301103da36…

1 0