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

Henri Verbeet : wined3d: Simplify checking if the released resource is in use as a rendertarget in device_resource_released ().
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 4a9304305ae2940288e9382926a6931dd46982d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9304305ae2940288e938292… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:33 2016 +0200 wined3d: Simplify checking if the released resource is in use as a rendertarget in device_resource_released(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cd392b3..8fe1da3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4970,37 +4970,24 @@ static void device_resource_remove(struct wined3d_device *device, struct wined3d void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) { enum wined3d_resource_type type = resource->type; + struct wined3d_rendertarget_view *rtv; unsigned int i; TRACE("device %p, resource %p, type %s.\n", device, resource, debug_d3dresourcetype(type)); context_resource_released(device, resource, type); - switch (type) + for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) { - case WINED3D_RTYPE_SURFACE: - { - struct wined3d_surface *surface = surface_from_resource(resource); - - if (!device->d3d_initialized) break; - - for (i = 0; i < device->adapter->gl_info.limits.buffers; ++i) - { - if (wined3d_rendertarget_view_get_surface(device->fb.render_targets[i]) == surface) - { - ERR("Surface %p is still in use as render target %u.\n", surface, i); - device->fb.render_targets[i] = NULL; - } - } + if ((rtv = device->fb.render_targets[i]) && rtv->resource == resource) + ERR("Resource %p is still in use as render target %u.\n", resource, i); + } - if (wined3d_rendertarget_view_get_surface(device->fb.depth_stencil) == surface) - { - ERR("Surface %p is still in use as depth/stencil buffer.\n", surface); - device->fb.depth_stencil = NULL; - } - } - break; + if ((rtv = device->fb.depth_stencil) && rtv->resource == resource) + ERR("Resource %p is still in use as depth/stencil buffer.\n", resource); + switch (type) + { case WINED3D_RTYPE_TEXTURE_2D: case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i)

1 0

Józef Kucia : wined3d: Recognize SM5 hs_fork_phase opcode.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 87bef12eed127869c2300daf31ca6fec5c3a8448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bef12eed127869c2300daf3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:56 2016 +0200 wined3d: Recognize SM5 hs_fork_phase 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 | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1dcb23f..379c1f7 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_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, + /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f5f70b..89249f4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8168,6 +8168,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, + /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f617bcd..3e76592 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -100,6 +100,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_DECLS */ "hs_decls", + /* WINED3DSIH_HS_FORK_PHASE */ "hs_fork_phase", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 502de7c..e00ea9b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -185,6 +185,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM5_OP_HS_DECLS = 0x71, + WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, @@ -398,6 +399,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, + {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index daa52ab..3c3e27c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOU, WINED3DSIH_GE, WINED3DSIH_HS_DECLS, + WINED3DSIH_HS_FORK_PHASE, WINED3DSIH_IADD, WINED3DSIH_IEQ, WINED3DSIH_IF,

1 0

Józef Kucia : wined3d: Recognize SM5 hs_decls opcode.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: ba0041a938d8eaf697b28407ad5f471276547657 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba0041a938d8eaf697b28407a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:55 2016 +0200 wined3d: Recognize SM5 hs_decls 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 | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index c32d64d..1dcb23f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5273,6 +5273,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_FTOI */ NULL, /* WINED3DSIH_FTOU */ NULL, /* WINED3DSIH_GE */ NULL, + /* WINED3DSIH_HS_DECLS */ NULL, /* WINED3DSIH_IADD */ NULL, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2fdcd9e..6f5f70b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8167,6 +8167,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_FTOI */ shader_glsl_to_int, /* WINED3DSIH_FTOU */ shader_glsl_to_uint, /* WINED3DSIH_GE */ shader_glsl_relop, + /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, /* WINED3DSIH_IADD */ shader_glsl_binop, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4baa72a..f617bcd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -99,6 +99,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_FTOI */ "ftoi", /* WINED3DSIH_FTOU */ "ftou", /* WINED3DSIH_GE */ "ge", + /* WINED3DSIH_HS_DECLS */ "hs_decls", /* WINED3DSIH_IADD */ "iadd", /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 5c5a2a4..502de7c 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -184,6 +184,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, + WINED3D_SM5_OP_HS_DECLS = 0x71, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, @@ -396,6 +397,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DCL_OUTPUT_SIV, WINED3DSIH_DCL_OUTPUT_SIV, "", ""}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", ""}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", ""}, + {WINED3D_SM5_OP_HS_DECLS, WINED3DSIH_HS_DECLS, "", ""}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7bb4e09..daa52ab 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -555,6 +555,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_FTOI, WINED3DSIH_FTOU, WINED3DSIH_GE, + WINED3DSIH_HS_DECLS, WINED3DSIH_IADD, WINED3DSIH_IEQ, WINED3DSIH_IF,

