January 2016 - Wine-Commits

Józef Kucia : wined3d: Do not copy surface region when empty box is passed.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: cd243969899b6c8a6531b18b63e5365c43dec487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd243969899b6c8a6531b18b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:10 2016 +0100 wined3d: Do not copy surface region when empty box is passed. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 87221c3..c058881 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4004,6 +4004,14 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev if (src_box) { + if (src_box->front >= src_box->back) + { + WARN("Invalid box (%u, %u, %u)->(%u, %u, %u) specified.\n", + src_box->left, src_box->top, src_box->front, + src_box->right, src_box->bottom, src_box->back); + return WINED3DERR_INVALIDCALL; + } + src_rect.left = src_box->left; src_rect.top = src_box->top; src_rect.right = src_box->right;

1 0

Józef Kucia : d3d11/tests: Add test for ID3D11DeviceContext::CopySubresourceRegion().
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: c161543c8678125b00972282208035ad710ff648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c161543c8678125b009722822… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:11 2016 +0100 d3d11/tests: Add test for ID3D11DeviceContext::CopySubresourceRegion(). Based on test_update_subresource(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c161543c8678125b00972…

1 0

Hans Leidekker : webservices: Implement WsWriteXmlBuffer.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 32e20cbf320974bf6837835a5c30dd01b7254ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32e20cbf320974bf6837835a5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:56 2016 +0100 webservices: Implement WsWriteXmlBuffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5a2baba..42f5b63 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -187,7 +187,7 @@ @ stdcall WsWriteText(ptr ptr ptr) @ stub WsWriteType @ stub WsWriteValue -@ stub WsWriteXmlBuffer +@ stdcall WsWriteXmlBuffer(ptr ptr ptr) @ stub WsWriteXmlBufferToBytes @ stub WsWriteXmlnsAttribute @ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index d36793a..398d651 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -773,3 +773,22 @@ HRESULT WINAPI WsWriteText( WS_XML_WRITER *handle, const WS_XML_TEXT *text, WS_E elem->attributes[elem->attributeCount - 1]->value = (WS_XML_TEXT *)dst; return S_OK; } + +/************************************************************************** + * WsWriteXmlBuffer [webservices.@] + */ +HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + + TRACE( "%p %p %p\n", handle, buffer, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf) return E_INVALIDARG; + + if ((hr = write_grow_buffer( writer, xmlbuf->size )) != S_OK) return hr; + write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsWriteXmlBufferToBytes.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: ed33639561f7bfe6ade90f4dac8575258aa32ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed33639561f7bfe6ade90f4da… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:57 2016 +0100 webservices: Implement WsWriteXmlBufferToBytes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 42f5b63..fe9eb6c 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -188,6 +188,6 @@ @ stub WsWriteType @ stub WsWriteValue @ stdcall WsWriteXmlBuffer(ptr ptr ptr) -@ stub WsWriteXmlBufferToBytes +@ stdcall WsWriteXmlBufferToBytes(ptr ptr ptr ptr long ptr ptr ptr ptr) @ stub WsWriteXmlnsAttribute @ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 398d651..0178978 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -792,3 +792,41 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W write_bytes( writer, xmlbuf->ptr, xmlbuf->size ); return S_OK; } + +/************************************************************************** + * WsWriteXmlBufferToBytes [webservices.@] + */ +HRESULT WINAPI WsWriteXmlBufferToBytes( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, + const WS_XML_WRITER_ENCODING *encoding, + const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_HEAP *heap, void **bytes, ULONG *size, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + char *buf; + ULONG i; + + TRACE( "%p %p %p %p %u %p %p %p %p\n", handle, buffer, encoding, properties, count, heap, + bytes, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf || !heap || !bytes) return E_INVALIDARG; + + if (encoding && encoding->encodingType != WS_XML_WRITER_ENCODING_TYPE_TEXT) + { + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + + for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + + if (!(buf = ws_alloc( heap, xmlbuf->size ))) return WS_E_QUOTA_EXCEEDED; + memcpy( buf, xmlbuf->ptr, xmlbuf->size ); + *bytes = buf; + return S_OK; +}

1 0

Hans Leidekker : webservices: Reject end elements without a parent in the writer.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 6086ad0fe384cd6744cf5c83f2ad4f336e381845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6086ad0fe384cd6744cf5c83f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:58 2016 +0100 webservices: Reject end elements without a parent in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 4 ++-- dlls/webservices/webservices_private.h | 2 ++ dlls/webservices/writer.c | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ae3d62a..13ca50b 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1063,8 +1063,8 @@ static BOOL cmp_localname( const unsigned char *name1, ULONG len1, const unsigne return TRUE; } -static struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname ) +struct node *find_parent_element( struct node *node, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) { struct node *parent; const WS_XML_STRING *str; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index bae2149..4eeedf5 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,6 +32,8 @@ WS_XML_STRING *alloc_xml_string( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const unsigned char *, ULONG ) DECLSPEC_HIDDEN; HRESULT append_attribute( WS_XML_ELEMENT_NODE *, WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; void free_attribute( WS_XML_ATTRIBUTE * ) DECLSPEC_HIDDEN; +struct node *find_parent_element( struct node *, const WS_XML_STRING *, + const WS_XML_STRING * ) DECLSPEC_HIDDEN; struct node { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 0178978..62e78be 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -546,10 +546,13 @@ static HRESULT write_startelement( struct writer *writer ) static HRESULT write_endelement( struct writer *writer ) { - WS_XML_ELEMENT_NODE *elem = (WS_XML_ELEMENT_NODE *)writer->current; + struct node *node = find_parent_element( writer->current, NULL, NULL ); + WS_XML_ELEMENT_NODE *elem = &node->hdr; ULONG size; HRESULT hr; + if (!elem) return WS_E_INVALID_FORMAT; + /* '</prefix:localname>' */ size = elem->localName->length + 3 /* '</>' */;

1 0

Józef Kucia : d3d10core/tests: Port test_copy_subresource_region() from d3d11.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 50a8d3f6d2c0bce11aefa94a0b7fa53951d0defe URL: http://source.winehq.org/git/wine.git/?a=commit;h=50a8d3f6d2c0bce11aefa94a0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 19 22:28:12 2016 +0100 d3d10core/tests: Port test_copy_subresource_region() from d3d11. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 265 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 265 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50a8d3f6d2c0bce11aefa…

1 0

Hans Leidekker : webservices: Implement WsWriteType for a number of basic types.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 2563356bd64f98bbc0f5933d40550df932e60ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2563356bd64f98bbc0f5933d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jan 21 15:27:59 2016 +0100 webservices: Implement WsWriteType for a number of basic types. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 1 + dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 483 ++++++++++++++++++++++++++++++++++++-- 3 files changed, 468 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2563356bd64f98bbc0f59…

1 0

Riccardo Bortolato : d3d11: Handle NULL source box in d3d10_device_CopySubresourceRegion().
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: aa472ac67a4f13925162f68abad21b377e2fc5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa472ac67a4f13925162f68ab… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Tue Jan 19 22:28:08 2016 +0100 d3d11: Handle NULL source box in d3d10_device_CopySubresourceRegion(). Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 18 +++++++++++------- dlls/wined3d/device.c | 24 +++++++++++++++++------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8fc6cb1..38845ec 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3186,17 +3186,21 @@ static void STDMETHODCALLTYPE d3d10_device_CopySubresourceRegion(ID3D10Device1 * iface, dst_resource, dst_subresource_idx, dst_x, dst_y, dst_z, src_resource, src_subresource_idx, src_box); + if (src_box) + { + wined3d_src_box.left = src_box->left; + wined3d_src_box.top = src_box->top; + wined3d_src_box.front = src_box->front; + wined3d_src_box.right = src_box->right; + wined3d_src_box.bottom = src_box->bottom; + wined3d_src_box.back = src_box->back; + } + wined3d_dst_resource = wined3d_resource_from_d3d10_resource(dst_resource); wined3d_src_resource = wined3d_resource_from_d3d10_resource(src_resource); - wined3d_src_box.left = src_box->left; - wined3d_src_box.top = src_box->top; - wined3d_src_box.front = src_box->front; - wined3d_src_box.right = src_box->right; - wined3d_src_box.bottom = src_box->bottom; - wined3d_src_box.back = src_box->back; wined3d_mutex_lock(); wined3d_device_copy_sub_resource_region(device->wined3d_device, wined3d_dst_resource, dst_subresource_idx, - dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, &wined3d_src_box); + dst_x, dst_y, dst_z, wined3d_src_resource, src_subresource_idx, src_box ? &wined3d_src_box : NULL); wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d308083..87221c3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4002,15 +4002,25 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev } src_surface = surface_from_resource(tmp); + if (src_box) + { + src_rect.left = src_box->left; + src_rect.top = src_box->top; + src_rect.right = src_box->right; + src_rect.bottom = src_box->bottom; + } + else + { + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = src_surface->resource.width; + src_rect.bottom = src_surface->resource.height; + } + dst_rect.left = dst_x; dst_rect.top = dst_y; - dst_rect.right = dst_x + (src_box->right - src_box->left); - dst_rect.bottom = dst_y + (src_box->bottom - src_box->top); - - src_rect.left = src_box->left; - src_rect.top = src_box->top; - src_rect.right = src_box->right; - src_rect.bottom = src_box->bottom; + dst_rect.right = dst_x + (src_rect.right - src_rect.left); + dst_rect.bottom = dst_y + (src_rect.bottom - src_rect.top); if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) ERR("Failed to blit, hr %#x.\n", hr);

1 0

Nikolay Sivov : d2d1: SetDpi() rejects negative values too.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: e2f9bc0d0ba902196d91f919fb6c43a9ef9d3614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f9bc0d0ba902196d91f919f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 20 21:31:58 2016 +0300 d2d1: SetDpi() rejects negative values too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 2 +- dlls/d2d1/tests/d2d1.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index e4a4ad4..ec2fec1 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1439,7 +1439,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_SetDpi(ID2D1RenderTarget *if dpi_x = 96.0f; dpi_y = 96.0f; } - else if (dpi_x == 0.0f || dpi_y == 0.0f) + else if (dpi_x <= 0.0f || dpi_y <= 0.0f) return; render_target->dpi_x = dpi_x; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index c7d67f1..e6d1a68 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -593,6 +593,16 @@ static void test_clip(void) ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + ID2D1RenderTarget_SetDpi(rt, -10.0f, 96.0f); + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + + ID2D1RenderTarget_SetDpi(rt, 96.0f, -10.0f); + ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); + ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x); + ok(dpi_y == 192.0f, "Got unexpected dpi_y %.8e.\n", dpi_y); + ID2D1RenderTarget_SetDpi(rt, 96.0f, 0.0f); ID2D1RenderTarget_GetDpi(rt, &dpi_x, &dpi_y); ok(dpi_x == 192.0f, "Got unexpected dpi_x %.8e.\n", dpi_x);

