February 2017 - Wine-Commits

Józef Kucia : wined3d: Handle compute shader registers in GLSL backend.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: dc56f7b17a2dc61222df3282c950d3b2f4340c3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc56f7b17a2dc61222df3282c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:39 2017 +0100 wined3d: Handle compute shader 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 | 23 ++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d8e8202..aebf96a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2840,6 +2840,22 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * sprintf(register_name, "X%u[%u]", reg->idx[0].offset, reg->idx[1].offset); break; + case WINED3DSPR_LOCALTHREADINDEX: + sprintf(register_name, "int(gl_LocalInvocationIndex)"); + break; + + case WINED3DSPR_THREADID: + sprintf(register_name, "ivec3(gl_GlobalInvocationID)"); + break; + + case WINED3DSPR_THREADGROUPID: + sprintf(register_name, "ivec3(gl_WorkGroupID)"); + break; + + case WINED3DSPR_LOCALTHREADID: + sprintf(register_name, "ivec3(gl_LocalInvocationID)"); + break; + default: FIXME("Unhandled register type %#x.\n", reg->type); sprintf(register_name, "unrecognized_register"); @@ -2928,7 +2944,12 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio shader_glsl_get_register_name(&wined3d_src->reg, glsl_src->reg_name, &is_color, ins); shader_glsl_get_swizzle(wined3d_src, is_color, mask, swizzle_str); - if (wined3d_src->reg.type == WINED3DSPR_IMMCONST || wined3d_src->reg.type == WINED3DSPR_PRIMID) + if (wined3d_src->reg.type == WINED3DSPR_IMMCONST + || wined3d_src->reg.type == WINED3DSPR_PRIMID + || wined3d_src->reg.type == WINED3DSPR_LOCALTHREADINDEX + || wined3d_src->reg.type == WINED3DSPR_THREADID + || wined3d_src->reg.type == WINED3DSPR_THREADGROUPID + || wined3d_src->reg.type == WINED3DSPR_LOCALTHREADID) { shader_glsl_gen_modifier(wined3d_src->modifiers, glsl_src->reg_name, swizzle_str, glsl_src->param_str); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 43d80d2..2ea6763 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3596,6 +3596,7 @@ static inline BOOL shader_is_scalar(const struct wined3d_shader_register *reg) case WINED3DSPR_LOOP: /* aL */ case WINED3DSPR_PREDICATE: /* p0 */ case WINED3DSPR_PRIMID: /* primID */ + case WINED3DSPR_LOCALTHREADINDEX: /* vThreadIDInGroupFlattened */ return TRUE; case WINED3DSPR_MISCTYPE:

1 0

Jacek Caban : mshtml: Renamed unk_imp to outer_unk.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 2fb4de7b5e72e859160e5aceb4443e3d46917c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb4de7b5e72e859160e5aceb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 2 16:09:52 2017 +0100 mshtml: Renamed unk_imp to outer_unk. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b409e7d..f0b203e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4576,7 +4576,7 @@ static const cpc_entry_t HTMLDocument_cpc[] = { {NULL} }; -static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) +static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) { doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl; doc->IHTMLDocument3_iface.lpVtbl = &HTMLDocument3Vtbl; @@ -4589,7 +4589,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl; - doc->unk_impl = unk_impl; + doc->outer_unk = outer; doc->dispex = dispex; doc->task_magic = get_task_target_magic(); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a559ea..a18ddafe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -577,7 +577,7 @@ struct HTMLDocument { IObjectSafety IObjectSafety_iface; IProvideClassInfo IProvideClassInfo_iface; - IUnknown *unk_impl; + IUnknown *outer_unk; IDispatchEx *dispex; HTMLDocumentObj *doc_obj; @@ -593,17 +593,17 @@ struct HTMLDocument { static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) { - return IUnknown_QueryInterface(This->unk_impl, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); } static inline ULONG htmldoc_addref(HTMLDocument *This) { - return IUnknown_AddRef(This->unk_impl); + return IUnknown_AddRef(This->outer_unk); } static inline ULONG htmldoc_release(HTMLDocument *This) { - return IUnknown_Release(This->unk_impl); + return IUnknown_Release(This->outer_unk); } struct HTMLDocumentObj {

1 0

Aric Stewart : loader: Start winebus service by default.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 45d82a2464b535c484b0a6e96f9851f9db573edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d82a2464b535c484b0a6e96… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 2 10:38:55 2017 -0600 loader: Start winebus service by default. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 3f723be..9a55b38 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3255,7 +3255,7 @@ DisplayName="Platform Bus Kernel" ServiceBinary="%12%\winebus.sys" LoadOrderGroup="WinePlugPlay" ServiceType=1 -StartType=3 +StartType=2 ErrorControl=1 [WineHIDService]

1 0

Józef Kucia : d3d11/tests: Add tests showing that views do not keep resource reference.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 0ce7d71c4657d7537b9e571d89eb1122d953448d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce7d71c4657d7537b9e571d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:35 2017 +0100 d3d11/tests: Add tests showing that views do not keep resource reference. 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 | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 758075a..f83e764 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2751,8 +2751,11 @@ static void test_create_depthstencil_view(void) get_dsv_desc(current_desc, &tests[i].dsv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11DepthStencilView_QueryInterface(dsview, &IID_ID3D10DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3112,8 +3115,11 @@ static void test_create_rendertarget_view(void) get_rtv_desc(current_desc, &tests[i].rtv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11RenderTargetView_QueryInterface(rtview, &IID_ID3D10RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -3468,8 +3474,11 @@ static void test_create_shader_resource_view(void) get_srv_desc(current_desc, &tests[i].srv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D11ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -8143,6 +8152,7 @@ static void test_swapchain_views(void) ID3D11DeviceContext *context; ID3D11RenderTargetView *rtv; ID3D11Device *device; + ULONG refcount; HRESULT hr; static const struct vec4 color = {0.2f, 0.3f, 0.5f, 1.0f}; @@ -8153,6 +8163,9 @@ static void test_swapchain_views(void) device = test_context.device; context = test_context.immediate_context; + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); check_texture_color(test_context.backbuffer, 0xff7f4c33, 1); @@ -8163,6 +8176,9 @@ static void test_swapchain_views(void) ok(SUCCEEDED(hr), "Failed to create render target view, hr %#x.\n", hr); ID3D11DeviceContext_OMSetRenderTargets(context, 1, &rtv, NULL); + refcount = get_refcount((IUnknown *)test_context.backbuffer); + todo_wine ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + draw_color_quad(&test_context, &color); todo_wine check_texture_color(test_context.backbuffer, 0xffbc957c, 1); @@ -10376,8 +10392,11 @@ static void test_create_unordered_access_view(void) get_uav_desc(current_desc, &tests[i].uav_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D11Device_CreateUnorderedAccessView(device, texture, current_desc, &uav); ok(SUCCEEDED(hr), "Test %u: Failed to create unordered access view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + todo_wine ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); memset(&uav_desc, 0, sizeof(uav_desc)); ID3D11UnorderedAccessView_GetDesc(uav, &uav_desc);

1 0

Aric Stewart : hidclass.sys: IOCTL_HID_GET_INPUT_REPORT has report ID as first byte.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 1ccb1719cb33c15c7a25854e9fdeef376104a6ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccb1719cb33c15c7a25854e9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Feb 2 10:35:55 2017 -0600 hidclass.sys: IOCTL_HID_GET_INPUT_REPORT has report ID as first byte. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/tests/device.c | 1 + dlls/hidclass.sys/device.c | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/hid/tests/device.c b/dlls/hid/tests/device.c index ff47e30..91fade4 100644 --- a/dlls/hid/tests/device.c +++ b/dlls/hid/tests/device.c @@ -356,6 +356,7 @@ static void test_get_input_report(void) if (rc) { + ok(data[0] == 0, "Report ID (0) is not the first byte of the data\n"); report[0] = 0; for (i = 0; i < Caps.InputReportByteLength && i < Caps.InputReportByteLength; i++) { diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index ff9655e..40d458a 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -584,19 +584,30 @@ NTSTATUS WINAPI HID_Device_ioctl(DEVICE_OBJECT *device, IRP *irp) } case IOCTL_HID_GET_INPUT_REPORT: { - HID_XFER_PACKET packet; + HID_XFER_PACKET *packet; + UINT packet_size = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); + ULONG out_length; + + packet = HeapAlloc(GetProcessHeap(), 0, packet_size); if (extension->preparseData->InputReports[0].reportID) - packet.reportId = buffer[0]; + packet->reportId = buffer[0]; else - packet.reportId = 0; - packet.reportBuffer = buffer; - packet.reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + packet->reportId = 0; + packet->reportBuffer = (BYTE *)packet + sizeof(*packet); + packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength - 1; - call_minidriver(IOCTL_HID_GET_INPUT_REPORT, device, NULL, 0, &packet, sizeof(packet)); - irp->IoStatus.Information = packet.reportBufferLen; - irp->IoStatus.u.Status = STATUS_SUCCESS; + rc = call_minidriver(IOCTL_HID_GET_INPUT_REPORT, device, NULL, 0, packet, sizeof(*packet)); + if (rc == STATUS_SUCCESS) + { + rc = copy_packet_into_buffer(packet, buffer, irpsp->Parameters.DeviceIoControl.OutputBufferLength, &out_length); + irp->IoStatus.Information = out_length; + } + else + irp->IoStatus.Information = 0; + irp->IoStatus.u.Status = rc; + HeapFree(GetProcessHeap(), 0, packet); break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS:

1 0

Alexandre Julliard : ole32: Don't set zero-size clipboard data, this no longer works.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 77e566a3cbd0341ffeff7e8b7f42369622ac240a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e566a3cbd0341ffeff7e8b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 2 18:51:10 2017 +0100 ole32: Don't set zero-size clipboard data, this no longer works. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index e3c93c9..b547cdf 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1110,7 +1110,7 @@ static HRESULT get_current_dataobject(IDataObject **data) h = GetClipboardData(wine_marshal_clipboard_format); if(!h) return S_FALSE; - if(GlobalSize(h) == 0) return S_FALSE; + if(GlobalSize(h) <= 1) return S_FALSE; ptr = GlobalLock(h); if(!ptr) return S_FALSE; @@ -1957,7 +1957,7 @@ static HRESULT expose_marshalled_dataobject(ole_clipbrd *clipbrd, IDataObject *d dup_global_mem(h_stm, GMEM_DDESHARE|GMEM_MOVEABLE, &h); } else /* flushed */ - h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 0); + h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 1); if(!h) return E_OUTOFMEMORY;

1 0

Józef Kucia : wined3d: Introduce shader_select_compute() in shader_backend_ops.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 3e0037e31a5a07c3a35bd0ee01caec4be6f4f14a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e0037e31a5a07c3a35bd0ee0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:41 2017 +0100 wined3d: Introduce shader_select_compute() in shader_backend_ops. 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 | 6 ++++++ dlls/wined3d/glsl_shader.c | 8 ++++++++ dlls/wined3d/shader.c | 3 +++ dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 19 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d433f8c..7fc97b5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4698,6 +4698,11 @@ static void shader_arb_select(void *shader_priv, struct wined3d_context *context } } +static void shader_arb_select_compute(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + ERR("Compute pipeline not supported by the ARB shader backend.\n"); +} /* Context activation is done by the caller. */ static void shader_arb_disable(void *shader_priv, struct wined3d_context *context) @@ -5659,6 +5664,7 @@ const struct wined3d_shader_backend_ops arb_program_shader_backend = { shader_arb_handle_instruction, shader_arb_select, + shader_arb_select_compute, shader_arb_disable, shader_arb_update_float_vertex_constants, shader_arb_update_float_pixel_constants, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index aebf96a..2df308e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8497,6 +8497,13 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex } } +/* Context activation is done by the caller. */ +static void shader_glsl_select_compute(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) +{ + FIXME("Compute pipeline not supported yet.\n"); +} + /* "context" is not necessarily the currently active context. */ static void shader_glsl_invalidate_current_program(struct wined3d_context *context) { @@ -9152,6 +9159,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = { shader_glsl_handle_instruction, shader_glsl_select, + shader_glsl_select_compute, shader_glsl_disable, shader_glsl_update_float_vertex_constants, shader_glsl_update_float_pixel_constants, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 0368ae1..00ed452 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2665,6 +2665,8 @@ struct shader_none_priv }; static void shader_none_handle_instruction(const struct wined3d_shader_instruction *ins) {} +static void shader_none_select_compute(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state) {} static void shader_none_update_float_vertex_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) {} static void shader_none_load_constants(void *shader_priv, struct wined3d_context *context, @@ -2786,6 +2788,7 @@ const struct wined3d_shader_backend_ops none_shader_backend = { shader_none_handle_instruction, shader_none_select, + shader_none_select_compute, shader_none_disable, shader_none_update_float_vertex_constants, shader_none_update_float_pixel_constants, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b70bad..7209ce8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1208,6 +1208,8 @@ struct wined3d_shader_backend_ops void (*shader_handle_instruction)(const struct wined3d_shader_instruction *); void (*shader_select)(void *shader_priv, struct wined3d_context *context, const struct wined3d_state *state); + void (*shader_select_compute)(void *shader_priv, struct wined3d_context *context, + const struct wined3d_state *state); void (*shader_disable)(void *shader_priv, struct wined3d_context *context); void (*shader_update_float_vertex_constants)(struct wined3d_device *device, UINT start, UINT count); void (*shader_update_float_pixel_constants)(struct wined3d_device *device, UINT start, UINT count);

1 0

Józef Kucia : d3d10core/tests: Add tests showing that views do not keep resource reference.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 27d8c4d2ccf0355b429ab292263bd5c131c5f529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27d8c4d2ccf0355b429ab2922… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:37 2017 +0100 d3d10core/tests: Add tests showing that views do not keep resource reference. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 2d5115f..7d75487 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1962,8 +1962,11 @@ static void test_create_depthstencil_view(void) get_dsv_desc(current_desc, &tests[i].dsv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, current_desc, &dsview); ok(SUCCEEDED(hr), "Test %u: Failed to create depth stencil view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10DepthStencilView_QueryInterface(dsview, &IID_ID3D11DepthStencilView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -2322,8 +2325,11 @@ static void test_create_rendertarget_view(void) get_rtv_desc(current_desc, &tests[i].rtv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D10Device_CreateRenderTargetView(device, texture, current_desc, &rtview); ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10RenderTargetView_QueryInterface(rtview, &IID_ID3D11RenderTargetView, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -2737,8 +2743,11 @@ static void test_create_shader_resource_view(void) get_srv_desc(current_desc, &tests[i].srv_desc); } + expected_refcount = get_refcount((IUnknown *)texture); hr = ID3D10Device_CreateShaderResourceView(device, texture, current_desc, &srview); ok(SUCCEEDED(hr), "Test %u: Failed to create a shader resource view, hr %#x.\n", i, hr); + refcount = get_refcount((IUnknown *)texture); + ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount); hr = ID3D10ShaderResourceView_QueryInterface(srview, &IID_ID3D10ShaderResourceView1, (void **)&iface); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, @@ -7815,6 +7824,7 @@ static void test_swapchain_views(void) ID3D10ShaderResourceView *srv; ID3D10RenderTargetView *rtv; ID3D10Device *device; + ULONG refcount; HRESULT hr; if (!init_test_context(&test_context)) @@ -7822,6 +7832,9 @@ static void test_swapchain_views(void) device = test_context.device; + refcount = get_refcount((IUnknown *)test_context.backbuffer); + ok(refcount == 1, "Got refcount %u.\n", refcount); + rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; rtv_desc.ViewDimension = D3D10_RTV_DIMENSION_TEXTURE2D; U(rtv_desc).Texture2D.MipSlice = 0;

1 0

Józef Kucia : wined3d: Add ARB_compute_shader extension.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: 5061abe43707db20d7dcfe94a2c63be6f3718401 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5061abe43707db20d7dcfe94a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 2 12:43:38 2017 +0100 wined3d: Add ARB_compute_shader extension. 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/directx.c | 12 ++++++++++++ dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 54f1cc7..c47052c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -113,6 +113,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, {"GL_ARB_color_buffer_float", ARB_COLOR_BUFFER_FLOAT }, + {"GL_ARB_compute_shader", ARB_COMPUTE_SHADER }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, @@ -2633,6 +2634,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glClipControl) /* GL_ARB_color_buffer_float */ USE_GL_FUNC(glClampColorARB) + /* GL_ARB_compute_shader */ + USE_GL_FUNC(glDispatchCompute) + USE_GL_FUNC(glDispatchComputeIndirect) /* GL_ARB_copy_buffer */ USE_GL_FUNC(glCopyBufferSubData) /* GL_ARB_debug_output */ @@ -3557,6 +3561,13 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_PIXEL], gl_max); } } + if (gl_info->supported[ARB_COMPUTE_SHADER]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_UNIFORM_BLOCKS, &gl_max); + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE] = min(gl_max, WINED3D_MAX_CBS); + TRACE("Max compute uniform blocks: %u (%d).\n", + gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_COMPUTE], gl_max); + } if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMBINED_UNIFORM_BLOCKS, &gl_max); @@ -3674,6 +3685,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_TEXTURE_COMPRESSION_BPTC, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_STORAGE, MAKEDWORD_VERSION(4, 2)}, + {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f0c19fc..d8e8202 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8801,6 +8801,7 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s * soon as we introduce them, adjusting the GL / GLSL version checks * accordingly. */ if (gl_info->glsl_version >= MAKEDWORD_VERSION(4, 30) && gl_info->supported[WINED3D_GL_VERSION_4_3] + && gl_info->supported[ARB_COMPUTE_SHADER] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_GPU_SHADER5] && gl_info->supported[ARB_SHADER_IMAGE_LOAD_STORE] diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 88da05a..5f57a41 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -46,6 +46,7 @@ enum wined3d_gl_extension ARB_BLEND_FUNC_EXTENDED, ARB_CLIP_CONTROL, ARB_COLOR_BUFFER_FLOAT, + ARB_COMPUTE_SHADER, ARB_COPY_BUFFER, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT,

1 0

Matteo Bruni : wined3d: Query supported geometry shader uniform buffers count on core profile.
by Alexandre Julliard Feb. 2, 2017

Feb. 2, 2017

Module: wine Branch: master Commit: ab9cc273311168e416a364e2eed438e1d72d9926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9cc273311168e416a364e2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Feb 2 01:04:07 2017 +0100 wined3d: Query supported geometry shader uniform buffers count on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d8e518ebd..54f1cc7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3532,7 +3532,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_VERTEX], gl_max); } } - if (gl_info->supported[ARB_GEOMETRY_SHADER4] && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) + if ((!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] || gl_info->supported[ARB_GEOMETRY_SHADER4]) + && gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_GEOMETRY_UNIFORM_BLOCKS, &gl_max); gl_info->limits.uniform_blocks[WINED3D_SHADER_TYPE_GEOMETRY] = min(gl_max, WINED3D_MAX_CBS);

1 0