1 0

Józef Kucia : d3d11: Implement private data methods for immediate ID3D11DeviceContext.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 88c5ddaae79a2965dcc9b33c69d7387d623e3e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88c5ddaae79a2965dcc9b33c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:51 2016 +0200 d3d11: Implement private data methods for immediate ID3D11DeviceContext. 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 | 2 ++ dlls/d3d11/device.c | 34 +++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 80a16f3..655bae5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -385,6 +385,8 @@ struct d3d11_immediate_context { ID3D11DeviceContext ID3D11DeviceContext_iface; LONG refcount; + + struct wined3d_private_store private_store; }; /* ID3D11Device, ID3D10Device1 */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 5498c8b..e1bfb70 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -109,25 +109,31 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_GetDevice(ID3D11DeviceCont static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_GetPrivateData(ID3D11DeviceContext *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&context->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateData(ID3D11DeviceContext *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&context->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_immediate_context_SetPrivateDataInterface(ID3D11DeviceContext *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&context->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_immediate_context_VSSetConstantBuffers(ID3D11DeviceContext *iface, @@ -1919,14 +1925,19 @@ static const struct ID3D11DeviceContextVtbl d3d11_immediate_context_vtbl = d3d11_immediate_context_FinishCommandList, }; -static HRESULT d3d11_immediate_context_init(struct d3d11_immediate_context *context, struct d3d_device *device) +static void d3d11_immediate_context_init(struct d3d11_immediate_context *context, struct d3d_device *device) { context->ID3D11DeviceContext_iface.lpVtbl = &d3d11_immediate_context_vtbl; context->refcount = 1; ID3D11Device_AddRef(&device->ID3D11Device_iface); - return S_OK; + wined3d_private_store_init(&context->private_store); +} + +static void d3d11_immediate_context_destroy(struct d3d11_immediate_context *context) +{ + wined3d_private_store_cleanup(&context->private_store); } /* ID3D11Device methods */ @@ -2777,6 +2788,7 @@ static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) if (!refcount) { + d3d11_immediate_context_destroy(&device->immediate_context); if (device->wined3d_device) { wined3d_mutex_lock(); @@ -5110,11 +5122,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) /* COM aggregation always takes place */ device->outer_unk = outer_unknown; - if (FAILED(d3d11_immediate_context_init(&device->immediate_context, device))) - { - WARN("Failed to initialize immediate device context.\n"); - return E_FAIL; - } + d3d11_immediate_context_init(&device->immediate_context, device); ID3D11DeviceContext_Release(&device->immediate_context.ID3D11DeviceContext_iface); if (wine_rb_init(&device->blend_states, &d3d_blend_state_rb_ops) == -1)

1 0

Henri Verbeet : wined3d: Validate the sub-resource index in wined3d_rendertarget_view_init().
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 33d49ecd76e36053138552008f2389575698c5d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d49ecd76e36053138552008… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 29 16:45:34 2016 +0200 wined3d: Validate the sub-resource index in wined3d_rendertarget_view_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 36 +++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 5 +---- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 8d4f7fd..29b370f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -60,18 +60,16 @@ void * CDECL wined3d_rendertarget_view_get_parent(const struct wined3d_rendertar void * CDECL wined3d_rendertarget_view_get_sub_resource_parent(const struct wined3d_rendertarget_view *view) { - struct wined3d_resource *sub_resource; + struct wined3d_texture *texture; TRACE("view %p.\n", view); if (view->resource->type == WINED3D_RTYPE_BUFFER) return wined3d_buffer_get_parent(buffer_from_resource(view->resource)); - if (!(sub_resource = wined3d_texture_get_sub_resource(wined3d_texture_from_resource(view->resource), - view->sub_resource_idx))) - return NULL; + texture = wined3d_texture_from_resource(view->resource); - return wined3d_resource_get_parent(sub_resource); + return wined3d_resource_get_parent(texture->sub_resources[view->sub_resource_idx].resource); } void CDECL wined3d_rendertarget_view_set_parent(struct wined3d_rendertarget_view *view, void *parent) @@ -88,15 +86,13 @@ struct wined3d_resource * CDECL wined3d_rendertarget_view_get_resource(const str return view->resource; } -static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, +static HRESULT wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *view, const struct wined3d_rendertarget_view_desc *desc, struct wined3d_resource *resource, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; view->refcount = 1; - view->resource = resource; - wined3d_resource_incref(resource); view->parent = parent; view->parent_ops = parent_ops; @@ -113,16 +109,20 @@ static void wined3d_rendertarget_view_init(struct wined3d_rendertarget_view *vie else { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); - struct wined3d_resource *sub_resource; + if (desc->u.texture.level_idx >= texture->level_count + || desc->u.texture.layer_idx >= texture->layer_count + || desc->u.texture.layer_count > texture->layer_count - desc->u.texture.layer_idx) + return WINED3DERR_INVALIDCALL; view->sub_resource_idx = desc->u.texture.layer_idx * texture->level_count + desc->u.texture.level_idx; - sub_resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx); - view->buffer_offset = 0; - view->width = sub_resource->width; - view->height = sub_resource->height; + view->width = wined3d_texture_get_level_width(texture, desc->u.texture.level_idx); + view->height = wined3d_texture_get_level_height(texture, desc->u.texture.level_idx); view->depth = desc->u.texture.layer_count; } + wined3d_resource_incref(view->resource = resource); + + return WINED3D_OK; } HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget_view_desc *desc, @@ -130,6 +130,7 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget struct wined3d_rendertarget_view **view) { struct wined3d_rendertarget_view *object; + HRESULT hr; TRACE("desc %p, resource %p, parent %p, parent_ops %p, view %p.\n", desc, resource, parent, parent_ops, view); @@ -137,12 +138,17 @@ HRESULT CDECL wined3d_rendertarget_view_create(const struct wined3d_rendertarget if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - wined3d_rendertarget_view_init(object, desc, resource, parent, parent_ops); + if (FAILED(hr = wined3d_rendertarget_view_init(object, desc, resource, parent, parent_ops))) + { + HeapFree(GetProcessHeap(), 0, object); + WARN("Failed to initialise view, hr %#x.\n", hr); + return hr; + } TRACE("Created render target view %p.\n", object); *view = object; - return WINED3D_OK; + return hr; } HRESULT CDECL wined3d_rendertarget_view_create_from_sub_resource(struct wined3d_texture *texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5beea4a..a9ad85c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2958,17 +2958,14 @@ struct wined3d_rendertarget_view static inline struct wined3d_surface *wined3d_rendertarget_view_get_surface( const struct wined3d_rendertarget_view *view) { - struct wined3d_resource *resource; struct wined3d_texture *texture; if (!view || view->resource->type != WINED3D_RTYPE_TEXTURE_2D) return NULL; texture = wined3d_texture_from_resource(view->resource); - if (!(resource = wined3d_texture_get_sub_resource(texture, view->sub_resource_idx))) - return NULL; - return surface_from_resource(resource); + return texture->sub_resources[view->sub_resource_idx].u.surface; } struct wined3d_shader_resource_view

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_output_control_point_count opcode.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: 5367c0d2b4276471323d04e27e4d4ecc924ae0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5367c0d2b4276471323d04e27… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:58 2016 +0200 wined3d: Recognize SM5 dcl_output_control_point_count 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 | 309 ++++++++++++++++++------------------- dlls/wined3d/glsl_shader.c | 309 ++++++++++++++++++------------------- dlls/wined3d/shader.c | 312 +++++++++++++++++++------------------- dlls/wined3d/shader_sm4.c | 197 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 568 insertions(+), 560 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5367c0d2b4276471323d0…

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_input_control_point_count opcode.
by Alexandre Julliard March 30, 2016

March 30, 2016

Module: wine Branch: master Commit: cee0c36444ef9c9e8be6c51821ad73e2a269b677 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee0c36444ef9c9e8be6c5182… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 29 12:14:57 2016 +0200 wined3d: Recognize SM5 dcl_input_control_point_count 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 | 4 +++- dlls/wined3d/shader_sm4.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 379c1f7..8fd90cf 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5232,6 +5232,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, + /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, /* WINED3DSIH_DCL_INPUT_PS */ NULL, /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 89249f4..382a9ca 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8126,6 +8126,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, + /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_PS */ NULL, /* WINED3DSIH_DCL_INPUT_PS_SGV */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3e76592..1bb587f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -58,6 +58,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", /* WINED3DSIH_DCL_INPUT */ "dcl_input", + /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", /* WINED3DSIH_DCL_INPUT_PS */ "dcl_input_ps", /* WINED3DSIH_DCL_INPUT_PS_SGV */ "dcl_input_ps_sgv", @@ -2061,7 +2062,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, ", comparisonMode"); } else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS - || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) + || ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT + || ins.handler_idx == WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT) { shader_addline(&buffer, "%s %u", shader_opcode_names[ins.handler_idx], ins.declaration.count); } diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index e00ea9b..a19fd21 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -61,6 +61,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_GLOBAL_FLAGS_SHIFT 11 #define WINED3D_SM4_GLOBAL_FLAGS_MASK (0xffu << WINED3D_SM4_GLOBAL_FLAGS_SHIFT) +#define WINED3D_SM5_CPOINT_COUNT_SHIFT 11 +#define WINED3D_SM5_CPOINT_COUNT_MASK (0xffu << WINED3D_SM5_CPOINT_COUNT_SHIFT) + #define WINED3D_SM4_OPCODE_MASK 0xff #define WINED3D_SM4_REGISTER_MODIFIER (0x1u << 31) @@ -190,6 +193,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, @@ -404,6 +408,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, + {WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", ""}, {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, @@ -1022,6 +1027,10 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->declaration.primitive_type = output_primitive_type_table[primitive_type]; } } + else if (opcode == WINED3D_SM5_OP_DCL_INPUT_CPOINT_COUNT) + { + ins->declaration.count = (opcode_token & WINED3D_SM5_CPOINT_COUNT_MASK) >> WINED3D_SM5_CPOINT_COUNT_SHIFT; + } else if (opcode == WINED3D_SM4_OP_DCL_INPUT_PRIMITIVE) { enum wined3d_sm4_input_primitive_type primitive_type; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3c3e27c..5c58b80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -514,6 +514,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, WINED3DSIH_DCL_INPUT, + WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_PRIMITIVE, WINED3DSIH_DCL_INPUT_PS, WINED3DSIH_DCL_INPUT_PS_SGV,

