wine-commits March 2016

wine-commits@winehq.org

2 participants
722 discussions

Hans Leidekker : webservices: Reject field mappings without name or namespace.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 0fd7bb53892d523e35b16051a6331c6b498fe52d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fd7bb53892d523e35b16051a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:28 2016 +0100 webservices: Reject field mappings without name or namespace. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 5 ++++- dlls/webservices/writer.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 446fa1d..e76eb1b 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -787,9 +787,12 @@ static void test_WsWriteElement(void) f.mapping = WS_ATTRIBUTE_FIELD_MAPPING; /* requires localName and ns to be set */ - hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, NULL, 0, NULL ); + hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + f.localName = &localname; f.ns = &ns; hr = WsWriteElement( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f29b257..8dbe9c2 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1323,6 +1323,7 @@ static HRESULT write_type_struct_field( struct writer *writer, WS_TYPE_MAPPING m switch (desc->mapping) { case WS_ATTRIBUTE_FIELD_MAPPING: + if (!desc->localName || !desc->ns) return E_INVALIDARG; if ((hr = write_add_attribute( writer, NULL, desc->localName, desc->ns, FALSE )) != S_OK) return hr; break;

1 0

Hans Leidekker : webservices: Add support for attribute field mappings in the reader.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 7a6595bf5160b66e2ef335bea204b8f6460a3826 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a6595bf5160b66e2ef335bea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:27 2016 +0100 webservices: Add support for attribute field mappings in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 249 ++++++++++++---------------------------- dlls/webservices/tests/reader.c | 65 +++++++++++ 2 files changed, 141 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7a6595bf5160b66e2ef33…

1 0

Hans Leidekker : webservices: Move the reader to EOF at end of data in WsReadEndElement.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: d5255f51b2e0fe5e7e7fb0c4c520ccd5ee65b0af URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5255f51b2e0fe5e7e7fb0c4c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:26 2016 +0100 webservices: Move the reader to EOF at end of data in WsReadEndElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 10 +++++ dlls/webservices/tests/reader.c | 84 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 89 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index db68733..7abbf3c 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1194,6 +1194,16 @@ static HRESULT read_endelement( struct reader *reader ) WS_XML_STRING *prefix, *localname; HRESULT hr; + if (reader->state == READER_STATE_EOF) return WS_E_INVALID_FORMAT; + + if (read_end_of_data( reader )) + { + struct list *eof = list_tail( &reader->root->children ); + reader->current = LIST_ENTRY( eof, struct node, entry ); + reader->state = READER_STATE_EOF; + return S_OK; + } + if (read_cmp( reader, "</", 2 )) return WS_E_INVALID_FORMAT; read_skip( reader, 2 ); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 62a8846..6054690 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -887,11 +887,11 @@ static void test_WsReadStartElement(void) /* WsReadEndElement advances reader to EOF */ hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); @@ -904,6 +904,7 @@ static void test_WsReadEndElement(void) HRESULT hr; WS_XML_READER *reader; const WS_XML_NODE *node; + int found; hr = WsCreateReader( NULL, 0, &reader, NULL ) ; ok( hr == S_OK, "got %08x\n", hr ); @@ -976,11 +977,11 @@ static void test_WsReadEndElement(void) /* WsReadEndElement advances reader to EOF */ hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); ok( hr == S_OK, "got %08x\n", hr ); - todo_wine if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); @@ -1009,6 +1010,79 @@ static void test_WsReadEndElement(void) hr = WsReadEndElement( reader, NULL ); ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_input( reader, "<a></a>", sizeof("<a></a>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<a></a>") - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_EOF, "got %u\n", node->nodeType ); + + hr = set_input( reader, "<a/>", sizeof("<a/>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsFillReader( reader, sizeof("<a/>") - 1, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + found = -1; + hr = WsReadToStartElement( reader, NULL, NULL, &found, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( found == TRUE, "got %d\n", found ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadStartElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + if (node) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + + hr = WsReadEndElement( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeReader( reader ); } @@ -2134,7 +2208,7 @@ static void test_WsGetNamespaceFromPrefix(void) hr = WsReadStartElement( reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadEndElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr );

1 0

Hans Leidekker : webservices: Don' t read past the closing bracket in read_element.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: b7178446fc123d1b25ed72a8c235a90dfd38f943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7178446fc123d1b25ed72a8c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 2 14:06:25 2016 +0100 webservices: Don't read past the closing bracket in read_element. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 125 ++++++++++++++++++--------------- dlls/webservices/tests/reader.c | 4 +- dlls/webservices/webservices_private.h | 2 - dlls/webservices/writer.c | 11 ++- 4 files changed, 79 insertions(+), 63 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 37c2045..db68733 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1001,11 +1001,47 @@ error: return hr; } +static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) +{ + ULONG i; + if (len1 != len2) return 1; + for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } + return 0; +} + +static struct node *read_find_parent( struct reader *reader, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname ) +{ + struct node *parent; + const WS_XML_STRING *str; + + for (parent = reader->current; parent; parent = parent->parent) + { + if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_BOF) + { + if (!localname) return parent; + return NULL; + } + else if (parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) + { + if (!localname) return parent; + + str = parent->hdr.prefix; + if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; + str = parent->hdr.localName; + if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; + return parent; + } + } + + return NULL; +} + static HRESULT read_element( struct reader *reader ) { unsigned int len = 0, ch, skip; const unsigned char *start; - struct node *node; + struct node *node = NULL, *parent; WS_XML_ELEMENT_NODE *elem; WS_XML_ATTRIBUTE *attr; HRESULT hr = WS_E_INVALID_FORMAT; @@ -1018,9 +1054,6 @@ static HRESULT read_element( struct reader *reader ) return S_OK; } - if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; - elem = (WS_XML_ELEMENT_NODE *)node; - if (read_cmp( reader, "<", 1 )) goto error; read_skip( reader, 1 ); @@ -1034,6 +1067,12 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; + if (!(parent = read_find_parent( reader, NULL, NULL ))) goto error; + + hr = E_OUTOFMEMORY; + if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; + elem = (WS_XML_ELEMENT_NODE *)node; + if ((hr = parse_name( start, len, &elem->prefix, &elem->localName )) != S_OK) goto error; hr = E_OUTOFMEMORY; if (!(elem->ns = alloc_xml_string( NULL, 0 ))) goto error; @@ -1053,26 +1092,8 @@ static HRESULT read_element( struct reader *reader ) reader->current_attr++; } - read_skip_whitespace( reader ); - if (read_cmp( reader, ">", 1 ) && read_cmp( reader, "/>", 2 )) - { - hr = WS_E_INVALID_FORMAT; - goto error; - } - - read_insert_node( reader, reader->current, node ); - if (!read_cmp( reader, "/>", 2 )) - { - read_skip( reader, 2 ); - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; - read_insert_node( reader, reader->current, node ); - reader->state = READER_STATE_ENDELEMENT; - } - else - { - read_skip( reader, 1 ); - reader->state = READER_STATE_STARTELEMENT; - } + read_insert_node( reader, parent, node ); + reader->state = READER_STATE_STARTELEMENT; return S_OK; error: @@ -1112,10 +1133,27 @@ static HRESULT read_text( struct reader *reader ) return S_OK; } +static HRESULT read_node( struct reader * ); + static HRESULT read_startelement( struct reader *reader ) { - if (!read_cmp( reader, "<", 1 )) return read_element( reader ); - return read_text( reader ); + struct node *node; + + read_skip_whitespace( reader ); + if (!read_cmp( reader, "/>", 2 )) + { + read_skip( reader, 2 ); + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + read_insert_node( reader, reader->current, node ); + reader->state = READER_STATE_ENDELEMENT; + return S_OK; + } + else if (!read_cmp( reader, ">", 1 )) + { + read_skip( reader, 1 ); + return read_node( reader ); + } + return WS_E_INVALID_FORMAT; } static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) @@ -1148,36 +1186,6 @@ static HRESULT read_to_startelement( struct reader *reader, BOOL *found ) return hr; } -static int cmp_name( const unsigned char *name1, ULONG len1, const unsigned char *name2, ULONG len2 ) -{ - ULONG i; - if (len1 != len2) return 1; - for (i = 0; i < len1; i++) { if (toupper( name1[i] ) != toupper( name2[i] )) return 1; } - return 0; -} - -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; - - for (parent = node; parent; parent = parent->parent) - { - if (parent->hdr.node.nodeType != WS_XML_NODE_TYPE_ELEMENT) continue; - if (!localname) return parent; - - str = parent->hdr.prefix; - if (cmp_name( str->bytes, str->length, prefix->bytes, prefix->length )) continue; - - str = parent->hdr.localName; - if (cmp_name( str->bytes, str->length, localname->bytes, localname->length )) continue; - - return parent; - } - return NULL; -} - static HRESULT read_endelement( struct reader *reader ) { struct node *node, *parent; @@ -1204,7 +1212,7 @@ static HRESULT read_endelement( struct reader *reader ) } if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) return hr; - parent = find_parent_element( reader->current, prefix, localname ); + parent = read_find_parent( reader, prefix, localname ); heap_free( prefix ); heap_free( localname ); if (!parent) return WS_E_INVALID_FORMAT; @@ -1333,7 +1341,8 @@ static HRESULT read_node( struct reader *reader ) else if (!read_cmp( reader, "</", 2 )) return read_endelement( reader ); else if (!read_cmp( reader, "<![CDATA[", 9 )) return read_startcdata( reader ); else if (!read_cmp( reader, "<!--", 4 )) return read_comment( reader ); - else if (!read_cmp( reader, "<", 1 )) return read_startelement( reader ); + else if (!read_cmp( reader, "<", 1 )) return read_element( reader ); + else if (!read_cmp( reader, "/>", 2 ) || !read_cmp( reader, ">", 1 )) return read_startelement( reader ); else return read_text( reader ); } } diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 720379e..62a8846 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -2045,7 +2045,7 @@ static void test_WsGetNamespaceFromPrefix(void) hr = set_input( reader, "<prefix:t xmlns:prefix2='ns'/>", sizeof("<prefix:t xmlns:prefix2='ns'/>") - 1 ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadStartElement( reader, NULL ); - todo_wine ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); prepare_namespace_test( reader, "<t></t>" ); ns = NULL; @@ -2132,7 +2132,7 @@ static void test_WsGetNamespaceFromPrefix(void) prepare_namespace_test( reader, "<t xmlns:prefix='ns'></t>" ); hr = WsReadStartElement( reader, NULL ); - todo_wine ok( hr == S_OK, "got %08x\n", hr ); + ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadEndElement( reader, NULL ); todo_wine ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetNamespaceFromPrefix( reader, &prefix, TRUE, &ns, NULL ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 4eeedf5..bae2149 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -32,8 +32,6 @@ 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 14bddfb..f29b257 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -597,9 +597,18 @@ static HRESULT write_startelement( struct writer *writer ) return S_OK; } +static struct node *write_find_parent_element( struct writer *writer ) +{ + struct node *node = writer->current; + + if (node->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node; + if (node->parent->hdr.node.nodeType == WS_XML_NODE_TYPE_ELEMENT) return node->parent; + return NULL; +} + static HRESULT write_endelement( struct writer *writer ) { - struct node *node = find_parent_element( writer->current, NULL, NULL ); + struct node *node = write_find_parent_element( writer ); WS_XML_ELEMENT_NODE *elem = &node->hdr; ULONG size; HRESULT hr;

1 0

Matteo Bruni : wined3d: Add a setting to check relative addressing indices when accessing uniforms.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 8e696dee5ff05377c8ccc59b4d204eb42d4cdeca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e696dee5ff05377c8ccc59b4… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 00:50:00 2016 +0100 wined3d: Add a setting to check relative addressing indices when accessing uniforms. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 ++++++- dlls/wined3d/wined3d_main.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a2ce187..a56ee9b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2257,7 +2257,12 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * /* Relative addressing */ if (reg->idx[0].rel_addr) { - if (reg->idx[0].offset) + if (wined3d_settings.check_float_constants) + sprintf(register_name, "(%s + %u >= 0 && %s + %u < %u ? %s_c[%s + %u] : vec4(0.0))", + rel_param0.param_str, reg->idx[0].offset, + rel_param0.param_str, reg->idx[0].offset, shader->limits->constant_float, + prefix, rel_param0.param_str, reg->idx[0].offset); + else if (reg->idx[0].offset) sprintf(register_name, "%s_c[%s + %u]", prefix, rel_param0.param_str, reg->idx[0].offset); else sprintf(register_name, "%s_c[%s]", prefix, rel_param0.param_str); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0543d97..45e41ad 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ + FALSE, /* Don't range check relative addressing indices in float constants. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No GS shader model limit by default. */ ~0U, /* No PS shader model limit by default. */ @@ -302,6 +303,12 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Not always rendering backbuffers offscreen.\n"); wined3d_settings.always_offscreen = FALSE; } + if (!get_config_key(hkey, appkey, "CheckFloatConstants", buffer, size) + && !strcmp(buffer, "enabled")) + { + TRACE("Checking relative addressing indices in float constants.\n"); + wined3d_settings.check_float_constants = TRUE; + } if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce2f196..d36c557 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -290,6 +290,7 @@ struct wined3d_settings int allow_multisampling; BOOL strict_draw_ordering; BOOL always_offscreen; + BOOL check_float_constants; unsigned int max_sm_vs; unsigned int max_sm_gs; unsigned int max_sm_ps;

1 0

Józef Kucia : d3d10core/tests: Viewport properties are integers.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 28c04a64f6fc3dd6dff24b6919ea71e56dcbe278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28c04a64f6fc3dd6dff24b691… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:46:07 2016 +0100 d3d10core/tests: Viewport properties are integers. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 00302bb..27c7ee0 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5617,10 +5617,10 @@ float4 main(const ps_in v) : SV_TARGET ID3D10Device_VSSetConstantBuffers(device, 1, 1, &colors_cb); ID3D10Device_PSSetShader(device, ps); - vp.TopLeftX = 0.0f; - vp.TopLeftY = 0.0f; - vp.Width = 640.0f; - vp.Height = 480.0f; + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; vp.MinDepth = 0.0f; vp.MaxDepth = 1.0f; ID3D10Device_RSSetViewports(device, 1, &vp);

1 0

Józef Kucia : d3d10core/tests: Port test_multiple_render_targets() from d3d11.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 9e9b51f1b13863c0fa4f48af232b8d1b4875b838 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e9b51f1b13863c0fa4f48af2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:02 2016 +0100 d3d10core/tests: Port test_multiple_render_targets() 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 | 175 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 175 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 11f9c73..00302bb 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3930,6 +3930,180 @@ static void test_texture(void) DestroyWindow(window); } +static void test_multiple_render_targets(void) +{ + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10InputLayout *input_layout; + unsigned int stride, offset, i; + ID3D10RenderTargetView *rtv[4]; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *rt[4]; + ID3D10VertexShader *vs; + ID3D10PixelShader *ps; + ID3D10Device *device; + D3D10_VIEWPORT vp; + ID3D10Buffer *vb; + ULONG refcount; + HRESULT hr; + + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct output + { + float4 t1 : SV_TARGET0; + float4 t2 : SV_Target1; + float4 t3 : SV_TARGET2; + float4 t4 : SV_Target3; + }; + + output main(float4 position : SV_POSITION) + { + struct output o; + o.t1 = (float4)1.0f; + o.t2 = (float4)0.5f; + o.t3 = (float4)0.2f; + o.t4 = float4(0.0f, 0.2f, 0.5f, 1.0f); + return o; + } +#endif + 0x43425844, 0x8701ad18, 0xe3d5291d, 0x7b4288a6, 0x01917515, 0x00000001, 0x000001a8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000072, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000068, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x00000072, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x545f5653, 0x45475241, 0x56530054, 0x7261545f, + 0x00746567, 0x52444853, 0x000000bc, 0x00000040, 0x0000002f, 0x03000065, 0x001020f2, 0x00000000, + 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, + 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, + 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x3e4ccccd, + 0x3e4ccccd, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, 0x3e4ccccd, 0x3f000000, + 0x3f800000, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + 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_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + { + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rt[i]); + ok(SUCCEEDED(hr), "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rt[i], NULL, &rtv[i]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_OMSetRenderTargets(device, 4, rtv, NULL); + ID3D10Device_IASetInputLayout(device, input_layout); + ID3D10Device_IASetPrimitiveTopology(device, D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 0, 1, &vb, &stride, &offset); + ID3D10Device_VSSetShader(device, vs); + ID3D10Device_PSSetShader(device, ps); + + vp.TopLeftX = 0; + vp.TopLeftY = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D10Device_RSSetViewports(device, 1, &vp); + + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D10Device_ClearRenderTargetView(device, rtv[i], red); + + ID3D10Device_Draw(device, 4, 0); + + check_texture_color(rt[0], 0xffffffff, 2); + check_texture_color(rt[1], 0x7f7f7f7f, 2); + check_texture_color(rt[2], 0x33333333, 2); + check_texture_color(rt[3], 0xff7f3300, 2); + + ID3D10Buffer_Release(vb); + ID3D10PixelShader_Release(ps); + ID3D10VertexShader_Release(vs); + ID3D10InputLayout_Release(input_layout); + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D10RenderTargetView_Release(rtv[i]); + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + ID3D10Texture2D_Release(rt[i]); + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_private_data(void) { D3D10_TEXTURE2D_DESC texture_desc; @@ -5872,6 +6046,7 @@ START_TEST(device) test_clear_state(); test_blend(); test_texture(); + test_multiple_render_targets(); test_private_data(); test_il_append_aligned(); test_fragment_coords();

1 0

Józef Kucia : d3d11/tests: Introduce check_texture_color().
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 0ac8dd6976c37b1a874568371c7cbeee175ffda1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ac8dd6976c37b1a874568371… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:01 2016 +0100 d3d11/tests: Introduce check_texture_color(). 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 | 84 +++++++++++++++++++++++------------------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4054b2a..0d675f7 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -85,6 +85,7 @@ struct texture_readback ID3D11Resource *texture; D3D11_MAPPED_SUBRESOURCE map_desc; ID3D11DeviceContext *immediate_context; + unsigned int width, height; }; static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readback *rb) @@ -109,6 +110,9 @@ static void get_texture_readback(ID3D11Texture2D *texture, struct texture_readba return; } + rb->width = texture_desc.Width; + rb->height = texture_desc.Height; + ID3D11Device_GetImmediateContext(device, &rb->immediate_context); ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->texture, (ID3D11Resource *)texture); @@ -152,6 +156,35 @@ static DWORD get_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigne return color; } +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D11Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + struct texture_readback rb; + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + DWORD color = 0; + + get_texture_readback(texture, &rb); + for (y = 0; y < rb.height; ++y) + { + for (x = 0; x < rb.width; ++x) + { + color = get_readback_color(&rb, x, y); + if (!compare_color(color, expected_color, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + release_texture_readback(&rb); + ok_(__FILE__, line)(all_match, + "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); +} + static ID3D11Device *create_device(const D3D_FEATURE_LEVEL *feature_level) { ID3D11Device *device; @@ -3580,7 +3613,6 @@ static void test_multiple_render_targets(void) D3D11_VIEWPORT vp; ID3D11Buffer *vb; ULONG refcount; - DWORD color; HRESULT hr; static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = @@ -3733,14 +3765,10 @@ static void test_multiple_render_targets(void) ID3D11DeviceContext_Draw(context, 4, 0); - color = get_texture_color(rt[0], 320, 240); - ok(compare_color(color, 0xffffffff, 2), "Got unexpected color 0x%08x.\n", color); - color = get_texture_color(rt[1], 320, 240); - ok(compare_color(color, 0x7f7f7f7f, 2), "Got unexpected color 0x%08x.\n", color); - color = get_texture_color(rt[2], 320, 240); - ok(compare_color(color, 0x33333333, 2), "Got unexpected color 0x%08x.\n", color); - color = get_texture_color(rt[3], 320, 240); - ok(compare_color(color, 0xff7f3300, 2), "Got unexpected color 0x%08x.\n", color); + check_texture_color(rt[0], 0xffffffff, 2); + check_texture_color(rt[1], 0x7f7f7f7f, 2); + check_texture_color(rt[2], 0x33333333, 2); + check_texture_color(rt[3], 0xff7f3300, 2); ID3D11Buffer_Release(vb); ID3D11PixelShader_Release(ps); @@ -3917,8 +3945,7 @@ static void test_scissor(void) ID3D11DeviceContext_OMSetRenderTargets(immediate_context, 1, &rtv, NULL); ID3D11DeviceContext_ClearRenderTargetView(immediate_context, rtv, red); - color = get_texture_color(backbuffer, 320, 240); - ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color); + check_texture_color(backbuffer, 0xff0000ff, 1); ID3D11DeviceContext_Draw(immediate_context, 4, 0); color = get_texture_color(backbuffer, 320, 60); @@ -4617,19 +4644,10 @@ static void test_update_subresource(void) ID3D11DeviceContext_RSSetViewports(context, 1, &vp); ID3D11DeviceContext_ClearRenderTargetView(context, backbuffer_rtv, red); + check_texture_color(backbuffer, 0x7f0000ff, 1); ID3D11DeviceContext_Draw(context, 4, 0); - get_texture_readback(backbuffer, &rb); - for (i = 0; i < 4; ++i) - { - for (j = 0; j < 4; ++j) - { - color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120); - ok(compare_color(color, 0x00000000, 0), - "Got unexpected color 0x%08x at (%u, %u).\n", color, j, i); - } - } - release_texture_readback(&rb); + check_texture_color(backbuffer, 0x00000000, 0); set_box(&box, 1, 1, 0, 3, 3, 1); ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)texture, 0, &box, @@ -5113,11 +5131,7 @@ static void test_multisample_init(void) ID3D11Device *device; ID3D11DeviceContext *context; ULONG refcount; - DWORD color; HRESULT hr; - unsigned int x, y; - struct texture_readback rb; - BOOL all_zero = TRUE; UINT count = 0; HWND window; IDXGISwapChain *swapchain; @@ -5166,23 +5180,7 @@ static void test_multisample_init(void) ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)backbuffer, 0, (ID3D11Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); - get_texture_readback(backbuffer, &rb); - for (y = 0; y < 480; ++y) - { - for (x = 0; x < 640; ++x) - { - color = get_readback_color(&rb, x, y); - if (!compare_color(color, 0x00000000, 0)) - { - all_zero = FALSE; - break; - } - } - if (!all_zero) - break; - } - release_texture_readback(&rb); - todo_wine ok(all_zero, "Got unexpected color 0x%08x, position %ux%u.\n", color, x, y); + todo_wine check_texture_color(backbuffer, 0x00000000, 0); ID3D11DeviceContext_Release(context); ID3D11RenderTargetView_Release(rtview);

1 0

Józef Kucia : d3d11/tests: Add test for multiple render targets.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: 25f9fbcc6d263b10e773553fd0ef6b1594079f4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f9fbcc6d263b10e773553fd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:20:00 2016 +0100 d3d11/tests: Add test for multiple render targets. 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 | 192 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 00b3d18..4054b2a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3564,6 +3564,197 @@ static void test_texture(void) DestroyWindow(window); } +static void test_multiple_render_targets(void) +{ + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11InputLayout *input_layout; + unsigned int stride, offset, i; + ID3D11RenderTargetView *rtv[4]; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *rt[4]; + ID3D11VertexShader *vs; + ID3D11PixelShader *ps; + ID3D11Device *device; + D3D11_VIEWPORT vp; + ID3D11Buffer *vb; + ULONG refcount; + DWORD color; + HRESULT hr; + + static const D3D11_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + }; + static const DWORD vs_code[] = + { +#if 0 + float4 main(float4 position : POSITION) : SV_POSITION + { + return position; + } +#endif + 0x43425844, 0xa7a2f22d, 0x83ff2560, 0xe61638bd, 0x87e3ce90, 0x00000001, 0x000000d8, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x49534f50, 0x4e4f4954, 0xababab00, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, 0x52444853, 0x0000003c, 0x00010040, + 0x0000000f, 0x0300005f, 0x001010f2, 0x00000000, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, + 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, + }; + static const DWORD ps_code[] = + { +#if 0 + struct output + { + float4 t1 : SV_TARGET0; + float4 t2 : SV_Target1; + float4 t3 : SV_TARGET2; + float4 t4 : SV_Target3; + }; + + output main(float4 position : SV_POSITION) + { + struct output o; + o.t1 = (float4)1.0f; + o.t2 = (float4)0.5f; + o.t3 = (float4)0.2f; + o.t4 = float4(0.0f, 0.2f, 0.5f, 1.0f); + return o; + } +#endif + 0x43425844, 0x8701ad18, 0xe3d5291d, 0x7b4288a6, 0x01917515, 0x00000001, 0x000001a8, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e4, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000007c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x00000072, 0x00000001, 0x00000000, 0x00000003, 0x00000001, 0x0000000f, + 0x00000068, 0x00000002, 0x00000000, 0x00000003, 0x00000002, 0x0000000f, 0x00000072, 0x00000003, + 0x00000000, 0x00000003, 0x00000003, 0x0000000f, 0x545f5653, 0x45475241, 0x56530054, 0x7261545f, + 0x00746567, 0x52444853, 0x000000bc, 0x00000040, 0x0000002f, 0x03000065, 0x001020f2, 0x00000000, + 0x03000065, 0x001020f2, 0x00000001, 0x03000065, 0x001020f2, 0x00000002, 0x03000065, 0x001020f2, + 0x00000003, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x08000036, 0x001020f2, 0x00000001, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, + 0x3f000000, 0x08000036, 0x001020f2, 0x00000002, 0x00004002, 0x3e4ccccd, 0x3e4ccccd, 0x3e4ccccd, + 0x3e4ccccd, 0x08000036, 0x001020f2, 0x00000003, 0x00004002, 0x00000000, 0x3e4ccccd, 0x3f000000, + 0x3f800000, 0x0100003e, + }; + static const struct + { + struct vec2 position; + } + quad[] = + { + {{-1.0f, -1.0f}}, + {{-1.0f, 1.0f}}, + {{ 1.0f, -1.0f}}, + {{ 1.0f, 1.0f}}, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + if (ID3D11Device_GetFeatureLevel(device) < D3D_FEATURE_LEVEL_9_3) + { + skip("Feature level 9_3 or higher is required.\n"); + ID3D11Device_Release(device); + return; + } + + hr = ID3D11Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), + vs_code, sizeof(vs_code), &input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + buffer_desc.ByteWidth = sizeof(quad); + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_VERTEX_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + + resource_data.pSysMem = quad; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &vb); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + texture_desc.Width = 640; + texture_desc.Height = 480; + texture_desc.MipLevels = 1; + 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_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + { + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &rt[i]); + ok(SUCCEEDED(hr), "Failed to create texture %u, hr %#x.\n", i, hr); + + hr = ID3D11Device_CreateRenderTargetView(device, (ID3D11Resource *)rt[i], NULL, &rtv[i]); + ok(SUCCEEDED(hr), "Failed to create rendertarget view %u, hr %#x.\n", i, hr); + } + + hr = ID3D11Device_CreateVertexShader(device, vs_code, sizeof(vs_code), NULL, &vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11Device_GetImmediateContext(device, &context); + + ID3D11DeviceContext_OMSetRenderTargets(context, 4, rtv, NULL); + ID3D11DeviceContext_IASetInputLayout(context, input_layout); + ID3D11DeviceContext_IASetPrimitiveTopology(context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP); + stride = sizeof(*quad); + offset = 0; + ID3D11DeviceContext_IASetVertexBuffers(context, 0, 1, &vb, &stride, &offset); + ID3D11DeviceContext_VSSetShader(context, vs, NULL, 0); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + vp.TopLeftX = 0.0f; + vp.TopLeftY = 0.0f; + vp.Width = 640.0f; + vp.Height = 480.0f; + vp.MinDepth = 0.0f; + vp.MaxDepth = 1.0f; + ID3D11DeviceContext_RSSetViewports(context, 1, &vp); + + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D11DeviceContext_ClearRenderTargetView(context, rtv[i], red); + + ID3D11DeviceContext_Draw(context, 4, 0); + + color = get_texture_color(rt[0], 320, 240); + ok(compare_color(color, 0xffffffff, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[1], 320, 240); + ok(compare_color(color, 0x7f7f7f7f, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[2], 320, 240); + ok(compare_color(color, 0x33333333, 2), "Got unexpected color 0x%08x.\n", color); + color = get_texture_color(rt[3], 320, 240); + ok(compare_color(color, 0xff7f3300, 2), "Got unexpected color 0x%08x.\n", color); + + ID3D11Buffer_Release(vb); + ID3D11PixelShader_Release(ps); + ID3D11VertexShader_Release(vs); + ID3D11InputLayout_Release(input_layout); + for (i = 0; i < sizeof(rtv) / sizeof(*rtv); ++i) + ID3D11RenderTargetView_Release(rtv[i]); + for (i = 0; i < sizeof(rt) / sizeof(*rt); ++i) + ID3D11Texture2D_Release(rt[i]); + ID3D11DeviceContext_Release(context); + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_scissor(void) { ID3D11DeviceContext *immediate_context; @@ -5205,6 +5396,7 @@ START_TEST(d3d11) test_private_data(); test_blend(); test_texture(); + test_multiple_render_targets(); test_scissor(); test_il_append_aligned(); test_fragment_coords();

1 0

Józef Kucia : wined3d: Fix SM4 pixel shader output registers mapping.
by Alexandre Julliard 02 Mar '16

02 Mar '16

Module: wine Branch: master Commit: b77dd8813def9afb3c120a021cd2758d47fb980c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b77dd8813def9afb3c120a021… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 1 22:19:59 2016 +0100 wined3d: Fix SM4 pixel shader output registers mapping. 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/shader_sm4.c | 42 +++++------------------------------------- include/wine/wined3d.h | 10 ---------- 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 45bd9f0..a741f66 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -266,11 +266,7 @@ struct wined3d_sm4_data struct wined3d_shader_version shader_version; const DWORD *end; - struct - { - enum wined3d_shader_register_type register_type; - UINT register_idx; - } output_map[MAX_REG_OUTPUT]; + unsigned int output_map[MAX_REG_OUTPUT]; struct wined3d_shader_src_param src_param[5]; struct wined3d_shader_dst_param dst_param[2]; @@ -287,13 +283,6 @@ struct wined3d_sm4_opcode_info const char *src_info; }; -struct sysval_map -{ - enum wined3d_sysval_semantic sysval; - enum wined3d_shader_register_type register_type; - UINT register_idx; -}; - /* * F -> WINED3D_DATA_FLOAT * I -> WINED3D_DATA_INT @@ -429,19 +418,6 @@ static const enum wined3d_primitive_type input_primitive_type_table[] = /* WINED3D_SM4_INPUT_PT_TRIANGLEADJ */ WINED3D_PT_TRIANGLELIST_ADJ, }; -static const struct sysval_map sysval_map[] = -{ - {WINED3D_SV_DEPTH, WINED3DSPR_DEPTHOUT, 0}, - {WINED3D_SV_TARGET0, WINED3DSPR_COLOROUT, 0}, - {WINED3D_SV_TARGET1, WINED3DSPR_COLOROUT, 1}, - {WINED3D_SV_TARGET2, WINED3DSPR_COLOROUT, 2}, - {WINED3D_SV_TARGET3, WINED3DSPR_COLOROUT, 3}, - {WINED3D_SV_TARGET4, WINED3DSPR_COLOROUT, 4}, - {WINED3D_SV_TARGET5, WINED3DSPR_COLOROUT, 5}, - {WINED3D_SV_TARGET6, WINED3DSPR_COLOROUT, 6}, - {WINED3D_SV_TARGET7, WINED3DSPR_COLOROUT, 7}, -}; - static const enum wined3d_shader_resource_type resource_type_table[] = { /* 0 */ WINED3D_SHADER_RESOURCE_NONE, @@ -496,8 +472,8 @@ static void map_register(const struct wined3d_sm4_data *priv, struct wined3d_sha break; } - reg->type = priv->output_map[reg_idx].register_type; - reg->idx[0].offset = priv->output_map[reg_idx].register_idx; + reg->type = WINED3DSPR_COLOROUT; + reg->idx[0].offset = priv->output_map[reg_idx]; } break; @@ -529,7 +505,7 @@ static enum wined3d_data_type map_data_type(char t) static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader_signature *output_signature) { struct wined3d_sm4_data *priv; - unsigned int i, j; + unsigned int i; if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) { @@ -548,15 +524,7 @@ static void *shader_sm4_init(const DWORD *byte_code, const struct wined3d_shader continue; } - for (j = 0; j < ARRAY_SIZE(sysval_map); ++j) - { - if (e->sysval_semantic == sysval_map[j].sysval) - { - priv->output_map[e->register_idx].register_type = sysval_map[j].register_type; - priv->output_map[e->register_idx].register_idx = sysval_map[j].register_idx; - break; - } - } + priv->output_map[e->register_idx] = e->semantic_idx; } list_init(&priv->src_free); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1af0d52..a4b2a30 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -752,16 +752,6 @@ enum wined3d_sysval_semantic WINED3D_SV_INSTANCEID = 8, WINED3D_SV_ISFRONTFACE = 9, WINED3D_SV_SAMPLEINDEX = 10, - - WINED3D_SV_DEPTH = 0xffffffff, - WINED3D_SV_TARGET0 = 0, - WINED3D_SV_TARGET1 = 1, - WINED3D_SV_TARGET2 = 2, - WINED3D_SV_TARGET3 = 3, - WINED3D_SV_TARGET4 = 4, - WINED3D_SV_TARGET5 = 5, - WINED3D_SV_TARGET6 = 6, - WINED3D_SV_TARGET7 = 7, }; enum wined3d_scanline_ordering

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
73
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 March 2016