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

Henri Verbeet : wined3d: Include the base vertex index in WINED3D_CS_OP_DRAW.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 9c1fbe509576d7cbaada3af9736888cfa1d02847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c1fbe509576d7cbaada3af97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:44 2016 +0200 wined3d: Include the base vertex index in WINED3D_CS_OP_DRAW. Ideally we'd just remove the base vertex index from the wined3d_state structure, but it's included in d3d8 stateblocks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 18 ++++++++++-------- dlls/wined3d/device.c | 9 +++++---- dlls/wined3d/drawprim.c | 30 +++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 34 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c1fbe509576d7cbaada3…

1 0

Henri Verbeet : wined3d: Don't bother with glGetError() if we have ARB_DEBUG_OUTPUT.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: a1bc5b8c975799ee1d4281cdd83279cc196db79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1bc5b8c975799ee1d4281cdd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:43 2016 +0200 wined3d: Don't bother with glGetError() if we have ARB_DEBUG_OUTPUT. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 19 +++++++++++++++++++ dlls/wined3d/drawprim.c | 1 + dlls/wined3d/wined3d_private.h | 17 ++++++----------- 3 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 04265d0..ae82a82 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1550,6 +1550,25 @@ static void bind_dummy_textures(const struct wined3d_device *device, const struc } } +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name) +{ + GLint err; + + if (gl_info->supported[ARB_DEBUG_OUTPUT] || (err = gl_info->gl_ops.gl.p_glGetError()) == GL_NO_ERROR) + { + TRACE("%s call ok %s / %u.\n", name, file, line); + return; + } + + do + { + ERR(">>>>>>> %s (%#x) from %s @ %s / %u.\n", + debug_glerror(err), err, name, file,line); + err = gl_info->gl_ops.gl.p_glGetError(); + } while (err != GL_NO_ERROR); +} + static BOOL context_debug_output_enabled(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_DEBUG_OUTPUT] diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2b58def..5a9e084 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); +WINE_DECLARE_DEBUG_CHANNEL(d3d); #include <stdio.h> #include <math.h> diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 04dd160..f6f6bb3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1130,22 +1130,17 @@ static inline void wined3d_color_from_d3dcolor(struct wined3d_color *wined3d_col #define HIGHEST_TRANSFORMSTATE WINED3D_TS_WORLD_MATRIX(255) /* Highest value in wined3d_transform_state. */ +void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, + const char *file, unsigned int line, const char *name) DECLSPEC_HIDDEN; + /* Checking of API calls */ /* --------------------- */ #ifndef WINE_NO_DEBUG_MSGS #define checkGLcall(A) \ do { \ - GLint err; \ - if (!__WINE_IS_DEBUG_ON(_ERR, __wine_dbch___default)) break; \ - err = gl_info->gl_ops.gl.p_glGetError(); \ - if (err == GL_NO_ERROR) { \ - TRACE("%s call ok %s / %d\n", A, __FILE__, __LINE__); \ - \ - } else do { \ - ERR(">>>>>>>>>>>>>>>>> %s (%#x) from %s @ %s / %d\n", \ - debug_glerror(err), err, A, __FILE__, __LINE__); \ - err = gl_info->gl_ops.gl.p_glGetError(); \ - } while (err != GL_NO_ERROR); \ + if (__WINE_IS_DEBUG_ON(_ERR, &__wine_dbch_d3d) \ + && !gl_info->supported[ARB_DEBUG_OUTPUT]) \ + wined3d_check_gl_call(gl_info, __FILE__, __LINE__, A); \ } while(0) #else #define checkGLcall(A) do {} while(0)

1 0