1 0

Francois Gouget : testbot/TestAgent: Unify support for the old and new Wait RPCs.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: tools Branch: master Commit: 9166e2c95096d81c14e25c4ceaeadd5c8f6e4baf URL: http://source.winehq.org/git/tools.git/?a=commit;h=9166e2c95096d81c14e25c4c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 28 04:00:22 2016 +0200 testbot/TestAgent: Unify support for the old and new Wait RPCs. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 76 ++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index f255e0f..43481a9 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1184,46 +1184,38 @@ sub Wait($$$;$) debug("Wait $Pid, ", defined $Timeout ? $Timeout : "<undef>", ", ", defined $Keepalive ? $Keepalive : "<undef>", "\n"); - # Make sure we have the server version - return undef if (!$self->{agentversion} and !$self->_Connect()); + my $Result; + $Keepalive ||= 0xffffffff; + my $OldTimeout = $self->{timeout}; - my ($OldTimeout, $Result); - if ($self->{agentversion} =~ / 1\.0$/) + my $Deadline = $Timeout ? time() + $Timeout : undef; + while (1) { - # Add a 5 second leeway to take into account network transmission delays - $OldTimeout = $self->SetTimeout($Timeout + 5) if ($Timeout); - - # Send the command - if (!$self->_StartRPC($RPC_WAIT) or - !$self->_SendListSize('ArgC', 1) or - !$self->_SendUInt64('Pid', $Pid)) + my $Remaining = $Keepalive; + if ($Deadline) { - last; + $Remaining = $Deadline - time(); + last if ($Remaining < 0); + $Remaining = $Keepalive if ($Keepalive < $Remaining); } + # Add a 5 second leeway to take into account network transmission delays + $self->SetTimeout($Remaining + 5); - # Get the reply - $Result = $self->_RecvList('I'); - } - else - { - $Keepalive ||= 0xffffffff; - $OldTimeout = $self->{timeout}; + # Make sure we have the server version + last if (!$self->{agentversion} and !$self->_Connect()); - my $Deadline; - $Deadline = time() + $Timeout if ($Timeout); - while (1) + # Send the command + if ($self->{agentversion} =~ / 1\.0$/) { - my $Remaining = $Keepalive; - if ($Deadline) + if (!$self->_StartRPC($RPC_WAIT) or + !$self->_SendListSize('ArgC', 1) or + !$self->_SendUInt64('Pid', $Pid)) { - $Remaining = $Deadline - time(); - last if ($Remaining < 0); - $Remaining = $Keepalive if ($Keepalive < $Remaining); + last; } - # Add a 5 second leeway to take into account network transmission delays - $self->SetTimeout($Remaining + 5); - - # Send the command + } + else + { if (!$self->_StartRPC($RPC_WAIT2) or !$self->_SendListSize('ArgC', 2) or !$self->_SendUInt64('Pid', $Pid) or @@ -1231,20 +1223,20 @@ sub Wait($$$;$) { last; } + } - # Get the reply - $Result = $self->_RecvList('I'); + # Get the reply + $Result = $self->_RecvList('I'); - # The process has quit - last if (defined $Result); + # The process has quit + last if (defined $Result); - # The only 'error' we should be getting here is the TestAgent server - # telling us it timed out waiting for the process. However flaky network - # connections like to break while we're waiting for the reply. So retry - # if that happens and let the automatic reconnection detect real network - # issues. - last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); - } + # The only 'error' we should be getting here is the TestAgent server + # telling us it timed out waiting for the process. However flaky network + # connections like to break while we're waiting for the reply. So retry + # if that happens and let the automatic reconnection detect real network + # issues. + last if ($self->{err} !~ /(?:timed out waiting|network read timed out)/); } $self->SetTimeout($OldTimeout); return $Result;

