wine-commits September 2015

wine-commits@winehq.org

2 participants
318 discussions

Alexandre Julliard : Import of upstream bugzilla release 4.4.10.
by Alexandre Julliard 11 Sep '15

11 Sep '15

Module: bugzilla Branch: upstream Commit: 4cbc7ece4add61eed2a0016d927cca4e43ef64a8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4cbc7ece4add61eed2a00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 19:57:24 2015 +0900 Import of upstream bugzilla release 4.4.10. --- .htaccess | 17 +- .travis.yml | 8 + Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 107 ++++++- Bugzilla/Install/Requirements.pm | 12 +- Bugzilla/Search.pm | 15 +- Bugzilla/Template.pm | 2 + Bugzilla/User.pm | 14 +- Bugzilla/Util.pm | 12 +- Bugzilla/WebService/Bug.pm | 2 + Bugzilla/WebService/Bugzilla.pm | 2 +- Bugzilla/WebService/Server/JSONRPC.pm | 2 +- Bugzilla/WebService/Server/XMLRPC.pm | 9 + Bugzilla/WebService/User.pm | 2 - LICENSE | 373 ++++++++++++++++++++++ README | 146 ++++----- checksetup.pl | 5 +- docs/bugzilla.ent | 4 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 4 +- importxml.pl | 3 + relogin.cgi | 3 + t/003safesys.t | 11 +- taskgraph.json | 220 +++++++++++++ template/en/default/pages/release-notes.html.tmpl | 50 +++ 25 files changed, 901 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=4cbc7ece4add61eed…

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard 11 Sep '15

11 Sep '15

Module: bugzilla Branch: master Commit: caf6a1349e1d7e4a279eb8da2fb9308a2f7752a8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=caf6a1349e1d7e4a279eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 19:58:22 2015 +0900 Merge branch 'upstream'. ---

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.10.
by Alexandre Julliard 11 Sep '15

11 Sep '15

Module: bugzilla Branch: master Commit: 4cbc7ece4add61eed2a0016d927cca4e43ef64a8 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=4cbc7ece4add61eed2a00… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 19:57:24 2015 +0900 Import of upstream bugzilla release 4.4.10. --- .htaccess | 17 +- .travis.yml | 8 + Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 107 ++++++- Bugzilla/Install/Requirements.pm | 12 +- Bugzilla/Search.pm | 15 +- Bugzilla/Template.pm | 2 + Bugzilla/User.pm | 14 +- Bugzilla/Util.pm | 12 +- Bugzilla/WebService/Bug.pm | 2 + Bugzilla/WebService/Bugzilla.pm | 2 +- Bugzilla/WebService/Server/JSONRPC.pm | 2 +- Bugzilla/WebService/Server/XMLRPC.pm | 9 + Bugzilla/WebService/User.pm | 2 - LICENSE | 373 ++++++++++++++++++++++ README | 146 ++++----- checksetup.pl | 5 +- docs/bugzilla.ent | 4 +- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 4 +- importxml.pl | 3 + relogin.cgi | 3 + t/003safesys.t | 11 +- taskgraph.json | 220 +++++++++++++ template/en/default/pages/release-notes.html.tmpl | 50 +++ 25 files changed, 901 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/bugzilla.git/?a=commitdiff;h=4cbc7ece4add61eed…

1 0

