July 2016 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Destroy the resource after view in wined3d_unordered_access_view_decref.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 4c71e37bbd13349665b1f219d10ed0bbb93b4fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c71e37bbd13349665b1f219d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:34 2016 +0100 wined3d: Destroy the resource after view in wined3d_unordered_access_view_decref. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5318a5d..985c343 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -439,13 +439,14 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;

1 0

Stefan Dösinger : wined3d: Avoid reading freed memory when destroying shader resource views.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 80348ec5b47dd0de18105fc50e0cf940601bfdda URL: http://source.winehq.org/git/wine.git/?a=commit;h=80348ec5b47dd0de18105fc50… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:33 2016 +0100 wined3d: Avoid reading freed memory when destroying shader resource views. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e39f6f8..5318a5d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -228,13 +228,14 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;

1 0

Michael Stefaniuc : user32: Use InflateRect() too when stretching the RECT in just one axis.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 488562904ffe5f05592da37fe9d6bd2b83548224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=488562904ffe5f05592da37fe… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 4 09:47:27 2016 +0200 user32: Use InflateRect() too when stretching the RECT in just one axis. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 179d44a..23139e9 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -2376,14 +2376,9 @@ static void EDIT_SetRectNP(EDITSTATE *es, const RECT *rc) else if (es->style & WS_BORDER) { bw = GetSystemMetrics(SM_CXBORDER) + 1; bh = GetSystemMetrics(SM_CYBORDER) + 1; - es->format_rect.left += bw; - es->format_rect.right -= bw; - if (es->format_rect.bottom - es->format_rect.top - >= es->line_height + 2 * bh) - { - es->format_rect.top += bh; - es->format_rect.bottom -= bh; - } + InflateRect(&es->format_rect, -bw, 0); + if (es->format_rect.bottom - es->format_rect.top >= es->line_height + 2 * bh) + InflateRect(&es->format_rect, 0, -bh); } es->format_rect.left += es->left_margin;

1 0

Hans Leidekker : webservices: Implement WsWriteNode.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: b17b7b430c2f31beb79962aeeedfeb8a5fe9f216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17b7b430c2f31beb79962aee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:41 2016 +0200 webservices: Implement WsWriteNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 98 +++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 555 +++++++++++++++++++++++++------------- include/webservices.h | 1 + 4 files changed, 471 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b17b7b430c2f31beb7996…

1 0

Hans Leidekker : webservices: Decode XML entities.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: f449b1324f4f71d73910190d4cb6866c06d527aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f449b1324f4f71d73910190d4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:40 2016 +0200 webservices: Decode XML entities. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 136 +++++++++++++++++++++++++++++++++++++++- dlls/webservices/tests/reader.c | 115 +++++++++++++++++++++++++++++++++ 2 files changed, 248 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f449b1324f4f71d739101…

1 0