1 0

Iván Matellanes : msvcirt: Avoid superfluous comparison in some compilers.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 885273414601caf68bea4415604f02d1f7aca0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=885273414601caf68bea44156… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Mon Mar 28 11:19:08 2016 +0100 msvcirt: Avoid superfluous comparison in some compilers. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 09f488a..19c26fd 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -1383,7 +1383,7 @@ streampos __thiscall strstreambuf_seekoff(strstreambuf *this, streamoff offset, TRACE("(%p %d %d %d)\n", this, offset, dir, mode); - if (dir < SEEKDIR_beg || dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) + if ((unsigned int)dir > SEEKDIR_end || !(mode & (OPENMODE_in|OPENMODE_out))) return EOF; /* read buffer */ if (mode & OPENMODE_in) {

1 0

Hugh McMaster : regedit: Display REG_DWORD_BIG_ENDIAN values.
by Alexandre Julliard March 29, 2016

March 29, 2016

Module: wine Branch: master Commit: 32714ee4472a2395a5b4d7005ceac8ea3772a601 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32714ee4472a2395a5b4d7005… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Mar 29 21:56:20 2016 +1100 regedit: Display REG_DWORD_BIG_ENDIAN values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index c0119ff..a305aa4 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -20,6 +20,7 @@ */ #include <windows.h> +#include <winternl.h> #include <commctrl.h> #include <stdlib.h> #include <stdio.h> @@ -167,10 +168,14 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, ListView_SetItemTextW(hwndLV, index, 2, g_szValueNotSet); } break; - case REG_DWORD: { + case REG_DWORD: + case REG_DWORD_BIG_ENDIAN: { + DWORD value = *(DWORD*)ValBuf; WCHAR buf[64]; WCHAR format[] = {'0','x','%','0','8','x',' ','(','%','u',')',0}; - wsprintfW(buf, format, *(DWORD*)ValBuf, *(DWORD*)ValBuf); + if (dwValType == REG_DWORD_BIG_ENDIAN) + value = RtlUlongByteSwap(value); + wsprintfW(buf, format, value, value); ListView_SetItemTextW(hwndLV, index, 2, buf); } break;

1 0