September 2012 - Wine-commits

Alexandre Julliard : Wine release 1.5.13
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: website Branch: master Commit: 865c8ddd7feb63be213b57fbeb5c36c360b587a0 URL: http://source.winehq.org/git/website.git/?a=commit;h=865c8ddd7feb63be213b57… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 20:29:34 2012 +0200 Wine release 1.5.13 --- news/en/2012091401.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2012091401.xml b/news/en/2012091401.xml new file mode 100644 index 0000000..849677f --- /dev/null +++ b/news/en/2012091401.xml @@ -0,0 +1,18 @@ +<news> +<date>September 14, 2012</date> +<title>Wine 1.5.13 Released</title> +<body> + The Wine development release 1.5.13 is now available. + <a href="{$root}/announce/1.5.13">What's new</a> in this release: +<ul> + <li>Client-side window rendering using the DIB engine.</li> + <li>Raw input support for keyboard and mouse.</li> + <li>Support for transparent window areas using color keying.</li> + <li>Proper C++ RTTI support on 64-bit.</li> + <li>Implementation of logical processor information.</li> + <li>Support for fonts with localized names.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.13.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.5.13.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 0a3ec1074529d74e5f95ee9a1e47867cdc6d86bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a3ec1074529d74e5f95ee9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 20:18:21 2012 +0200 Release 1.5.13. --- ANNOUNCE | 805 +++++++++++++++++++++++++++++++++++++------------------------ VERSION | 2 +- configure | 18 +- 3 files changed, 502 insertions(+), 323 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a3ec1074529d74e5f95e…

1 0

Tag wine-1.5.13 : Alexandre Julliard : Release 1.5.13
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: refs/tags/wine-1.5.13 Tag: d1221d8b44a3fe48d639045788fd72c779cc6e88 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d1221d8b44a3fe48d639045788fd… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 14 20:18:22 2012 +0200 Release 1.5.13

1 0