1 0

Jacek Caban : d3d11.idl: Added CD3D11_RENDER_TARGET_VIEW_DESC and CD3D11_SHADER_RESOURCE_VIEW_DESC declarations.
by Alexandre Julliard Jan. 21, 2016

Jan. 21, 2016

Module: wine Branch: master Commit: 13b571c50b07ef91694fad679e7d5dd2e48e27ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b571c50b07ef91694fad679… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 20 22:01:39 2016 +0100 d3d11.idl: Added CD3D11_RENDER_TARGET_VIEW_DESC and CD3D11_SHADER_RESOURCE_VIEW_DESC declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d11.idl | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 605befd..d32fa34 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -1086,6 +1086,72 @@ typedef struct D3D11_RENDER_TARGET_VIEW_DESC }; } D3D11_RENDER_TARGET_VIEW_DESC; +cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined(__cplusplus)") +cpp_quote("struct CD3D11_RENDER_TARGET_VIEW_DESC : public D3D11_RENDER_TARGET_VIEW_DESC {") +cpp_quote(" CD3D11_RENDER_TARGET_VIEW_DESC() {}") +cpp_quote(" explicit CD3D11_RENDER_TARGET_VIEW_DESC(D3D11_RTV_DIMENSION dim, DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN,") +cpp_quote(" UINT mip_slice = 0, UINT first_slice = 0, UINT array_size = -1) {") +cpp_quote(" Format = format;") +cpp_quote(" ViewDimension = dim;") +cpp_quote(" switch(dim) {") +cpp_quote(" case D3D11_RTV_DIMENSION_BUFFER:") +cpp_quote(" Buffer.FirstElement = mip_slice;") +cpp_quote(" Buffer.NumElements = first_slice;") +cpp_quote(" break;") +cpp_quote(" case D3D11_RTV_DIMENSION_TEXTURE1D:") +cpp_quote(" Texture1D.MipSlice = mip_slice;") +cpp_quote(" break;") +cpp_quote(" case D3D11_RTV_DIMENSION_TEXTURE1DARRAY:") +cpp_quote(" Texture1DArray.MipSlice = mip_slice;") +cpp_quote(" Texture1DArray.FirstArraySlice = first_slice;") +cpp_quote(" Texture1DArray.ArraySize = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_RTV_DIMENSION_TEXTURE2D:") +cpp_quote(" Texture2D.MipSlice = mip_slice;") +cpp_quote(" break;") +cpp_quote(" case D3D11_RTV_DIMENSION_TEXTURE2DARRAY:") +cpp_quote(" Texture2DArray.MipSlice = mip_slice;") +cpp_quote(" Texture2DArray.FirstArraySlice = first_slice;") +cpp_quote(" Texture2DArray.ArraySize = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY:") +cpp_quote(" Texture2DMSArray.FirstArraySlice = first_slice;") +cpp_quote(" Texture2DMSArray.ArraySize = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_RTV_DIMENSION_TEXTURE3D:") +cpp_quote(" Texture3D.MipSlice = mip_slice;") +cpp_quote(" Texture3D.FirstWSlice = first_slice;") +cpp_quote(" Texture3D.WSize = array_size;") +cpp_quote(" break;") +cpp_quote(" default:") +cpp_quote(" break;") +cpp_quote(" }") +cpp_quote(" }") +cpp_quote(" explicit CD3D11_RENDER_TARGET_VIEW_DESC(ID3D11Buffer*, DXGI_FORMAT format, UINT first_elem,") +cpp_quote(" UINT elem_cnt) {") +cpp_quote(" Format = format;") +cpp_quote(" ViewDimension = D3D11_RTV_DIMENSION_BUFFER;") +cpp_quote(" Buffer.FirstElement = first_elem;") +cpp_quote(" Buffer.NumElements = elem_cnt;") +cpp_quote(" }") +cpp_quote(" explicit CD3D11_RENDER_TARGET_VIEW_DESC(ID3D11Texture1D *texture, D3D11_RTV_DIMENSION dim,") +cpp_quote(" DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT mip_slice = 0, UINT first_slice = 0,") +cpp_quote(" UINT array_size = -1);") /* FIXME: implement */ +cpp_quote(" explicit CD3D11_RENDER_TARGET_VIEW_DESC(ID3D11Texture2D *texture, D3D11_RTV_DIMENSION dim,") +cpp_quote(" DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT mip_slice = 0, UINT first_slice = 0,") +cpp_quote(" UINT array_size = -1);") /* FIXME: implement */ +cpp_quote(" explicit CD3D11_RENDER_TARGET_VIEW_DESC(ID3D11Texture3D *texture, DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN,") +cpp_quote(" UINT mip_slice = 0, UINT first_w_slice = 0, UINT w_slice = -1 );") /* FIXME: implement */ +cpp_quote(" ~CD3D11_RENDER_TARGET_VIEW_DESC() {}") +cpp_quote(" explicit CD3D11_RENDER_TARGET_VIEW_DESC(const D3D11_RENDER_TARGET_VIEW_DESC &other)") +cpp_quote(" : D3D11_RENDER_TARGET_VIEW_DESC(other) {}") +cpp_quote(" operator const D3D11_RENDER_TARGET_VIEW_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + + typedef struct D3D11_SAMPLER_DESC { D3D11_FILTER Filter; @@ -1164,6 +1230,85 @@ typedef struct D3D11_SHADER_RESOURCE_VIEW_DESC }; } D3D11_SHADER_RESOURCE_VIEW_DESC; +cpp_quote("#if !defined(D3D11_NO_HELPERS) && defined( __cplusplus )") +cpp_quote("struct CD3D11_SHADER_RESOURCE_VIEW_DESC : public D3D11_SHADER_RESOURCE_VIEW_DESC {") +cpp_quote(" CD3D11_SHADER_RESOURCE_VIEW_DESC() {}") +cpp_quote(" explicit CD3D11_SHADER_RESOURCE_VIEW_DESC(D3D11_SRV_DIMENSION dim,") +cpp_quote(" DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT most_detailed_mip = 0,") +cpp_quote(" UINT mip_levels = -1, UINT first_slice = 0, UINT array_size = -1, UINT flags = 0) {") +cpp_quote(" Format = format;") +cpp_quote(" ViewDimension = dim;") +cpp_quote(" switch(ViewDimension) {") +cpp_quote(" case D3D11_SRV_DIMENSION_BUFFER:") +cpp_quote(" Buffer.FirstElement = most_detailed_mip;") +cpp_quote(" Buffer.NumElements = mip_levels;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURE1D:") +cpp_quote(" Texture1D.MostDetailedMip = most_detailed_mip;") +cpp_quote(" Texture1D.MipLevels = mip_levels;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURE1DARRAY:") +cpp_quote(" Texture1DArray.MostDetailedMip = most_detailed_mip;") +cpp_quote(" Texture1DArray.MipLevels = mip_levels;") +cpp_quote(" Texture1DArray.FirstArraySlice = first_slice;") +cpp_quote(" Texture1DArray.ArraySize = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURE2D:") +cpp_quote(" Texture2D.MostDetailedMip = most_detailed_mip;") +cpp_quote(" Texture2D.MipLevels = mip_levels;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURE2DARRAY:") +cpp_quote(" Texture2DArray.MostDetailedMip = most_detailed_mip;") +cpp_quote(" Texture2DArray.MipLevels = mip_levels;") +cpp_quote(" Texture2DArray.FirstArraySlice = first_slice;") +cpp_quote(" Texture2DArray.ArraySize = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY:") +cpp_quote(" Texture2DMSArray.FirstArraySlice = first_slice;") +cpp_quote(" Texture2DMSArray.ArraySize = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURE3D:") +cpp_quote(" Texture3D.MostDetailedMip = most_detailed_mip;") +cpp_quote(" Texture3D.MipLevels = mip_levels;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURECUBE:") +cpp_quote(" TextureCube.MostDetailedMip = most_detailed_mip;") +cpp_quote(" TextureCube.MipLevels = mip_levels;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_TEXTURECUBEARRAY:") +cpp_quote(" TextureCubeArray.MostDetailedMip = most_detailed_mip;") +cpp_quote(" TextureCubeArray.MipLevels = mip_levels;") +cpp_quote(" TextureCubeArray.First2DArrayFace = first_slice;") +cpp_quote(" TextureCubeArray.NumCubes = array_size;") +cpp_quote(" break;") +cpp_quote(" case D3D11_SRV_DIMENSION_BUFFEREX:") +cpp_quote(" BufferEx.FirstElement = most_detailed_mip;") +cpp_quote(" BufferEx.NumElements = mip_levels;") +cpp_quote(" BufferEx.Flags = flags;") +cpp_quote(" break;") +cpp_quote(" default:") +cpp_quote(" break;") +cpp_quote(" }") +cpp_quote(" }") +cpp_quote(" explicit CD3D11_SHADER_RESOURCE_VIEW_DESC(ID3D11Buffer*, DXGI_FORMAT format, UINT first_elem,") +cpp_quote(" UINT elem_cnt, UINT flags = 0);") /* FIXME: implement */ +cpp_quote(" explicit CD3D11_SHADER_RESOURCE_VIEW_DESC(ID3D11Texture1D *texture, D3D11_SRV_DIMENSION dim,") +cpp_quote(" DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT most_detailed_mip = 0, UINT mip_levels = -1,") +cpp_quote(" UINT first_slice = 0, UINT array_size = -1 );") /* FIXME: implement */ +cpp_quote(" explicit CD3D11_SHADER_RESOURCE_VIEW_DESC(ID3D11Texture2D *texture, D3D11_SRV_DIMENSION dim,") +cpp_quote(" DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN, UINT most_detailed_mip = 0, UINT mip_levels = -1,") +cpp_quote(" UINT first_slice = 0, UINT array_size = -1 );") /* FIXME: implement */ +cpp_quote(" explicit CD3D11_SHADER_RESOURCE_VIEW_DESC(ID3D11Texture3D *texture, DXGI_FORMAT format = DXGI_FORMAT_UNKNOWN,") +cpp_quote(" UINT most_detailed_mip = 0, UINT mip_levels = -1 );") +cpp_quote(" ~CD3D11_SHADER_RESOURCE_VIEW_DESC() {}") +cpp_quote(" explicit CD3D11_SHADER_RESOURCE_VIEW_DESC(const D3D11_SHADER_RESOURCE_VIEW_DESC &other)") +cpp_quote(" : D3D11_SHADER_RESOURCE_VIEW_DESC(other) {}") +cpp_quote(" operator const D3D11_SHADER_RESOURCE_VIEW_DESC&() const {") +cpp_quote(" return *this;") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("#endif") + typedef struct D3D11_TEXTURE1D_DESC { UINT Width;

1 0