Hans Leidekker : webservices: Implement WsMoveWriter.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 768197795df9b4c24e7252cfc91e36e527d84799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768197795df9b4c24e7252cfc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:46 2016 +0200 webservices: Implement WsMoveWriter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 151 +++++++++++++++++++-------------- dlls/webservices/tests/writer.c | 71 ++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 13 +++ dlls/webservices/writer.c | 87 +++++++++++++++++++ 5 files changed, 258 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=768197795df9b4c24e725…

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: f5c8f697250e0956257fdf66cb35990481e3fdbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c8f697250e0956257fdf66c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:45 2016 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 451cfad..a5ffd51 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -73,6 +73,7 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; +typedef struct _WS_XML_NODE_POSITION WS_XML_NODE_POSITION; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -1266,6 +1267,16 @@ struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT void *state; }; +typedef enum +{ + WS_RECEIVE_REQUIRED_MESSAGE = 1, + WS_RECEIVE_OPTIONAL_MESSAGE = 2 +} WS_RECEIVE_OPTION; + +typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) + (void*); + +HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, WS_HEAP*, const WS_CALL_PROPERTY*, const ULONG, const WS_ASYNC_CONTEXT*, @@ -1273,6 +1284,7 @@ HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const HRESULT WINAPI WsCloseChannel(WS_CHANNEL*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCloseServiceProxy(WS_SERVICE_PROXY*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCombineUrl(const WS_STRING*, const WS_STRING*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); +HRESULT WINAPI WsCopyNode(WS_XML_WRITER*, WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsCreateChannel(WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY*, ULONG, const WS_SECURITY_DESCRIPTION*, WS_CHANNEL**, WS_ERROR*); HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); @@ -1321,6 +1333,7 @@ HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERR HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetServiceProxyProperty(WS_SERVICE_PROXY*, const WS_PROXY_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetWriterPosition(WS_XML_WRITER*, WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); @@ -1344,10 +1357,20 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, + WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, + const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); +HRESULT WINAPI WsRequestReply(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, + WS_READ_OPTION, WS_HEAP*, void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsSendReplyMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, + WS_WRITE_OPTION, const void*, ULONG, WS_MESSAGE*, + const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, @@ -1359,15 +1382,21 @@ HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetReaderPosition(WS_XML_READER*, const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsSetWriterPosition(WS_XML_WRITER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, + ULONG, WS_ERROR*); HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndCData(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEnvelopeEnd(WS_MESSAGE*, WS_ERROR*); +HRESULT WINAPI WsWriteEnvelopeStart(WS_MESSAGE*, WS_XML_WRITER*, WS_MESSAGE_DONE_CALLBACK, void*, WS_ERROR*); HRESULT WINAPI WsWriteMessageStart(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteMessageEnd(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*,

1 0

Hans Leidekker : webservices: Insert an end element for self-closing tags in the writer.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: d8c8b9a9bd56883ab7d66759aa79f1bd5845545a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c8b9a9bd56883ab7d66759a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:41 2016 +0200 webservices: Insert an end element for self-closing tags in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 80 ++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ecbba37..fc7292f 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -119,15 +119,15 @@ static void write_insert_bof( struct writer *writer, struct node *bof ) writer->current = writer->root = bof; } -static void write_insert_node( struct writer *writer, struct node *node ) +static void write_insert_node( struct writer *writer, struct node *parent, struct node *node ) { - node->parent = writer->current; - if (writer->current == writer->root) + node->parent = parent; + if (node->parent == writer->root) { struct list *eof = list_tail( &writer->root->children ); list_add_before( eof, &node->entry ); } - else list_add_tail( &writer->current->children, &node->entry ); + else list_add_tail( &parent->children, &node->entry ); writer->current = node; } @@ -568,19 +568,9 @@ static HRESULT write_startelement( struct writer *writer ) return S_OK; } -static struct node *write_find_parent_element( struct writer *writer ) +static HRESULT write_endelement( struct writer *writer, struct node *parent ) { - struct node *node = writer->current; - - if (node_type( node ) == WS_XML_NODE_TYPE_ELEMENT) return node; - if (node_type( node->parent ) == WS_XML_NODE_TYPE_ELEMENT) return node->parent; - return NULL; -} - -static HRESULT write_endelement( struct writer *writer ) -{ - struct node *node = write_find_parent_element( writer ); - WS_XML_ELEMENT_NODE *elem = &node->hdr; + WS_XML_ELEMENT_NODE *elem = &parent->hdr; ULONG size; HRESULT hr; @@ -697,41 +687,53 @@ HRESULT WINAPI WsWriteEndAttribute( WS_XML_WRITER *handle, WS_ERROR *error ) return S_OK; } +static struct node *write_find_start_element( struct writer *writer ) +{ + struct node *node = writer->current, *child; + struct list *ptr; + + for (node = writer->current; node; node = node->parent) + { + if (node_type( node ) != WS_XML_NODE_TYPE_ELEMENT) continue; + + if (!(ptr = list_tail( &node->children ))) return node; + child = LIST_ENTRY( ptr, struct node, entry ); + if (node_type( child ) != WS_XML_NODE_TYPE_END_ELEMENT) return node; + } + return NULL; +} + static HRESULT write_close_element( struct writer *writer ) { + struct node *node, *parent; HRESULT hr; + if (!(parent = write_find_start_element( writer ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + if (writer->state == WRITER_STATE_STARTELEMENT) { /* '/>' */ - if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; - if ((hr = write_startelement( writer )) != S_OK) return hr; - if ((hr = write_grow_buffer( writer, 2 )) != S_OK) return hr; + if ((hr = write_set_element_namespace( writer )) != S_OK) goto error; + if ((hr = write_startelement( writer )) != S_OK) goto error; + if ((hr = write_grow_buffer( writer, 2 )) != S_OK) goto error; write_char( writer, '/' ); write_char( writer, '>' ); - - writer->current = writer->current->parent; - writer->state = WRITER_STATE_STARTENDELEMENT; - return S_OK; + writer->state = WRITER_STATE_STARTENDELEMENT; } else { - struct node *node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ); - if (!node) return E_OUTOFMEMORY; - /* '</prefix:localname>' */ - if ((hr = write_endelement( writer )) != S_OK) - { - free_node( node ); - return hr; - } - - write_insert_node( writer, node ); - writer->current = node->parent; - writer->state = WRITER_STATE_ENDELEMENT; - return S_OK; + if ((hr = write_endelement( writer, parent )) != S_OK) goto error; + writer->state = WRITER_STATE_ENDELEMENT; } - return WS_E_INVALID_OPERATION; + + write_insert_node( writer, parent, node ); + return S_OK; + +error: + free_node( node ); + return hr; } /************************************************************************** @@ -905,7 +907,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN free_node( node ); return E_OUTOFMEMORY; } - write_insert_node( writer, node ); + write_insert_node( writer, writer->current, node ); writer->state = WRITER_STATE_STARTELEMENT; return S_OK; } @@ -1060,7 +1062,7 @@ static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) text = (WS_XML_TEXT_NODE *)node; text->text = value; - write_insert_node( writer, node ); + write_insert_node( writer, writer->current, node ); writer->state = WRITER_STATE_TEXT; return S_OK; }

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_thread_group opcode.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 0c83f4d5bec8b01e1e6dcbb0a9a9932b6c24570b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c83f4d5bec8b01e1e6dcbb0a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:10:02 2016 +0200 wined3d: Recognize SM5 dcl_thread_group 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 | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 7 +++++++ 5 files changed, 29 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 62102b2..00cc495 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5250,6 +5250,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9223bf0..bb2beb4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8588,6 +8588,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ NULL, /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, + /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 729a137..8f3e145 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -80,6 +80,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_TESSELLATOR_DOMAIN */ "dcl_tessellator_domain", /* WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE */ "dcl_tessellator_output_primitive", /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ "dcl_tessellator_partitioning", + /* WINED3DSIH_DCL_THREAD_GROUP */ "dcl_thread_group", /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", @@ -2267,6 +2268,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); shader_dump_tessellator_partitioning(&buffer, ins.declaration.tessellator_partitioning); } + else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) + { + shader_addline(&buffer, "%s %u, %u, %u", shader_opcode_names[ins.handler_idx], + ins.declaration.thread_group_size.x, + ins.declaration.thread_group_size.y, + ins.declaration.thread_group_size.z); + } else if (ins.handler_idx == WINED3DSIH_DEF) { shader_addline(&buffer, "def c%u = %.8e, %.8e, %.8e, %.8e", shader_get_float_offset(ins.dst[0].reg.type, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f56f976..6e224f6 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -219,6 +219,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_TESSELLATOR_OUTPUT_PRIMITIVE = 0x97, WINED3D_SM5_OP_DCL_HS_MAX_TESSFACTOR = 0x98, WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, + WINED3D_SM5_OP_DCL_THREAD_GROUP = 0x9b, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, @@ -617,6 +618,15 @@ static void shader_sm5_read_dcl_hs_max_tessfactor(struct wined3d_shader_instruct ins->declaration.max_tessellation_factor = *(float *)tokens; } +static void shader_sm5_read_dcl_thread_group(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->declaration.thread_group_size.x = *tokens++; + ins->declaration.thread_group_size.y = *tokens++; + ins->declaration.thread_group_size.z = *tokens++; +} + static void shader_sm5_read_dcl_resource_structured(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -773,6 +783,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm5_read_dcl_hs_max_tessfactor}, {WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, "", "", shader_sm4_read_declaration_count}, + {WINED3D_SM5_OP_DCL_THREAD_GROUP, WINED3DSIH_DCL_THREAD_GROUP, "", "", + shader_sm5_read_dcl_thread_group}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", "", shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b44b2fa..78cbe24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -593,6 +593,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_TESSELLATOR_DOMAIN, WINED3DSIH_DCL_TESSELLATOR_OUTPUT_PRIMITIVE, WINED3DSIH_DCL_TESSELLATOR_PARTITIONING, + WINED3DSIH_DCL_THREAD_GROUP, WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, @@ -911,6 +912,11 @@ struct wined3d_shader_structured_resource unsigned int byte_stride; }; +struct wined3d_shader_thread_group_size +{ + unsigned int x, y, z; +}; + struct wined3d_shader_texel_offset { signed char u, v, w; @@ -938,6 +944,7 @@ struct wined3d_shader_instruction UINT count; const struct wined3d_shader_immediate_constant_buffer *icb; struct wined3d_shader_structured_resource structured_resource; + struct wined3d_shader_thread_group_size thread_group_size; enum wined3d_tessellator_domain tessellator_domain; enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning;

1 0

Józef Kucia : d3d11: Implement ID3D11ComputeShader interface.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: e1a44a96b7bd135ecc3ccf2cab935e3c3711433e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a44a96b7bd135ecc3ccf2ca… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:58 2016 +0200 d3d11: Implement ID3D11ComputeShader interface. 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 | 14 ++++ dlls/d3d11/device.c | 16 +++- dlls/d3d11/shader.c | 184 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 77079bd..bd43aa6 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -317,6 +317,20 @@ HRESULT d3d_pixel_shader_create(struct d3d_device *device, const void *byte_code struct d3d_pixel_shader *unsafe_impl_from_ID3D11PixelShader(ID3D11PixelShader *iface) DECLSPEC_HIDDEN; struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *iface) DECLSPEC_HIDDEN; +/* ID3D11ComputeShader */ +struct d3d11_compute_shader +{ + ID3D11ComputeShader ID3D11ComputeShader_iface; + LONG refcount; + + struct wined3d_private_store private_store; + struct wined3d_shader *wined3d_shader; + ID3D11Device *device; +}; + +HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_compute_shader **shader) DECLSPEC_HIDDEN; + HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 843639a..0fc8eb5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2235,10 +2235,22 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDomainShader(ID3D11Device *i static HRESULT STDMETHODCALLTYPE d3d11_device_CreateComputeShader(ID3D11Device *iface, const void *byte_code, SIZE_T byte_code_length, ID3D11ClassLinkage *class_linkage, ID3D11ComputeShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p stub!\n", + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d11_compute_shader *object; + HRESULT hr; + + TRACE("iface %p, byte_code %p, byte_code_length %lu, class_linkage %p, shader %p.\n", iface, byte_code, byte_code_length, class_linkage, shader); - return E_NOTIMPL; + if (class_linkage) + FIXME("Class linkage is not implemented yet.\n"); + + if (FAILED(hr = d3d11_compute_shader_create(device, byte_code, byte_code_length, &object))) + return hr; + + *shader = &object->ID3D11ComputeShader_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateClassLinkage(ID3D11Device *iface, diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index b1c4f28..9f618e4 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1500,6 +1500,190 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i return impl_from_ID3D10PixelShader(iface); } +/* ID3D11ComputeShader methods */ + +static inline struct d3d11_compute_shader *impl_from_ID3D11ComputeShader(ID3D11ComputeShader *iface) +{ + return CONTAINING_RECORD(iface, struct d3d11_compute_shader, ID3D11ComputeShader_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_QueryInterface(ID3D11ComputeShader *iface, + REFIID riid, void **object) +{ + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + if (IsEqualGUID(riid, &IID_ID3D11ComputeShader) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) + || IsEqualGUID(riid, &IID_IUnknown)) + { + ID3D11ComputeShader_AddRef(*object = iface); + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d11_compute_shader_AddRef(ID3D11ComputeShader *iface) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + ULONG refcount = InterlockedIncrement(&shader->refcount); + + TRACE("%p increasing refcount to %u.\n", shader, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d11_compute_shader_Release(ID3D11ComputeShader *iface) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + ULONG refcount = InterlockedDecrement(&shader->refcount); + + TRACE("%p decreasing refcount to %u.\n", shader, refcount); + + if (!refcount) + { + ID3D11Device *device = shader->device; + + wined3d_mutex_lock(); + wined3d_shader_decref(shader->wined3d_shader); + wined3d_mutex_unlock(); + + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D11Device_Release(device); + } + + return refcount; +} + +static void STDMETHODCALLTYPE d3d11_compute_shader_GetDevice(ID3D11ComputeShader *iface, + ID3D11Device **device) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + ID3D11Device_AddRef(*device = shader->device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_GetPrivateData(ID3D11ComputeShader *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_SetPrivateData(ID3D11ComputeShader *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&shader->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_compute_shader_SetPrivateDataInterface(ID3D11ComputeShader *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d11_compute_shader *shader = impl_from_ID3D11ComputeShader(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&shader->private_store, guid, data); +} + +static const struct ID3D11ComputeShaderVtbl d3d11_compute_shader_vtbl = +{ + /* IUnknown methods */ + d3d11_compute_shader_QueryInterface, + d3d11_compute_shader_AddRef, + d3d11_compute_shader_Release, + /* ID3D11DeviceChild methods */ + d3d11_compute_shader_GetDevice, + d3d11_compute_shader_GetPrivateData, + d3d11_compute_shader_SetPrivateData, + d3d11_compute_shader_SetPrivateDataInterface, +}; + +static void STDMETHODCALLTYPE d3d11_compute_shader_wined3d_object_destroyed(void *parent) +{ + struct d3d11_compute_shader *shader = parent; + + wined3d_private_store_cleanup(&shader->private_store); + HeapFree(GetProcessHeap(), 0, parent); +} + +static const struct wined3d_parent_ops d3d11_compute_shader_wined3d_parent_ops = +{ + d3d11_compute_shader_wined3d_object_destroyed, +}; + +static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, struct d3d_device *device, + const void *byte_code, SIZE_T byte_code_length) +{ + struct wined3d_shader_desc desc; + HRESULT hr; + + shader->ID3D11ComputeShader_iface.lpVtbl = &d3d11_compute_shader_vtbl; + shader->refcount = 1; + wined3d_mutex_lock(); + wined3d_private_store_init(&shader->private_store); + + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + { + WARN("Failed to extract shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return hr; + } + desc.max_version = d3d_sm_from_feature_level(device->feature_level); + + hr = wined3d_shader_create_cs(device->wined3d_device, &desc, shader, + &d3d11_compute_shader_wined3d_parent_ops, &shader->wined3d_shader); + shader_free_signature(&desc.input_signature); + shader_free_signature(&desc.output_signature); + if (FAILED(hr)) + { + WARN("Failed to create wined3d compute shader, hr %#x.\n", hr); + wined3d_private_store_cleanup(&shader->private_store); + wined3d_mutex_unlock(); + return E_INVALIDARG; + } + wined3d_mutex_unlock(); + + ID3D11Device_AddRef(shader->device = &device->ID3D11Device_iface); + + return S_OK; +} + +HRESULT d3d11_compute_shader_create(struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length, + struct d3d11_compute_shader **shader) +{ + struct d3d11_compute_shader *object; + HRESULT hr; + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d11_compute_shader_init(object, device, byte_code, byte_code_length))) + { + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created compute shader %p.\n", object); + *shader = object; + + return S_OK; +} + /* ID3D11ClassLinkage methods */ static inline struct d3d11_class_linkage *impl_from_ID3D11ClassLinkage(ID3D11ClassLinkage *iface)

1 0

Józef Kucia : wined3d: Introduce wined3d_shader_create_cs().
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 061aa115b0bd34a65dfd10e03404b30d23545d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=061aa115b0bd34a65dfd10e03… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jun 21 13:09:57 2016 +0200 wined3d: Introduce wined3d_shader_create_cs(). 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.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/shader_sm4.c | 4 ++++ dlls/wined3d/wined3d.spec | 1 + dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.h | 2 ++ 5 files changed, 47 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d0f6eeb..f7ecda3 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -353,6 +353,7 @@ static const struct wined3d_shader_frontend *shader_select_frontend(DWORD versio case WINED3D_SM4_GS: case WINED3D_SM5_HS: case WINED3D_SM5_DS: + case WINED3D_SM5_CS: return &sm4_shader_frontend; default: @@ -3263,6 +3264,44 @@ void pixelshader_update_resource_types(struct wined3d_shader *shader, WORD tex_t } } +static HRESULT compute_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, + const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) +{ + HRESULT hr; + + if (FAILED(hr = shader_init(shader, device, desc, 0, WINED3D_SHADER_TYPE_COMPUTE, parent, parent_ops))) + return hr; + + shader->load_local_constsF = shader->lconst_inf_or_nan; + + return WINED3D_OK; +} + +HRESULT CDECL wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) +{ + struct wined3d_shader *object; + HRESULT hr; + + TRACE("device %p, desc %p, parent %p, parent_ops %p, shader %p.\n", + device, desc, parent, parent_ops, shader); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = compute_shader_init(object, device, desc, parent, parent_ops))) + { + WARN("Failed to initialize compute shader, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created compute shader %p.\n", object); + *shader = object; + + return WINED3D_OK; +} + HRESULT CDECL wined3d_shader_create_ds(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 18d345b..893c331 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -980,6 +980,10 @@ static void shader_sm4_read_header(void *data, const DWORD **ptr, struct wined3d priv->shader_version.type = WINED3D_SHADER_TYPE_DOMAIN; break; + case WINED3D_SM5_CS: + priv->shader_version.type = WINED3D_SHADER_TYPE_COMPUTE; + break; + default: FIXME("Unrecognized shader type %#x.\n", version_token >> 16); } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 0a00290..8d1d8dc 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -200,6 +200,7 @@ @ cdecl wined3d_sampler_get_parent(ptr) @ cdecl wined3d_sampler_incref(ptr) +@ cdecl wined3d_shader_create_cs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_ds(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_gs(ptr ptr ptr ptr ptr) @ cdecl wined3d_shader_create_hs(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3b1d911..d573cfc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -513,6 +513,7 @@ enum wined3d_shader_conditional_op #define WINED3D_SM4_GS 0x0002u #define WINED3D_SM5_HS 0x0003u #define WINED3D_SM5_DS 0x0004u +#define WINED3D_SM5_CS 0x0005u /* Shader version tokens, and shader end tokens */ #define WINED3DPS_VERSION(major, minor) ((WINED3D_SM1_PS << 16) | ((major) << 8) | (minor)) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 5ca03d7..9becd6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2426,6 +2426,8 @@ ULONG __cdecl wined3d_sampler_decref(struct wined3d_sampler *sampler); void * __cdecl wined3d_sampler_get_parent(const struct wined3d_sampler *sampler); ULONG __cdecl wined3d_sampler_incref(struct wined3d_sampler *sampler); +HRESULT __cdecl wined3d_shader_create_cs(struct wined3d_device *device, const struct wined3d_shader_desc *desc, + void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_ds(struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_shader **shader); HRESULT __cdecl wined3d_shader_create_gs(struct wined3d_device *device, const struct wined3d_shader_desc *desc,

1 0

Henri Verbeet : wined3d: Send shader resource view destruction through the command stream.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 8a8b57ce3d0cde8c4ff2f1a0ab06f0e975124671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8b57ce3d0cde8c4ff2f1a0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 21 10:32:46 2016 +0200 wined3d: Send shader resource view destruction through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/view.c | 34 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bbd5c0d..46f623a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -52,6 +52,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_COLOR_KEY, WINED3D_CS_OP_SET_MATERIAL, WINED3D_CS_OP_RESET_STATE, + WINED3D_CS_OP_DESTROY_OBJECT, }; struct wined3d_cs_present @@ -252,6 +253,13 @@ struct wined3d_cs_reset_state enum wined3d_cs_op opcode; }; +struct wined3d_cs_destroy_object +{ + enum wined3d_cs_op opcode; + void (*callback)(void *object); + void *object; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -1029,6 +1037,25 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) cs->ops->submit(cs); } +static void wined3d_cs_exec_destroy_object(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_destroy_object *op = data; + + op->callback(op->object); +} + +void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) +{ + struct wined3d_cs_destroy_object *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_DESTROY_OBJECT; + op->callback = callback; + op->object = object; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -1057,6 +1084,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_COLOR_KEY */ wined3d_cs_exec_set_color_key, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, + /* WINED3D_CS_OP_DESTROY_OBJECT */ wined3d_cs_exec_destroy_object, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 52e3f1e..329a0bb 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -194,6 +194,25 @@ ULONG CDECL wined3d_shader_resource_view_incref(struct wined3d_shader_resource_v return refcount; } +static void wined3d_shader_resource_view_destroy_object(void *object) +{ + struct wined3d_shader_resource_view *view = object; + + if (view->object) + { + const struct wined3d_gl_info *gl_info; + struct wined3d_context *context; + + context = context_acquire(view->resource->device, NULL); + gl_info = context->gl_info; + gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); + checkGLcall("glDeleteTextures"); + context_release(context); + } + + HeapFree(GetProcessHeap(), 0, view); +} + ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_view *view) { ULONG refcount = InterlockedDecrement(&view->refcount); @@ -202,22 +221,13 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { - if (view->object) - { - const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; - - context = context_acquire(view->resource->device, NULL); - gl_info = context->gl_info; - gl_info->gl_ops.gl.p_glDeleteTextures(1, &view->object); - checkGLcall("glDeleteTextures"); - context_release(context); - } + struct wined3d_device *device = view->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); - HeapFree(GetProcessHeap(), 0, view); + wined3d_cs_emit_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); } return refcount; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76425e0..43714a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2916,6 +2916,8 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_clear(struct wined3d_cs *cs, DWORD rect_count, const RECT *rects, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_destroy_object(struct wined3d_cs *cs, + void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, unsigned int start_instance, unsigned int instance_count, BOOL indexed) DECLSPEC_HIDDEN; void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain,

1 0

Jacek Caban : mshtml: Added IHTMLDocument2::put_domain implementation.
by Alexandre Julliard June 21, 2016

June 21, 2016

Module: wine Branch: master Commit: 22eab07811225e19357ab91505187bbf20b3ba0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=22eab07811225e19357ab9150… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 15:12:25 2016 +0200 mshtml: Added IHTMLDocument2::put_domain implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 38 ++++++++++++++++++++++++++++++-------- dlls/mshtml/tests/htmldoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index eadb90b..352b757 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -795,24 +795,46 @@ static HRESULT WINAPI HTMLDocument_get_URL(IHTMLDocument2 *iface, BSTR *p) static HRESULT WINAPI HTMLDocument_put_domain(IHTMLDocument2 *iface, BSTR v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString nsstr; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + nsAString_InitDepend(&nsstr, v); + nsres = nsIDOMHTMLDocument_SetDomain(This->doc_node->nsdoc, &nsstr); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) { + ERR("SetDomain failed: %08x\n", nsres); + return E_INVALIDARG; + } + + return S_OK; } static HRESULT WINAPI HTMLDocument_get_domain(IHTMLDocument2 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - HRESULT hres; + nsAString nsstr; + nsresult nsres; TRACE("(%p)->(%p)\n", This, p); - if(!This->window || !This->window->uri) { - FIXME("No current URI\n"); - return E_FAIL; + nsAString_Init(&nsstr, NULL); + nsres = nsIDOMHTMLDocument_GetDomain(This->doc_node->nsdoc, &nsstr); + if(NS_SUCCEEDED(nsres) && This->window && This->window->uri) { + const PRUnichar *str; + HRESULT hres; + + nsAString_GetData(&nsstr, &str); + if(!*str) { + TRACE("Gecko returned emptry string, fallback to loaded URL.\n"); + nsAString_Finish(&nsstr); + hres = IUri_GetHost(This->window->uri, p); + return FAILED(hres) ? hres : S_OK; + } } - hres = IUri_GetHost(This->window->uri, p); - return FAILED(hres) ? hres : S_OK; + return return_nsstr(nsres, &nsstr, p); } static HRESULT WINAPI HTMLDocument_put_cookie(IHTMLDocument2 *iface, BSTR v) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 5079dc9..90d5b41 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -971,6 +971,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D case 1014: CHECK_EXPECT2(OnChanged_1014); return S_OK; + case 1029: case 1030: case 3000022: case 3000023: @@ -7681,6 +7682,37 @@ static void test_cookies(IHTMLDocument2 *doc) SysFreeString(str2); } +static void test_doc_domain(IHTMLDocument2 *doc) +{ + BSTR str; + HRESULT hres; + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "test.winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("winehq.org"); + hres = IHTMLDocument2_put_domain(doc, str); + ok(hres == S_OK, "put_domain failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr("winehq.com"); + hres = IHTMLDocument2_put_domain(doc, str); + ok(hres == E_INVALIDARG, "put_domain failed: %08x, expected E_INVALIDARG\n", hres); + SysFreeString(str); + + hres = IHTMLDocument2_get_domain(doc, &str); + ok(hres == S_OK, "get_domain failed: %08x\n", hres); + ok(!strcmp_wa(str, "winehq.org"), "domain = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + static void test_HTMLDocument_http(BOOL with_wbapp) { IMoniker *http_mon; @@ -7718,6 +7750,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_GetCurMoniker((IUnknown*)doc, http_mon, NULL, FALSE); test_travellog(doc); test_binding_ui((IUnknown*)doc); + test_doc_domain(doc); nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) {

1 0