Jacek Caban : usp10: Added test of ScriptStringAnalyse call with 0 length string.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: efb1cf0299c23385f934fa9b3abc920bfca46611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb1cf0299c23385f934fa9b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 10 12:46:47 2015 +0200 usp10: Added test of ScriptStringAnalyse call with 0 length string. --- dlls/usp10/tests/usp10.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index b5d43f7..0db98d9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2547,6 +2547,12 @@ static void test_ScriptString(HDC hdc) &InClass, &ssa); ok(hr == E_PENDING, "ScriptStringAnalyse Stub should return E_PENDING not %08x\n", hr); + /* Test that 0 length string returns E_INVALIDARG */ + hr = ScriptStringAnalyse( hdc, teststr, 0, Glyphs, Charset, Flags, + ReqWidth, NULL, NULL, Dx, NULL, + &InClass, &ssa); + ok(hr == E_INVALIDARG, "ScriptStringAnalyse should return E_INVALIDARG not %08x\n", hr); + /* test with hdc, this should be a valid test */ hr = ScriptStringAnalyse( hdc, teststr, len, Glyphs, Charset, Flags, ReqWidth, NULL, NULL, Dx, NULL,

1 0

Józef Kucia : d3d11/tests: Port test_create_shader_resource_view() from d3d10core.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: eb45704ba88c2b0e59bf296a39c360d905a5d3fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb45704ba88c2b0e59bf296a3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:48 2015 +0200 d3d11/tests: Port test_create_shader_resource_view() from d3d10core. --- dlls/d3d11/tests/d3d11.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 15b9b19..8bf31dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -989,6 +989,102 @@ static void test_create_rendertarget_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_create_shader_resource_view(void) +{ + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D11_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D11ShaderResourceView *srview; + D3D11_BUFFER_DESC buffer_desc; + ID3D11Device *device, *tmp; + ID3D11Texture2D *texture; + ID3D11Buffer *buffer; + IUnknown *iface; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, NULL, &srview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = 0; + U(srv_desc).Buffer.ElementWidth = 64; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11ShaderResourceView_GetDevice(srview, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D11ShaderResourceView_Release(srview); + ID3D11Buffer_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 = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x.\n", hr); + + hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D10ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D11ShaderResourceView_GetDesc(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D11_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); + + ID3D11ShaderResourceView_Release(srview); + ID3D11Texture2D_Release(texture); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1000,4 +1096,5 @@ START_TEST(d3d11) test_buffer_interfaces(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); + test_create_shader_resource_view(); }

1 0

Józef Kucia : d3d11: Implement d3d11_device_CreateShaderResourceView().
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 8972105ee5e1a642b17762797c39cb4a09008203 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8972105ee5e1a642b17762797… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:47 2015 +0200 d3d11: Implement d3d11_device_CreateShaderResourceView(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 32 +++++++++++++++----------------- dlls/d3d11/view.c | 24 +++++++++++++++++++++++- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 93b82f9..e48befd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -202,8 +202,8 @@ struct d3d_shader_resource_view ID3D11Device *device; }; -HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; +HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ef12a33..dcaa49c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -119,9 +119,18 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture3D(ID3D11Device *ifac static HRESULT STDMETHODCALLTYPE d3d11_device_CreateShaderResourceView(ID3D11Device *iface, ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11ShaderResourceView **view) { - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_shader_resource_view *object; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + if (FAILED(hr = d3d_shader_resource_view_create(device, resource, desc, &object))) + return hr; + + *view = &object->ID3D11ShaderResourceView_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateUnorderedAccessView(ID3D11Device *iface, @@ -147,7 +156,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic *view = &object->ID3D11RenderTargetView_iface; return S_OK; - } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilView(ID3D11Device *iface, @@ -2113,28 +2121,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) - return E_OUTOFMEMORY; - if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource))) { ERR("Resource does not implement ID3D11Resource.\n"); - HeapFree(GetProcessHeap(), 0, object); return E_FAIL; } - if (FAILED(hr = d3d_shader_resource_view_init(object, device, d3d11_resource, - (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc))) - { - WARN("Failed to initialize shader resource view, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); - ID3D11Resource_Release(d3d11_resource); - return hr; - } - + hr = d3d_shader_resource_view_create(device, d3d11_resource, (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc, + &object); ID3D11Resource_Release(d3d11_resource); + if (FAILED(hr)) + return hr; - TRACE("Created shader resource view %p.\n", object); *view = &object->ID3D10ShaderResourceView_iface; return S_OK; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 99b1be7..4b39cc8 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1449,7 +1449,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl d3d10_shader_resource_view_GetDesc, }; -HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, +static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; @@ -1493,6 +1493,28 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str return S_OK; } +HRESULT d3d_shader_resource_view_create(struct d3d_device *device, ID3D11Resource *resource, + const D3D11_SHADER_RESOURCE_VIEW_DESC *desc, struct d3d_shader_resource_view **view) +{ + struct d3d_shader_resource_view *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc))) + { + WARN("Failed to initialize shader resource view, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created shader resource view %p.\n", object); + *view = object; + + return S_OK; +} + struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) { if (!iface)

1 0

Józef Kucia : d3d11: Implement d3d11_shader_resource_view_GetResource().
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 487cf3d5c41693723ebdb899807cd3df921d8a3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=487cf3d5c41693723ebdb8998… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:46 2015 +0200 d3d11: Implement d3d11_shader_resource_view_GetResource(). --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 13 ++++++++- dlls/d3d11/view.c | 68 ++++++++++++++++++++++++---------------------- 3 files changed, 50 insertions(+), 35 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 5cf7509..93b82f9 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -198,12 +198,12 @@ struct d3d_shader_resource_view struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; D3D11_SHADER_RESOURCE_VIEW_DESC desc; - ID3D10Resource *resource; + ID3D11Resource *resource; ID3D11Device *device; }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4266a98..ef12a33 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2108,6 +2108,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_shader_resource_view *object; + ID3D11Resource *d3d11_resource; HRESULT hr; TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); @@ -2115,14 +2116,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, + if (FAILED(hr = ID3D10Resource_QueryInterface(resource, &IID_ID3D11Resource, (void **)&d3d11_resource))) + { + ERR("Resource does not implement ID3D11Resource.\n"); + HeapFree(GetProcessHeap(), 0, object); + return E_FAIL; + } + + if (FAILED(hr = d3d_shader_resource_view_init(object, device, d3d11_resource, (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); + ID3D11Resource_Release(d3d11_resource); return hr; } + ID3D11Resource_Release(d3d11_resource); + TRACE("Created shader resource view %p.\n", object); *view = &object->ID3D10ShaderResourceView_iface; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index f3ac62f..99b1be7 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -240,27 +240,27 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 } } -static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) +static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) { - D3D10_RESOURCE_DIMENSION dimension; + D3D11_RESOURCE_DIMENSION dimension; - ID3D10Resource_GetType(resource, &dimension); + ID3D11Resource_GetType(resource, &dimension); switch (dimension) { - case D3D10_RESOURCE_DIMENSION_TEXTURE1D: + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { - D3D10_TEXTURE1D_DESC texture_desc; - ID3D10Texture1D *texture; + D3D11_TEXTURE1D_DESC texture_desc; + ID3D11Texture1D *texture; - if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture1D, (void **)&texture))) + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture))) { - ERR("Resource of type TEXTURE1D doesn't implement ID3D10Texture1D.\n"); + ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n"); return E_INVALIDARG; } - ID3D10Texture1D_GetDesc(texture, &texture_desc); - ID3D10Texture1D_Release(texture); + ID3D11Texture1D_GetDesc(texture, &texture_desc); + ID3D11Texture1D_Release(texture); desc->Format = texture_desc.Format; if (texture_desc.ArraySize == 1) @@ -281,19 +281,19 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I return S_OK; } - case D3D10_RESOURCE_DIMENSION_TEXTURE2D: + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { - D3D10_TEXTURE2D_DESC texture_desc; - ID3D10Texture2D *texture; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Texture2D *texture; - if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture2D, (void **)&texture))) + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture))) { - ERR("Resource of type TEXTURE2D doesn't implement ID3D10Texture2D.\n"); + ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n"); return E_INVALIDARG; } - ID3D10Texture2D_GetDesc(texture, &texture_desc); - ID3D10Texture2D_Release(texture); + ID3D11Texture2D_GetDesc(texture, &texture_desc); + ID3D11Texture2D_Release(texture); desc->Format = texture_desc.Format; if (texture_desc.ArraySize == 1) @@ -330,19 +330,19 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I return S_OK; } - case D3D10_RESOURCE_DIMENSION_TEXTURE3D: + case D3D11_RESOURCE_DIMENSION_TEXTURE3D: { - D3D10_TEXTURE3D_DESC texture_desc; - ID3D10Texture3D *texture; + D3D11_TEXTURE3D_DESC texture_desc; + ID3D11Texture3D *texture; - if (FAILED(ID3D10Resource_QueryInterface(resource, &IID_ID3D10Texture3D, (void **)&texture))) + if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture3D, (void **)&texture))) { - ERR("Resource of type TEXTURE3D doesn't implement ID3D10Texture3D.\n"); + ERR("Resource of type TEXTURE3D doesn't implement ID3D11Texture3D.\n"); return E_INVALIDARG; } - ID3D10Texture3D_GetDesc(texture, &texture_desc); - ID3D10Texture3D_Release(texture); + ID3D11Texture3D_GetDesc(texture, &texture_desc); + ID3D11Texture3D_Release(texture); desc->Format = texture_desc.Format; desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D; @@ -354,7 +354,7 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I default: FIXME("Unhandled resource dimension %#x.\n", dimension); - case D3D10_RESOURCE_DIMENSION_BUFFER: + case D3D11_RESOURCE_DIMENSION_BUFFER: return E_INVALIDARG; } } @@ -1238,7 +1238,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe { wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); - ID3D10Resource_Release(view->resource); + ID3D11Resource_Release(view->resource); ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); @@ -1292,7 +1292,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_SetPrivateDataInterf static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetResource(ID3D11ShaderResourceView *iface, ID3D11Resource **resource) { - FIXME("iface %p, resource %p stub!\n", iface, resource); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, resource %p.\n", iface, resource); + + *resource = view->resource; + ID3D11Resource_AddRef(*resource); } static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface, @@ -1412,8 +1417,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetResource(ID3D10Shade TRACE("iface %p, resource %p.\n", iface, resource); - *resource = view->resource; - ID3D10Resource_AddRef(*resource); + ID3D11Resource_QueryInterface(view->resource, &IID_ID3D10Resource, (void **)resource); } /* ID3D10ShaderResourceView methods */ @@ -1446,7 +1450,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) + ID3D11Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; HRESULT hr; @@ -1466,7 +1470,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str } wined3d_mutex_lock(); - if (!(wined3d_resource = wined3d_resource_from_d3d10_resource(resource))) + if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource))) { ERR("Failed to get wined3d resource for d3d10 resource %p.\n", resource); return E_FAIL; @@ -1482,7 +1486,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str wined3d_private_store_init(&view->private_store); wined3d_mutex_unlock(); view->resource = resource; - ID3D10Resource_AddRef(resource); + ID3D11Resource_AddRef(resource); view->device = &device->ID3D11Device_iface; ID3D11Device_AddRef(view->device);

1 0

Józef Kucia : d3d11: Implement d3d11_shader_resource_view_GetDesc().
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 28f98a0d9d1a53c6f204be0f694f72bd0d13aba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28f98a0d9d1a53c6f204be0f6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:45 2015 +0200 d3d11: Implement d3d11_shader_resource_view_GetDesc(). --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 3 ++- dlls/d3d11/view.c | 26 +++++++++++++++----------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 420de97..5cf7509 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -197,13 +197,13 @@ struct d3d_shader_resource_view struct wined3d_private_store private_store; struct wined3d_shader_resource_view *wined3d_view; - D3D10_SHADER_RESOURCE_VIEW_DESC desc; + D3D11_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; ID3D11Device *device; }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; + ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) DECLSPEC_HIDDEN; struct d3d_shader_resource_view *unsafe_impl_from_ID3D10ShaderResourceView( ID3D10ShaderResourceView *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0b90fb8..4266a98 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2115,7 +2115,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, desc))) + if (FAILED(hr = d3d_shader_resource_view_init(object, device, resource, + (const D3D11_SHADER_RESOURCE_VIEW_DESC *)desc))) { WARN("Failed to initialize shader resource view, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index cac8c25..f3ac62f 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -240,7 +240,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 } } -static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) +static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10Resource *resource) { D3D10_RESOURCE_DIMENSION dimension; @@ -265,13 +265,13 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I desc->Format = texture_desc.Format; if (texture_desc.ArraySize == 1) { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1D; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1D; desc->u.Texture1D.MostDetailedMip = 0; desc->u.Texture1D.MipLevels = texture_desc.MipLevels; } else { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE1DARRAY; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE1DARRAY; desc->u.Texture1DArray.MostDetailedMip = 0; desc->u.Texture1DArray.MipLevels = texture_desc.MipLevels; desc->u.Texture1DArray.FirstArraySlice = 0; @@ -300,20 +300,20 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I { if (texture_desc.SampleDesc.Count == 1) { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2D; desc->u.Texture2D.MostDetailedMip = 0; desc->u.Texture2D.MipLevels = texture_desc.MipLevels; } else { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMS; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMS; } } else { if (texture_desc.SampleDesc.Count == 1) { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DARRAY; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DARRAY; desc->u.Texture2DArray.MostDetailedMip = 0; desc->u.Texture2DArray.MipLevels = texture_desc.MipLevels; desc->u.Texture2DArray.FirstArraySlice = 0; @@ -321,7 +321,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I } else { - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY; desc->u.Texture2DMSArray.FirstArraySlice = 0; desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize; } @@ -345,7 +345,7 @@ static HRESULT set_srdesc_from_resource(D3D10_SHADER_RESOURCE_VIEW_DESC *desc, I ID3D10Texture3D_Release(texture); desc->Format = texture_desc.Format; - desc->ViewDimension = D3D10_SRV_DIMENSION_TEXTURE3D; + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURE3D; desc->u.Texture3D.MostDetailedMip = 0; desc->u.Texture3D.MipLevels = texture_desc.MipLevels; @@ -1298,7 +1298,11 @@ static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetResource(ID3D11Shade static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface, D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = view->desc; } static const struct ID3D11ShaderResourceViewVtbl d3d11_shader_resource_view_vtbl = @@ -1421,7 +1425,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDesc(ID3D10ShaderRes TRACE("iface %p, desc %p.\n", iface, desc); - *desc = view->desc; + memcpy(desc, &view->desc, sizeof(*desc)); } static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl = @@ -1442,7 +1446,7 @@ static const struct ID3D10ShaderResourceViewVtbl d3d10_shader_resource_view_vtbl }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc) + ID3D10Resource *resource, const D3D11_SHADER_RESOURCE_VIEW_DESC *desc) { struct wined3d_resource *wined3d_resource; HRESULT hr;

1 0

Józef Kucia : d3d11: Implement d3d11_shader_resource_view_GetDevice().
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: cdc8d9af86749f143d31259b5d41013e2d7ba9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc8d9af86749f143d31259b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:44 2015 +0200 d3d11: Implement d3d11_shader_resource_view_GetDevice(). --- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/view.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b5d0b72..420de97 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -199,7 +199,7 @@ struct d3d_shader_resource_view struct wined3d_shader_resource_view *wined3d_view; D3D10_SHADER_RESOURCE_VIEW_DESC desc; ID3D10Resource *resource; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, struct d3d_device *device, diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 7410916..cac8c25 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1239,7 +1239,7 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe wined3d_mutex_lock(); wined3d_shader_resource_view_decref(view->wined3d_view); ID3D10Resource_Release(view->resource); - ID3D10Device1_Release(view->device); + ID3D11Device_Release(view->device); wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, view); @@ -1251,7 +1251,12 @@ static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderRe static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDevice(ID3D11ShaderResourceView *iface, ID3D11Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = view->device; + ID3D11Device_AddRef(*device); } static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_GetPrivateData(ID3D11ShaderResourceView *iface, @@ -1359,8 +1364,7 @@ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderR TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)view->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(view->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_GetPrivateData(ID3D10ShaderResourceView *iface, @@ -1475,8 +1479,8 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str wined3d_mutex_unlock(); view->resource = resource; ID3D10Resource_AddRef(resource); - view->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(view->device); + view->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(view->device); return S_OK; }

1 0

Józef Kucia : d3d11: Add ID3D11ShaderResourceView interface stub.
by Alexandre Julliard 10 Sep '15

10 Sep '15

Module: wine Branch: master Commit: 3882f2d303bf06bae60ba4f3d9e04b2f59f3cee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3882f2d303bf06bae60ba4f3d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 10 00:55:43 2015 +0200 d3d11: Add ID3D11ShaderResourceView interface stub. --- dlls/d3d11/d3d11_private.h | 3 +- dlls/d3d11/view.c | 158 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 138 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0abd374..b5d0b72 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -188,9 +188,10 @@ HRESULT d3d_rendertarget_view_create(struct d3d_device *device, ID3D11Resource * const D3D11_RENDER_TARGET_VIEW_DESC *desc, struct d3d_rendertarget_view **view) DECLSPEC_HIDDEN; struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10RenderTargetView *iface) DECLSPEC_HIDDEN; -/* ID3D10ShaderResourceView */ +/* ID3D11ShaderResourceView, ID3D10ShaderResourceView */ struct d3d_shader_resource_view { + ID3D11ShaderResourceView ID3D11ShaderResourceView_iface; ID3D10ShaderResourceView ID3D10ShaderResourceView_iface; LONG refcount; diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 968c27e..7410916 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -1178,65 +1178,178 @@ struct d3d_rendertarget_view *unsafe_impl_from_ID3D10RenderTargetView(ID3D10Rend return impl_from_ID3D10RenderTargetView(iface); } -static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) +/* ID3D11ShaderResourceView methods */ + +struct d3d_shader_resource_view *impl_from_ID3D11ShaderResourceView(ID3D11ShaderResourceView *iface) { - return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface); + return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D11ShaderResourceView_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface, +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_QueryInterface(ID3D11ShaderResourceView *iface, REFIID riid, void **object) { + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView) - || IsEqualGUID(riid, &IID_ID3D10View) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11ShaderResourceView) + || IsEqualGUID(riid, &IID_ID3D11View) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11ShaderResourceView_AddRef(iface); *object = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_ID3D10ShaderResourceView) + || IsEqualGUID(riid, &IID_ID3D10View) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10ShaderResourceView_AddRef(&view->ID3D10ShaderResourceView_iface); + *object = &view->ID3D10ShaderResourceView_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_AddRef(ID3D11ShaderResourceView *iface) { - struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + ULONG refcount = InterlockedIncrement(&view->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", view, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) +static ULONG STDMETHODCALLTYPE d3d11_shader_resource_view_Release(ID3D11ShaderResourceView *iface) { - struct d3d_shader_resource_view *This = impl_from_ID3D10ShaderResourceView(iface); - ULONG refcount = InterlockedDecrement(&This->refcount); + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + ULONG refcount = InterlockedDecrement(&view->refcount); - TRACE("%p decreasing refcount to %u.\n", This, refcount); + TRACE("%p decreasing refcount to %u.\n", view, refcount); if (!refcount) { wined3d_mutex_lock(); - wined3d_shader_resource_view_decref(This->wined3d_view); - ID3D10Resource_Release(This->resource); - ID3D10Device1_Release(This->device); - wined3d_private_store_cleanup(&This->private_store); + wined3d_shader_resource_view_decref(view->wined3d_view); + ID3D10Resource_Release(view->resource); + ID3D10Device1_Release(view->device); + wined3d_private_store_cleanup(&view->private_store); wined3d_mutex_unlock(); - HeapFree(GetProcessHeap(), 0, This); + HeapFree(GetProcessHeap(), 0, view); } return refcount; } +static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDevice(ID3D11ShaderResourceView *iface, + ID3D11Device **device) +{ + FIXME("iface %p, device %p stub!\n", iface, device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_GetPrivateData(ID3D11ShaderResourceView *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_SetPrivateData(ID3D11ShaderResourceView *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&view->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_shader_resource_view_SetPrivateDataInterface(ID3D11ShaderResourceView *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D11ShaderResourceView(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&view->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetResource(ID3D11ShaderResourceView *iface, + ID3D11Resource **resource) +{ + FIXME("iface %p, resource %p stub!\n", iface, resource); +} + +static void STDMETHODCALLTYPE d3d11_shader_resource_view_GetDesc(ID3D11ShaderResourceView *iface, + D3D11_SHADER_RESOURCE_VIEW_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11ShaderResourceViewVtbl d3d11_shader_resource_view_vtbl = +{ + /* IUnknown methods */ + d3d11_shader_resource_view_QueryInterface, + d3d11_shader_resource_view_AddRef, + d3d11_shader_resource_view_Release, + /* ID3D11DeviceChild methods */ + d3d11_shader_resource_view_GetDevice, + d3d11_shader_resource_view_GetPrivateData, + d3d11_shader_resource_view_SetPrivateData, + d3d11_shader_resource_view_SetPrivateDataInterface, + /* ID3D11View methods */ + d3d11_shader_resource_view_GetResource, + /* ID3D11ShaderResourceView methods */ + d3d11_shader_resource_view_GetDesc, +}; + +/* ID3D10ShaderResourceView methods */ + +static inline struct d3d_shader_resource_view *impl_from_ID3D10ShaderResourceView(ID3D10ShaderResourceView *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_shader_resource_view, ID3D10ShaderResourceView_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_shader_resource_view_QueryInterface(ID3D10ShaderResourceView *iface, + REFIID riid, void **object) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_shader_resource_view_QueryInterface(&view->ID3D11ShaderResourceView_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_AddRef(ID3D10ShaderResourceView *iface) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_shader_resource_view_AddRef(&view->ID3D11ShaderResourceView_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_shader_resource_view_Release(ID3D10ShaderResourceView *iface) +{ + struct d3d_shader_resource_view *view = impl_from_ID3D10ShaderResourceView(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_shader_resource_view_Release(&view->ID3D11ShaderResourceView_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_shader_resource_view_GetDevice(ID3D10ShaderResourceView *iface, @@ -1330,6 +1443,7 @@ HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *view, str struct wined3d_resource *wined3d_resource; HRESULT hr; + view->ID3D11ShaderResourceView_iface.lpVtbl = &d3d11_shader_resource_view_vtbl; view->ID3D10ShaderResourceView_iface.lpVtbl = &d3d10_shader_resource_view_vtbl; view->refcount = 1;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2015