Michael Stefaniuc : user32: Don' t bother using the register storage class specifier.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 20595d2988869875d1d7cebd2d37bdf24da871cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=20595d2988869875d1d7cebd2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 14 12:16:44 2012 +0200 user32: Don't bother using the register storage class specifier. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index b325372..b587e63 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1662,7 +1662,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, /* process text if present */ if (lpitem->text) { - register int i; + int i; HFONT hfontOld = 0; UINT uFormat = (menuBar) ?

1 0

Michael Stefaniuc : gdi.exe16: Don' t bother using the register storage class specifier.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 8a7cc0687c977415e25d5f4c1b36c8c7a810c4eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7cc0687c977415e25d5f4c1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 14 12:29:36 2012 +0200 gdi.exe16: Don't bother using the register storage class specifier. --- dlls/gdi.exe16/gdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 45c2c78..ef460b3 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -788,7 +788,7 @@ BOOL16 WINAPI StretchBlt16( HDC16 hdcDst, INT16 xDst, INT16 yDst, */ BOOL16 WINAPI Polygon16( HDC16 hdc, const POINT16* pt, INT16 count ) { - register int i; + int i; BOOL ret; LPPOINT pt32 = HeapAlloc( GetProcessHeap(), 0, count*sizeof(POINT) ); @@ -809,7 +809,7 @@ BOOL16 WINAPI Polygon16( HDC16 hdc, const POINT16* pt, INT16 count ) */ BOOL16 WINAPI Polyline16( HDC16 hdc, const POINT16* pt, INT16 count ) { - register int i; + int i; BOOL16 ret; LPPOINT pt32 = HeapAlloc( GetProcessHeap(), 0, count*sizeof(POINT) );

1 0

Michael Stefaniuc : gdi32: Don' t bother using the register storage class specifier.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: f824030a4966e8823125c710ebd7fb8b9a8879a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f824030a4966e8823125c710e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Sep 14 12:37:06 2012 +0200 gdi32: Don't bother using the register storage class specifier. --- dlls/gdi32/region.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index dd2827d..570bf84 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2616,9 +2616,9 @@ static void REGION_loadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs) */ static void REGION_computeWAET(EdgeTableEntry *AET) { - register EdgeTableEntry *pWETE; - register int inside = 1; - register int isInside = 0; + EdgeTableEntry *pWETE; + int inside = 1; + int isInside = 0; AET->nextWETE = NULL; pWETE = AET;

1 0

Henri Verbeet : d3d10core: Implement d3d10_shader_resource_view_GetDesc().
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 83e21f8793ac906941409634ec797d3f3648adad URL: http://source.winehq.org/git/wine.git/?a=commit;h=83e21f8793ac906941409634e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:31 2012 +0200 d3d10core: Implement d3d10_shader_resource_view_GetDesc(). --- dlls/d3d10core/d3d10core_private.h | 3 +- dlls/d3d10core/device.c | 2 +- dlls/d3d10core/view.c | 140 +++++++++++++++++++++++++++++++++++- 3 files changed, 141 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 25fda7c..f88355b 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -157,11 +157,12 @@ struct d3d10_shader_resource_view ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; + D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; }; HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, - ID3D10Resource *resource) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; /* ID3D10InputLayout */ struct d3d10_input_layout diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index e6c26c2..ebfd4cf 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -746,7 +746,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev return E_OUTOFMEMORY; } - if (FAILED(hr = d3d10_shader_resource_view_init(object, resource))) + if (FAILED(hr = d3d10_shader_resource_view_init(object, resource, desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d10core/view.c b/dlls/d3d10core/view.c index 40712fc..b36f9d7 100644 --- a/dlls/d3d10core/view.c +++ b/dlls/d3d10core/view.c @@ -259,6 +259,126 @@ static HRESULT set_rtdesc_from_resource(D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3 } } +static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) +{ + D3D10_RESOURCE_DIMENSION dimension; + HRESULT hr; + + ID3D10Resource_GetType(resource, &dimension); + + switch (dimension) + { + case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + { + D3D10_TEXTURE1D_DESC texture_desc; + ID3D10Texture1D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + { + ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture1D_GetDesc(texture, &texture_desc); + ID3D10Texture1D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1D; + desc->u.Texture1D.MostDetailedMip = 0; + desc->u.Texture1D.MipLevels = texture_desc.MipLevels; + } + else + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1DARRAY; + desc->u.Texture1DArray.MostDetailedMip = 0; + desc->u.Texture1DArray.MipLevels = texture_desc.MipLevels; + desc->u.Texture1DArray.FirstArraySlice = 0; + desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize; + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + { + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10Texture2D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + { + ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + ID3D10Texture2D_Release(texture); + + desc->Format = texture_desc.Format; + if (texture_desc.ArraySize == 1) + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; + desc->u.Texture2D.MostDetailedMip = 0; + desc->u.Texture2D.MipLevels = texture_desc.MipLevels; + } + else + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMS; + } + } + else + { + if (texture_desc.SampleDesc.Count == 1) + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DARRAY; + desc->u.Texture2DArray.MostDetailedMip = 0; + desc->u.Texture2DArray.MipLevels = texture_desc.MipLevels; + desc->u.Texture2DArray.FirstArraySlice = 0; + desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize; + } + else + { + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY; + desc->u.Texture2DMSArray.FirstArraySlice = 0; + desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; + } + } + + return S_OK; + } + + case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + { + D3D10_TEXTURE3D_DESC texture_desc; + ID3D10Texture3D *texture; + + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) + { + ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D.\n"); + return E_INVALIDARG; + } + + ID3D10Texture3D_GetDesc(texture, &texture_desc); + ID3D10Texture3D_Release(texture); + + desc->Format = texture_desc.Format; + desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE3D; + desc->u.Texture3D.MostDetailedMip = 0; + desc->u.Texture3D.MipLevels = texture_desc.MipLevels; + + return S_OK; + } + + default: + FIXME("Unhandled resource dimension %#x.\n", dimension); + case D3D10_RESOURCE_DIMENSION_BUFFER: + return E_INVALIDARG; + } +} + static inline struct d3d10_depthstencil_view *impl_from_ID3D10DepthStencilView(ID3D10DepthStencilView *iface) { return CONTAINING_RECORD(iface, struct d3d10_depthstencil_view, ID3D10DepthStencilView_iface); @@ -696,7 +816,11 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10Shade static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderResourceView *iface, D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d10_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl = @@ -717,11 +841,23 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl }; HRESULT d3d10_shader_resource_view_init(struct d3d10_shader_resource_view *view, - ID3D10Resource *resource) + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) { + HRESULT hr; + view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; view->refcount = 1; + if (!desc) + { + if (FAILED(hr = set_srdesc_from_resource(&view->desc, resource))) + return hr; + } + else + { + view->desc = *desc; + } + view->resource = resource; ID3D10Resource_AddRef(resource);

1 0

Henri Verbeet : d3d10core/tests: Add a small test for ID3D10Device_CreateShaderResourceView().
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: bf23df7980ed4da36df86c6739afe9501b7713a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf23df7980ed4da36df86c673… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:32 2012 +0200 d3d10core/tests: Add a small test for ID3D10Device_CreateShaderResourceView(). --- dlls/d3d10core/tests/device.c | 64 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 6b40d73..865dde6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -297,6 +297,69 @@ static void test_create_rendertarget_view(ID3D10Device *device) ID3D10Texture2D_Release(texture); } +static void test_create_shader_resource_view(ID3D10Device *device) +{ + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10ShaderResourceView *srview; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *texture; + ID3D10Buffer *buffer; + HRESULT hr; + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, NULL, &srview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D10_RTV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = 0; + U(srv_desc).Buffer.ElementWidth = 64; + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + + ID3D10ShaderResourceView_Release(srview); + ID3D10Buffer_Release(buffer); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + + ID3D10ShaderResourceView_GetDesc(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D10_SRV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2D.MostDetailedMip); + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + + ID3D10ShaderResourceView_Release(srview); + ID3D10Texture2D_Release(texture); +} + static void test_create_shader(ID3D10Device *device) { #if 0 @@ -447,6 +510,7 @@ START_TEST(device) test_create_texture3d(device); test_create_depthstencil_view(device); test_create_rendertarget_view(device); + test_create_shader_resource_view(device); test_create_shader(device); refcount = ID3D10Device_Release(device);

1 0

Henri Verbeet : wined3d: wined3d_device_multiply_transform() never fails.
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: 90bd04c6b650ca1e7e4546f531a0a5fde7917e0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bd04c6b650ca1e7e4546f53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:33 2012 +0200 wined3d: wined3d_device_multiply_transform() never fails. --- dlls/d3d8/device.c | 5 ++--- dlls/d3d9/device.c | 5 ++--- dlls/ddraw/device.c | 5 ++--- dlls/wined3d/device.c | 8 +++----- include/wine/wined3d.h | 2 +- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 1ccaf2d..e5c2605 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1291,16 +1291,15 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, D3DTRANSFORMSTATETYPE state, const D3DMATRIX *matrix) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); - HRESULT hr; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - hr = wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3DVIEWPORT8 *viewport) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d50961a..3bbdd78 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1357,16 +1357,15 @@ static HRESULT WINAPI d3d9_device_MultiplyTransform(IDirect3DDevice9Ex *iface, D3DTRANSFORMSTATETYPE state, const D3DMATRIX *matrix) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); - HRESULT hr; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - hr = wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); + wined3d_device_multiply_transform(device->wined3d_device, state, (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d9_device_SetViewport(IDirect3DDevice9Ex *iface, const D3DVIEWPORT9 *viewport) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index f321374..f0bd56a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3299,7 +3299,6 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); enum wined3d_transform_state wined3d_state; - HRESULT hr; TRACE("iface %p, state %#x, matrix %p.\n", iface, state, matrix); @@ -3323,11 +3322,11 @@ static HRESULT d3d_device7_MultiplyTransform(IDirect3DDevice7 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - hr = wined3d_device_multiply_transform(device->wined3d_device, + wined3d_device_multiply_transform(device->wined3d_device, wined3d_state, (struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); - return hr; + return D3D_OK; } static HRESULT WINAPI d3d_device7_MultiplyTransform_FPUSetup(IDirect3DDevice7 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5cf69b..903d589 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1763,10 +1763,10 @@ void CDECL wined3d_device_get_transform(const struct wined3d_device *device, *matrix = device->stateBlock->state.transforms[state]; } -HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, +void CDECL wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix) { - const struct wined3d_matrix *mat = NULL; + const struct wined3d_matrix *mat; struct wined3d_matrix temp; TRACE("device %p, state %s, matrix %p.\n", device, debug_d3dtstype(state), matrix); @@ -1778,7 +1778,7 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, if (state > HIGHEST_TRANSFORMSTATE) { WARN("Unhandled transform state %#x.\n", state); - return WINED3D_OK; + return; } mat = &device->updateStateBlock->state.transforms[state]; @@ -1786,8 +1786,6 @@ HRESULT CDECL wined3d_device_multiply_transform(struct wined3d_device *device, /* Apply change via set transform - will reapply to eg. lights this way. */ wined3d_device_set_transform(device, state, &temp); - - return WINED3D_OK; } /* Note lights are real special cases. Although the device caps state only diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 478abe0..c3e1c19 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2177,7 +2177,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *devi ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); HRESULT __cdecl wined3d_device_init_3d(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); HRESULT __cdecl wined3d_device_init_gdi(struct wined3d_device *device, struct wined3d_swapchain_desc *swapchain_desc); -HRESULT __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, +void __cdecl wined3d_device_multiply_transform(struct wined3d_device *device, enum wined3d_transform_state state, const struct wined3d_matrix *matrix); HRESULT __cdecl wined3d_device_present(const struct wined3d_device *device, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags);

1 0

Henri Verbeet : wined3d: Just handle all instructions in the shader backend .
by Alexandre Julliard 14 Sep '12

14 Sep '12

Module: wine Branch: master Commit: a7bad0bde5077c3c469cc2de2f7b6b887637bc60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7bad0bde5077c3c469cc2de2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Sep 14 13:11:34 2012 +0200 wined3d: Just handle all instructions in the shader backend. --- dlls/wined3d/arb_program_shader.c | 16 ++++++---------- dlls/wined3d/glsl_shader.c | 14 ++++++++------ dlls/wined3d/shader.c | 9 --------- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c4064b9..cb94d6e 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1786,11 +1786,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "%s%s %s%s;\n", instruction, shader_arb_get_modifier(ins), dst_str, arguments); } -static void shader_hw_nop(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - shader_addline(buffer, "NOP;\n"); -} +static void shader_hw_nop(const struct wined3d_shader_instruction *ins) {} static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { @@ -5102,10 +5098,10 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, - /* WINED3DSIH_DCL */ NULL, - /* WINED3DSIH_DEF */ NULL, - /* WINED3DSIH_DEFB */ NULL, - /* WINED3DSIH_DEFI */ NULL, + /* WINED3DSIH_DCL */ shader_hw_nop, + /* WINED3DSIH_DEF */ shader_hw_nop, + /* WINED3DSIH_DEFB */ shader_hw_nop, + /* WINED3DSIH_DEFI */ shader_hw_nop, /* WINED3DSIH_DIV */ NULL, /* WINED3DSIH_DP2ADD */ pshader_hw_dp2add, /* WINED3DSIH_DP3 */ shader_hw_map2gl, @@ -5153,7 +5149,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, - /* WINED3DSIH_PHASE */ NULL, + /* WINED3DSIH_PHASE */ shader_hw_nop, /* WINED3DSIH_POW */ shader_hw_pow, /* WINED3DSIH_RCP */ shader_hw_rcp, /* WINED3DSIH_REP */ shader_hw_rep, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 66c30f8..fe961b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2301,6 +2301,8 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } +static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} + static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; @@ -5028,10 +5030,10 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ NULL, - /* WINED3DSIH_DCL */ NULL, - /* WINED3DSIH_DEF */ NULL, - /* WINED3DSIH_DEFB */ NULL, - /* WINED3DSIH_DEFI */ NULL, + /* WINED3DSIH_DCL */ shader_glsl_nop, + /* WINED3DSIH_DEF */ shader_glsl_nop, + /* WINED3DSIH_DEFB */ shader_glsl_nop, + /* WINED3DSIH_DEFI */ shader_glsl_nop, /* WINED3DSIH_DIV */ NULL, /* WINED3DSIH_DP2ADD */ shader_glsl_dp2add, /* WINED3DSIH_DP3 */ shader_glsl_dot, @@ -5077,9 +5079,9 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MOVA */ shader_glsl_mov, /* WINED3DSIH_MOVC */ NULL, /* WINED3DSIH_MUL */ shader_glsl_arith, - /* WINED3DSIH_NOP */ NULL, + /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm, - /* WINED3DSIH_PHASE */ NULL, + /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, /* WINED3DSIH_RCP */ shader_glsl_rcp, /* WINED3DSIH_REP */ shader_glsl_rep, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7e282aa..6bb3b5b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1206,15 +1206,6 @@ void shader_generate_main(const struct wined3d_shader *shader, struct wined3d_sh continue; } - /* Nothing to do. */ - if (ins.handler_idx == WINED3DSIH_DCL - || ins.handler_idx == WINED3DSIH_NOP - || ins.handler_idx == WINED3DSIH_DEF - || ins.handler_idx == WINED3DSIH_DEFI - || ins.handler_idx == WINED3DSIH_DEFB - || ins.handler_idx == WINED3DSIH_PHASE) - continue; - if (ins.predicate) FIXME("Predicates not implemented.\n");

1 0