Hans Leidekker : webservices: Implement WsGetReaderPosition.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 5ad00660685068eb5adf3e721f997be57b59610e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ad00660685068eb5adf3e721… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:38 2016 +0200 webservices: Implement WsGetReaderPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 28 ++++++++++++++++++++--- dlls/webservices/tests/reader.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index b8dfed4..b326bd8 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -432,6 +432,7 @@ struct reader ULONG nb_prefixes; ULONG nb_prefixes_allocated; WS_XML_READER_INPUT_TYPE input_type; + struct xmlbuf *input_buf; const unsigned char *input_data; ULONG input_size; ULONG prop_count; @@ -570,6 +571,7 @@ static HRESULT read_init_state( struct reader *reader ) destroy_nodes( reader->root ); reader->root = NULL; + reader->input_buf = NULL; clear_prefixes( reader->prefixes, reader->nb_prefixes ); reader->nb_prefixes = 1; if (!(node = alloc_node( WS_XML_NODE_TYPE_EOF ))) return E_OUTOFMEMORY; @@ -3823,9 +3825,10 @@ static WS_CHARSET detect_charset( const unsigned char *data, ULONG size, ULONG * return ret; } -static void set_input_buffer( struct reader *reader, const unsigned char *data, ULONG size ) +static void set_input_buffer( struct reader *reader, struct xmlbuf *buf, const unsigned char *data, ULONG size ) { reader->input_type = WS_XML_READER_INPUT_TYPE_BUFFER; + reader->input_buf = buf; reader->input_data = data; reader->input_size = size; @@ -3891,7 +3894,8 @@ HRESULT WINAPI WsSetInput( WS_XML_READER *handle, const WS_XML_READER_ENCODING * case WS_XML_READER_INPUT_TYPE_BUFFER: { WS_XML_READER_BUFFER_INPUT *buf = (WS_XML_READER_BUFFER_INPUT *)input; - set_input_buffer( reader, (const unsigned char *)buf->encodedData + offset, buf->encodedDataSize - offset ); + set_input_buffer( reader, NULL, (const unsigned char *)buf->encodedData + offset, + buf->encodedDataSize - offset ); break; } default: @@ -3937,7 +3941,7 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, &charset, sizeof(charset) ); if (hr != S_OK) return hr; - set_input_buffer( reader, (const unsigned char *)xmlbuf->ptr + offset, xmlbuf->size - offset ); + set_input_buffer( reader, xmlbuf, (const unsigned char *)xmlbuf->ptr + offset, xmlbuf->size - offset ); if (!(node = alloc_node( WS_XML_NODE_TYPE_BOF ))) return E_OUTOFMEMORY; read_insert_bof( reader, node ); return S_OK; @@ -3957,3 +3961,21 @@ HRESULT WINAPI WsXmlStringEquals( const WS_XML_STRING *str1, const WS_XML_STRING if (!memcmp( str1->bytes, str2->bytes, str1->length )) return S_OK; return S_FALSE; } + +/************************************************************************** + * WsGetReaderPosition [webservices.@] + */ +HRESULT WINAPI WsGetReaderPosition( WS_XML_READER *handle, WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader || !pos) return E_INVALIDARG; + if (!reader->input_buf) return WS_E_INVALID_OPERATION; + + pos->buffer = (WS_XML_BUFFER *)reader->input_buf; + pos->node = reader->current; + return S_OK; +} diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 4997f7a..a613fa2 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -3449,6 +3449,52 @@ static void test_WsResetError(void) WsFreeError( error ); } +static void test_WsGetReaderPosition(void) +{ + WS_HEAP *heap; + WS_XML_READER *reader; + WS_XML_BUFFER *buffer; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsGetReaderPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateReader( NULL, 0, &reader, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + /* reader must be set to an XML buffer */ + hr = WsGetReaderPosition( reader, &pos, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_input( reader, "<t/>", sizeof("<t/>") - 1 ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderPosition( reader, &pos, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetInputToBuffer( reader, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetReaderPosition( reader, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetReaderPosition( reader, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer != NULL, "buffer not set\n" ); + ok( pos.node != NULL, "node not set\n" ); + + WsFreeReader( reader ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -3481,4 +3527,5 @@ START_TEST(reader) test_WsReadElement(); test_WsReadValue(); test_WsResetError(); + test_WsGetReaderPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3a69302..814788f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -81,7 +81,7 @@ @ stub WsGetPolicyProperty @ stdcall WsGetPrefixFromNamespace(ptr ptr long ptr ptr) @ stdcall WsGetReaderNode(ptr ptr ptr) -@ stub WsGetReaderPosition +@ stdcall WsGetReaderPosition(ptr ptr ptr) @ stdcall WsGetReaderProperty(ptr long ptr long ptr) @ stub WsGetSecurityContextProperty @ stub WsGetSecurityTokenProperty

1 0

Józef Kucia : wined3d: Implement SM4 indexable temporary registers in GLSL backend.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: b18f2f5debba73005ea4c39160715c29f0c360ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18f2f5debba73005ea4c3916… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:30 2016 +0200 wined3d: Implement SM4 indexable temporary registers in GLSL backend. 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/glsl_shader.c | 18 +++++++++++++++++- dlls/wined3d/shader.c | 27 +++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 16 +++++++++------- 3 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 63442b3..5c33106 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1796,6 +1796,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont const struct vs_compile_args *vs_args = ctx_priv->cur_vs_args; const struct ps_compile_args *ps_args = ctx_priv->cur_ps_args; const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_shader_indexable_temp *idx_temp_reg; unsigned int i, extra_constants_needed = 0; const struct wined3d_shader_lconst *lconst; const char *prefix; @@ -2172,6 +2173,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); } + /* Declare indexable temporary variables */ + LIST_FOR_EACH_ENTRY(idx_temp_reg, &reg_maps->indexable_temps, struct wined3d_shader_indexable_temp, entry) + { + if (idx_temp_reg->component_count != 4) + FIXME("Ignoring component count %u.\n", idx_temp_reg->component_count); + shader_addline(buffer, "vec4 X%u[%u];\n", idx_temp_reg->register_idx, idx_temp_reg->register_size); + } + /* Declare loop registers aLx */ if (version->major < 4) { @@ -2575,6 +2584,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "uint(gl_PrimitiveIDIn)"); break; + case WINED3DSPR_IDXTEMP: + if (reg->idx[1].rel_addr) + sprintf(register_name, "X%u[%s + %u]", reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); + else + sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -8568,7 +8584,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, - /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d11eeb0..2a3b9a9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -852,6 +852,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st memset(input_signature_elements, 0, sizeof(input_signature_elements)); memset(output_signature_elements, 0, sizeof(output_signature_elements)); reg_maps->min_rel_offset = ~0U; + list_init(&reg_maps->indexable_temps); fe->shader_read_header(fe_data, &ptr, &shader_version); reg_maps->shader_version = shader_version; @@ -947,6 +948,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Multiple immediate constant buffers.\n"); reg_maps->icb = ins.declaration.icb; } + else if (ins.handler_idx == WINED3DSIH_DCL_INDEXABLE_TEMP) + { + struct wined3d_shader_indexable_temp *reg; + + if (!(reg = HeapAlloc(GetProcessHeap(), 0, sizeof(*reg)))) + return E_OUTOFMEMORY; + + *reg = ins.declaration.indexable_temp; + list_add_tail(&reg_maps->indexable_temps, &reg->entry); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) @@ -1331,6 +1342,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st return WINED3D_OK; } +static void shader_cleanup_reg_maps(struct wined3d_shader_reg_maps *reg_maps) +{ + struct wined3d_shader_indexable_temp *reg, *reg_next; + + HeapFree(GetProcessHeap(), 0, reg_maps->constf); + HeapFree(GetProcessHeap(), 0, reg_maps->sampler_map.entries); + + LIST_FOR_EACH_ENTRY_SAFE(reg, reg_next, &reg_maps->indexable_temps, struct wined3d_shader_indexable_temp, entry) + HeapFree(GetProcessHeap(), 0, reg); + list_init(&reg_maps->indexable_temps); +} + unsigned int shader_find_free_input_register(const struct wined3d_shader_reg_maps *reg_maps, unsigned int max) { DWORD map = 1u << max; @@ -2432,8 +2455,7 @@ static void shader_cleanup(struct wined3d_shader *shader) HeapFree(GetProcessHeap(), 0, shader->input_signature.elements); HeapFree(GetProcessHeap(), 0, shader->signature_strings); shader->device->shader_backend->shader_destroy(shader); - HeapFree(GetProcessHeap(), 0, shader->reg_maps.constf); - HeapFree(GetProcessHeap(), 0, shader->reg_maps.sampler_map.entries); + shader_cleanup_reg_maps(&shader->reg_maps); HeapFree(GetProcessHeap(), 0, shader->function); shader_delete_constant_list(&shader->constantsF); shader_delete_constant_list(&shader->constantsB); @@ -2609,6 +2631,7 @@ static HRESULT shader_set_function(struct wined3d_shader *shader, const DWORD *b list_init(&shader->constantsB); list_init(&shader->constantsI); shader->lconst_inf_or_nan = FALSE; + list_init(&reg_maps->indexable_temps); fe = shader_select_frontend(*byte_code); if (!fe) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c3d5ae8..f592664 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -791,6 +791,14 @@ struct wined3d_shader_immediate_constant_buffer DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; }; +struct wined3d_shader_indexable_temp +{ + struct list entry; + unsigned int register_idx; + unsigned int register_size; + unsigned int component_count; +}; + #define WINED3D_SHADER_VERSION(major, minor) (((major) << 8) | (minor)) struct wined3d_shader_reg_maps @@ -801,6 +809,7 @@ struct wined3d_shader_reg_maps WORD labels; /* MAX_LABELS, 16 */ DWORD temporary; /* MAX_REG_TEMP, 32 */ DWORD *constf; /* pixel, vertex */ + struct list indexable_temps; const struct wined3d_shader_immediate_constant_buffer *icb; union { @@ -899,13 +908,6 @@ struct wined3d_shader_src_param enum wined3d_shader_src_modifier modifiers; }; -struct wined3d_shader_indexable_temp -{ - unsigned int register_idx; - unsigned int register_size; - unsigned int component_count; -}; - struct wined3d_shader_semantic { enum wined3d_decl_usage usage;

1 0

Józef Kucia : wined3d: Recognize SM5 emit_stream opcode.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 5c5a8256e88b0bb62849dcd55e8ad0df5cdf4dd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c5a8256e88b0bb62849dcd55… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:28 2016 +0200 wined3d: Recognize SM5 emit_stream opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 5 +++++ dlls/wined3d/shader_sm4.c | 29 ++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5a0cdba..c8a4c95 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5274,6 +5274,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_hw_else, /* WINED3DSIH_EMIT */ NULL, + /* WINED3DSIH_EMIT_STREAM */ NULL, /* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDREP */ shader_hw_endrep, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c6b3c1b..4bae389 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8610,6 +8610,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit, + /* WINED3DSIH_EMIT_STREAM */ NULL, /* WINED3DSIH_ENDIF */ shader_glsl_end, /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index eb95136..ebe64ee 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -104,6 +104,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DSY_FINE */ "deriv_rty_fine", /* WINED3DSIH_ELSE */ "else", /* WINED3DSIH_EMIT */ "emit", + /* WINED3DSIH_EMIT_STREAM */ "emit_stream", /* WINED3DSIH_ENDIF */ "endif", /* WINED3DSIH_ENDLOOP */ "endloop", /* WINED3DSIH_ENDREP */ "endrep", @@ -1779,6 +1780,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "x"); break; + case WINED3DSPR_STREAM: + shader_addline(buffer, "m"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c90c2d4..ed4cdc9 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -206,6 +206,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74, + WINED3D_SM5_OP_EMIT_STREAM = 0x75, WINED3D_SM5_OP_BUFINFO = 0x79, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, @@ -237,18 +238,19 @@ enum wined3d_sm4_opcode enum wined3d_sm4_register_type { - WINED3D_SM4_RT_TEMP = 0x0, - WINED3D_SM4_RT_INPUT = 0x1, - WINED3D_SM4_RT_OUTPUT = 0x2, - WINED3D_SM4_RT_INDEXABLE_TEMP = 0x3, - WINED3D_SM4_RT_IMMCONST = 0x4, - WINED3D_SM4_RT_SAMPLER = 0x6, - WINED3D_SM4_RT_RESOURCE = 0x7, - WINED3D_SM4_RT_CONSTBUFFER = 0x8, - WINED3D_SM4_RT_IMMCONSTBUFFER = 0x9, - WINED3D_SM4_RT_PRIMID = 0xb, - WINED3D_SM4_RT_DEPTHOUT = 0xc, - WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM4_RT_TEMP = 0x00, + WINED3D_SM4_RT_INPUT = 0x01, + WINED3D_SM4_RT_OUTPUT = 0x02, + WINED3D_SM4_RT_INDEXABLE_TEMP = 0x03, + WINED3D_SM4_RT_IMMCONST = 0x04, + WINED3D_SM4_RT_SAMPLER = 0x06, + WINED3D_SM4_RT_RESOURCE = 0x07, + WINED3D_SM4_RT_CONSTBUFFER = 0x08, + WINED3D_SM4_RT_IMMCONSTBUFFER = 0x09, + WINED3D_SM4_RT_PRIMID = 0x0b, + WINED3D_SM4_RT_DEPTHOUT = 0x0c, + WINED3D_SM4_RT_NULL = 0x0d, + WINED3D_SM5_RT_STREAM = 0x10, WINED3D_SM5_RT_OUTPUT_CONTROL_POINT_ID = 0x16, WINED3D_SM5_RT_FORK_INSTANCE_ID = 0x17, WINED3D_SM5_RT_INPUT_CONTROL_POINT = 0x19, @@ -795,6 +797,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""}, + {WINED3D_SM5_OP_EMIT_STREAM, WINED3DSIH_EMIT_STREAM, "", "f"}, {WINED3D_SM5_OP_BUFINFO, WINED3DSIH_BUFINFO, "i", "U"}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, @@ -854,7 +857,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_STREAM */ WINED3DSPR_STREAM, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 184d7b5..0e7f87a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -393,6 +393,7 @@ enum wined3d_shader_register_type WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX, WINED3DSPR_IDXTEMP, + WINED3DSPR_STREAM, }; enum wined3d_data_type @@ -619,6 +620,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DSY_FINE, WINED3DSIH_ELSE, WINED3DSIH_EMIT, + WINED3DSIH_EMIT_STREAM, WINED3DSIH_ENDIF, WINED3DSIH_ENDLOOP, WINED3DSIH_ENDREP,

1 0

Józef Kucia : d3d11/tests: Avoid using -1 in place of unsigned integer.
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: 0aa14512fb4126c45ca32ce2df93cef3d642ef33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa14512fb4126c45ca32ce2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:23 2016 +0200 d3d11/tests: Avoid using -1 in place of unsigned integer. 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 | 258 +++++++++++++++++++++++------------------------ 1 file changed, 129 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aa14512fb4126c45ca32…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetBlendState().
by Alexandre Julliard July 4, 2016

July 4, 2016

Module: wine Branch: master Commit: fd4f1d9c48f10ca7b08f850ba395d7b4c56e6ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4f1d9c48f10ca7b08f850ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:20 2016 +0200 d3d11: Implement d3d11_immediate_context_OMGetBlendState(). 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/d3d11_private.h | 5 +++++ dlls/d3d11/device.c | 25 ++++++++++++++++++------- dlls/d3d11/state.c | 5 ----- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index bd43aa6..0dee4a1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -359,6 +359,11 @@ struct d3d_blend_state ID3D11Device *device; }; +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); +} + HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 03fafc6..867b294 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1655,8 +1655,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor %p, sample_mask %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); + + if ((*blend_state = device->blend_state ? &device->blend_state->ID3D11BlendState_iface : NULL)) + ID3D11BlendState_AddRef(*blend_state); + wined3d_mutex_lock(); + memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); + *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, @@ -4063,16 +4072,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { struct d3d_device *device = impl_from_ID3D10Device(iface); + ID3D11BlendState *d3d11_blend_state; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); - if ((*blend_state = device->blend_state ? (ID3D10BlendState *)&device->blend_state->ID3D10BlendState1_iface : NULL)) - ID3D10BlendState_AddRef(*blend_state); - wined3d_mutex_lock(); - memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); - *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); - wined3d_mutex_unlock(); + d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, + &d3d11_blend_state, blend_factor, sample_mask); + + if (d3d11_blend_state) + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + else + *blend_state = NULL; } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 665d142..ba90664 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -26,11 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11BlendState methods */ -static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, REFIID riid, void **object) {

1 0