wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Jacek Caban : user32: Allow creating windows using null driver for invisible winstations.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: af4294a9af1b5b9f9ee7f3fa7561b6ade6e5ac05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4294a9af1b5b9f9ee7f3fa7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:12:58 2017 +0100 user32: Allow creating windows using null driver for invisible winstations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index c4cbb8a..d59a2ea 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -39,6 +39,8 @@ static USER_DRIVER null_driver, lazy_load_driver; const USER_DRIVER *USER_Driver = &lazy_load_driver; static char driver_load_error[80]; +static BOOL CDECL nodrv_CreateWindow( HWND hwnd ); + static HMODULE load_desktop_driver( HWND hwnd ) { static const WCHAR display_device_guid_propW[] = { @@ -152,6 +154,16 @@ static const USER_DRIVER *load_driver(void) GET_USER_FUNC(ThreadDetach); #undef GET_USER_FUNC } + else + { + USEROBJECTFLAGS flags; + HWINSTA winstation; + + winstation = GetProcessWindowStation(); + if (!GetUserObjectInformationA(winstation, UOI_FLAGS, &flags, sizeof(flags), NULL) + || (flags.dwFlags & WSF_VISIBLE)) + driver->pCreateWindow = nodrv_CreateWindow; + } prev = InterlockedCompareExchangePointer( (void **)&USER_Driver, driver, &lazy_load_driver ); if (prev != &lazy_load_driver) @@ -360,7 +372,7 @@ static BOOL CDECL nulldrv_CreateDesktopWindow( HWND hwnd ) return TRUE; } -static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) +static BOOL CDECL nodrv_CreateWindow( HWND hwnd ) { static int warned; HWND parent = GetAncestor( hwnd, GA_PARENT ); @@ -374,6 +386,11 @@ static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) return FALSE; } +static BOOL CDECL nulldrv_CreateWindow( HWND hwnd ) +{ + return TRUE; +} + static void CDECL nulldrv_DestroyWindow( HWND hwnd ) { }

1 0

Nikolay Sivov : riched20: Return proper interface pointers.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 440b92131f6c7173b3bdcef71a6fb0796f729a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440b92131f6c7173b3bdcef71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 16:17:15 2017 +0300 riched20: Return proper interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/clipboard.c | 4 ++-- dlls/riched20/tests/txtsrv.c | 2 +- dlls/riched20/txthost.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index d4560db..578fb02 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -66,7 +66,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -183,7 +183,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4be3106..73ca7cd 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -99,7 +99,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, ITextHostTestImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index b99c933..0e51ecf 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -76,7 +76,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, REFIID riid ITextHostImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; }

1 0

Huw Davies : wbemdisp: Implement ISWbemObjectSet::ItemIndex.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 61f0bda129d24bdae6bec8e64f8f4fcc7203e4ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f0bda129d24bdae6bec8e64… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 9 12:03:04 2017 +0000 wbemdisp: Implement ISWbemObjectSet::ItemIndex. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemdisp/locator.c | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/wbemdisp/locator.c b/dlls/wbemdisp/locator.c index fece94f..4a67942 100644 --- a/dlls/wbemdisp/locator.c +++ b/dlls/wbemdisp/locator.c @@ -538,8 +538,39 @@ static HRESULT WINAPI objectset_ItemIndex( LONG lIndex, ISWbemObject **objWbemObject ) { - FIXME( "\n" ); - return E_NOTIMPL; + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count; + HRESULT hr; + IEnumVARIANT *enum_var; + VARIANT var; + + TRACE( "%p, %d, %p\n", objectset, lIndex, objWbemObject ); + + *objWbemObject = NULL; + hr = ISWbemObjectSet_get_Count( iface, &count ); + if (FAILED(hr)) return hr; + + if (lIndex >= count) return WBEM_E_NOT_FOUND; + + hr = ISWbemObjectSet_get__NewEnum( iface, (IUnknown **)&enum_var ); + if (FAILED(hr)) return hr; + + IEnumVARIANT_Reset( enum_var ); + hr = IEnumVARIANT_Skip( enum_var, lIndex ); + if (SUCCEEDED(hr)) + hr = IEnumVARIANT_Next( enum_var, 1, &var, NULL ); + IEnumVARIANT_Release( enum_var ); + + if (SUCCEEDED(hr)) + { + if (V_VT( &var ) == VT_DISPATCH) + hr = IDispatch_QueryInterface( V_DISPATCH( &var ), &IID_ISWbemObject, (void **)objWbemObject ); + else + hr = WBEM_E_NOT_FOUND; + VariantClear( &var ); + } + + return hr; } static const ISWbemObjectSetVtbl objectset_vtbl =

1 0

Józef Kucia : wined3d: Merge WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW and WINED3D_CS_OP_SET_COMPUTE_UAV.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 572aa0e0ea3ac020308ee0766ad956cc4651b70f URL: http://source.winehq.org/git/wine.git/?a=commit;h=572aa0e0ea3ac020308ee0766… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:36 2017 +0100 wined3d: Merge WINED3D_CS_OP_SET_UNORDERED_ACCESS_VIEW and WINED3D_CS_OP_SET_COMPUTE_UAV. 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/context.c | 6 +++-- dlls/wined3d/cs.c | 51 +++++++++--------------------------------- dlls/wined3d/device.c | 40 ++++++++++++--------------------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/stateblock.c | 16 ++++++------- dlls/wined3d/utils.c | 4 ++-- dlls/wined3d/wined3d_private.h | 24 ++++++++++++-------- 7 files changed, 55 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=572aa0e0ea3ac020308ee…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_Dispatch().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: cb51abec90d723dd0ae2784f91903b3ceb7e3028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb51abec90d723dd0ae2784f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:35 2017 +0100 d3d11: Implement d3d11_immediate_context_Dispatch(). 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/device.c | 9 ++++++++- dlls/d3d11/tests/d3d11.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 167fd78..731a0e1 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -859,8 +859,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DrawInstancedIndirect(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_Dispatch(ID3D11DeviceContext *iface, UINT thread_group_count_x, UINT thread_group_count_y, UINT thread_group_count_z) { - FIXME("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, thread_group_count_x %u, thread_group_count_y %u, thread_group_count_z %u.\n", iface, thread_group_count_x, thread_group_count_y, thread_group_count_z); + + wined3d_mutex_lock(); + wined3d_device_dispatch_compute(device->wined3d_device, + thread_group_count_x, thread_group_count_y, thread_group_count_z); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DispatchIndirect(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index da5b02c..eec7ff5 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12536,12 +12536,12 @@ static void test_cs_uav_store(void) ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 1.0f, 2); + check_texture_float(texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 0.5f, 2); + check_texture_float(texture, 0.5f, 2); ID3D11ComputeShader_Release(cs); @@ -12549,19 +12549,19 @@ static void test_cs_uav_store(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_CSSetShader(context, NULL, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 0.5f, 2); + check_texture_float(texture, 0.5f, 2); hr = ID3D11Device_CreateComputeShader(device, cs_1_group_code, sizeof(cs_1_group_code), NULL, &cs); ok(SUCCEEDED(hr), "Failed to create compute shader, hr %#x.\n", hr); ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 2.0f, 2); + check_texture_float(texture, 2.0f, 2); input.x = 4.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 4.0f, 2); + check_texture_float(texture, 4.0f, 2); ID3D11ComputeShader_Release(cs); @@ -12572,17 +12572,17 @@ static void test_cs_uav_store(void) input.x = 1.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, texture_desc.Width, texture_desc.Height, 1); - todo_wine check_texture_float(texture, 1.0f, 2); + check_texture_float(texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 16, 32, 1); SetRect(&rect, 0, 0, 16, 32); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 0.5f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 0.5f, 2); SetRect(&rect, 0, 32, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); SetRect(&rect, 16, 0, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); ID3D11ComputeShader_Release(cs); @@ -12594,16 +12594,16 @@ static void test_cs_uav_store(void) ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 15, 15, 1); SetRect(&rect, 0, 0, 60, 60); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 0.6f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 0.6f, 2); SetRect(&rect, 0, 60, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); SetRect(&rect, 60, 0, texture_desc.Width, texture_desc.Height); - todo_wine check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); + check_texture_sub_resource_float(texture, 0, &rect, 1.0f, 2); input.x = 0.7f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 16, 16, 1); - todo_wine check_texture_float(texture, 0.7f, 2); + check_texture_float(texture, 0.7f, 2); ID3D11ComputeShader_Release(cs); @@ -12614,12 +12614,12 @@ static void test_cs_uav_store(void) input.x = 0.3f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(texture, 0.3f, 2); + check_texture_float(texture, 0.3f, 2); input.x = 0.1f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 2, 2, 2); - todo_wine check_texture_float(texture, 0.1f, 2); + check_texture_float(texture, 0.1f, 2); ID3D11ComputeShader_Release(cs); @@ -12772,21 +12772,21 @@ static void test_ps_cs_uav_binding(void) ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(cs_texture, 1.0f, 2); + check_texture_float(cs_texture, 1.0f, 2); check_texture_float(ps_texture, 0.0f, 2); draw_quad(&test_context); - todo_wine check_texture_float(cs_texture, 1.0f, 2); + check_texture_float(cs_texture, 1.0f, 2); check_texture_float(ps_texture, 1.0f, 2); input.x = 0.5f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cs_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(cs_texture, 0.5f, 2); + check_texture_float(cs_texture, 0.5f, 2); check_texture_float(ps_texture, 1.0f, 2); input.x = 2.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); draw_quad(&test_context); - todo_wine check_texture_float(cs_texture, 0.5f, 2); + check_texture_float(cs_texture, 0.5f, 2); check_texture_float(ps_texture, 2.0f, 2); input.x = 8.0f; @@ -12794,10 +12794,10 @@ static void test_ps_cs_uav_binding(void) input.x = 4.0f; ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)ps_cb, 0, NULL, &input, 0, 0); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); - todo_wine check_texture_float(cs_texture, 8.0f, 2); + check_texture_float(cs_texture, 8.0f, 2); check_texture_float(ps_texture, 2.0f, 2); draw_quad(&test_context); - todo_wine check_texture_float(cs_texture, 8.0f, 2); + check_texture_float(cs_texture, 8.0f, 2); check_texture_float(ps_texture, 4.0f, 2); ID3D11ComputeShader_Release(cs);

1 0

Józef Kucia : wined3d: Implement dcl_thread_group instruction.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 772370d3aae3263882d86ab407f6d6095cf0f491 URL: http://source.winehq.org/git/wine.git/?a=commit;h=772370d3aae3263882d86ab40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:34 2017 +0100 wined3d: Implement dcl_thread_group instruction. GLSL 1.30 is not enough for layout qualifiers. 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 | 10 ++++++++-- dlls/wined3d/shader.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 6 ++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2778a9f..cac8749 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -353,7 +353,8 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] + || (version && version->type == WINED3D_SHADER_TYPE_COMPUTE)) return 150; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) return 130; @@ -6584,6 +6585,7 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, const struct wined3d_shader *shader) { + const struct wined3d_shader_thread_group_size *thread_group_size = &shader->u.cs.thread_group_size; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_gl_info *gl_info = context->gl_info; const DWORD *function = shader->function; @@ -6601,6 +6603,10 @@ static GLuint shader_glsl_generate_compute_shader(const struct wined3d_context * memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.string_buffers = string_buffers; shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); + + shader_addline(buffer, "layout(local_size_x = %u, local_size_y = %u, local_size_z = %u) in;\n", + thread_group_size->x, thread_group_size->y, thread_group_size->z); + shader_addline(buffer, "void main()\n{\n"); shader_generate_main(shader, buffer, reg_maps, function, &priv_ctx); shader_addline(buffer, "}\n"); @@ -9203,7 +9209,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_TESSELLATOR_PARTITIONING */ NULL, /* WINED3DSIH_DCL_TGSM_RAW */ NULL, /* WINED3DSIH_DCL_TGSM_STRUCTURED */ NULL, - /* WINED3DSIH_DCL_THREAD_GROUP */ NULL, + /* WINED3DSIH_DCL_THREAD_GROUP */ shader_glsl_nop, /* WINED3DSIH_DCL_UAV_RAW */ NULL, /* WINED3DSIH_DCL_UAV_STRUCTURED */ NULL, /* WINED3DSIH_DCL_UAV_TYPED */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 490c985..814da17 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1033,6 +1033,18 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->temporary_count = ins.declaration.count; } + else if (ins.handler_idx == WINED3DSIH_DCL_THREAD_GROUP) + { + if (shader_version.type == WINED3D_SHADER_TYPE_COMPUTE) + { + shader->u.cs.thread_group_size = ins.declaration.thread_group_size; + } + else + { + FIXME("Invalid instruction %#x for shader type %#x.\n", + ins.handler_idx, shader_version.type); + } + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index acd822e..81061cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3560,6 +3560,11 @@ struct wined3d_pixel_shader DWORD color0_reg; }; +struct wined3d_compute_shader +{ + struct wined3d_shader_thread_group_size thread_group_size; +}; + struct wined3d_shader { LONG ref; @@ -3597,6 +3602,7 @@ struct wined3d_shader struct wined3d_vertex_shader vs; struct wined3d_geometry_shader gs; struct wined3d_pixel_shader ps; + struct wined3d_compute_shader cs; } u; };

1 0

Józef Kucia : wined3d: Generate code for compute shaders.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 67b599987efee11f3d02cb531e2393b83c01e9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b599987efee11f3d02cb531… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:33 2017 +0100 wined3d: Generate code for compute shaders. 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 | 226 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 216 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67b599987efee11f3d02c…

1 0

Józef Kucia : wined3d: Track current vertex color clamp mode in glsl_context_data.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: ff09c3c5566aae16b860303c1aa0586f23be3ebc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff09c3c5566aae16b860303c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:32 2017 +0100 wined3d: Track current vertex color clamp mode in glsl_context_data. In preparation for the next patch, compute GLSL programs do not care about the current vertex color clamp. 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 | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f8446ee..a2b1e6e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -236,6 +236,7 @@ struct shader_glsl_ctx_priv { struct glsl_context_data { struct glsl_shader_prog_link *glsl_program; + GLenum vertex_color_clamp; }; struct glsl_ps_compiled_shader @@ -8475,22 +8476,13 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; - GLuint program_id = 0, prev_id = 0; - GLenum old_vertex_color_clamp, current_vertex_color_clamp; + GLenum current_vertex_color_clamp; + GLuint program_id, prev_id; priv->vertex_pipe->vp_enable(gl_info, !use_vs(state)); priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); - if (ctx_data->glsl_program) - { - prev_id = ctx_data->glsl_program->id; - old_vertex_color_clamp = ctx_data->glsl_program->vs.vertex_color_clamp; - } - else - { - prev_id = 0; - old_vertex_color_clamp = GL_FIXED_ONLY_ARB; - } + prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; set_glsl_shader_program(context, state, priv, ctx_data); @@ -8505,8 +8497,9 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex current_vertex_color_clamp = GL_FIXED_ONLY_ARB; } - if (old_vertex_color_clamp != current_vertex_color_clamp) + if (ctx_data->vertex_color_clamp != current_vertex_color_clamp) { + ctx_data->vertex_color_clamp = current_vertex_color_clamp; if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) { GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, current_vertex_color_clamp)); @@ -8514,7 +8507,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex } else { - FIXME("vertex color clamp needs to be changed, but extension not supported.\n"); + FIXME("Vertex color clamp needs to be changed, but extension not supported.\n"); } } @@ -8554,6 +8547,7 @@ static void shader_glsl_invalidate_current_program(struct wined3d_context *conte /* Context activation is done by the caller. */ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *context) { + struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; @@ -8566,6 +8560,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) { + ctx_data->vertex_color_clamp = GL_FIXED_ONLY_ARB; GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, GL_FIXED_ONLY_ARB)); checkGLcall("glClampColorARB"); } @@ -8836,8 +8831,12 @@ static void shader_glsl_free(struct wined3d_device *device) static BOOL shader_glsl_allocate_context_data(struct wined3d_context *context) { - return !!(context->shader_backend_data = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, sizeof(struct glsl_context_data))); + struct glsl_context_data *ctx_data; + if (!(ctx_data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ctx_data)))) + return FALSE; + ctx_data->vertex_color_clamp = GL_FIXED_ONLY_ARB; + context->shader_backend_data = ctx_data; + return TRUE; } static void shader_glsl_free_context_data(struct wined3d_context *context)

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_CSSetUnorderedAccessViews().
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 5fa55fbd324f3e3cc9a28f413f5a88bb2440f021 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa55fbd324f3e3cc9a28f413… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:31 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetUnorderedAccessViews(). 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/device.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 32c1d28..167fd78 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1200,8 +1200,24 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShaderResources(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetUnorderedAccessViews(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11UnorderedAccessView *const *views, const UINT *initial_counts) { - FIXME("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p, initial_counts %p.\n", iface, start_slot, view_count, views, initial_counts); + + if (initial_counts) + FIXME("Ignoring initial counts.\n"); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct d3d11_unordered_access_view *view = unsafe_impl_from_ID3D11UnorderedAccessView(views[i]); + + wined3d_device_set_cs_uav(device->wined3d_device, start_slot + i, + view ? view->wined3d_view : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Acquire unordered access resources for compute dispatches.
by Alexandre Julliard 09 Feb '17

09 Feb '17

Module: wine Branch: master Commit: 8962db2aa76a0bf330dd5bd7f25f13e6fe9abb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8962db2aa76a0bf330dd5bd7f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:30 2017 +0100 wined3d: Acquire unordered access resources for compute dispatches. 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/cs.c | 86 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index db94942..83bd60c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -492,19 +492,63 @@ static void release_shader_resources(const struct wined3d_state *state, unsigned } } +static void acquire_unordered_access_resources(const struct wined3d_shader *shader, + struct wined3d_unordered_access_view * const *views) +{ + unsigned int i; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!views[i]) + continue; + + wined3d_resource_acquire(views[i]->resource); + } +} + +static void release_unordered_access_resources(const struct wined3d_shader *shader, + struct wined3d_unordered_access_view * const *views) +{ + unsigned int i; + + if (!shader) + return; + + for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) + { + if (!shader->reg_maps.uav_resource_info[i].type) + continue; + + if (!views[i]) + continue; + + wined3d_resource_release(views[i]->resource); + } +} + static void wined3d_cs_exec_dispatch(struct wined3d_cs *cs, const void *data) { + struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_dispatch *op = data; - dispatch_compute(cs->device, &cs->device->state, + dispatch_compute(cs->device, state, op->group_count_x, op->group_count_y, op->group_count_z); - release_shader_resources(&cs->device->state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + release_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->compute_unordered_access_view); } void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, unsigned int group_count_x, unsigned int group_count_y, unsigned int group_count_z) { + const struct wined3d_state *state = &cs->device->state; struct wined3d_cs_dispatch *op; op = cs->ops->require_space(cs, sizeof(*op)); @@ -513,7 +557,9 @@ void wined3d_cs_emit_dispatch(struct wined3d_cs *cs, op->group_count_y = group_count_y; op->group_count_z = group_count_z; - acquire_shader_resources(&cs->device->state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + acquire_shader_resources(state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_COMPUTE], + state->compute_unordered_access_view); cs->ops->submit(cs); } @@ -522,7 +568,6 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { struct wined3d_state *state = &cs->device->state; const struct wined3d_cs_draw *op = data; - struct wined3d_shader *shader; unsigned int i; if (!cs->device->adapter->gl_info.supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] @@ -555,27 +600,14 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) if (state->fb->depth_stencil) wined3d_resource_release(state->fb->depth_stencil->resource); release_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) - { - struct wined3d_unordered_access_view *view; - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - - if (!(view = state->unordered_access_view[i])) - continue; - - wined3d_resource_release(view->resource); - } - } + release_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], + state->unordered_access_view); } 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) { const struct wined3d_state *state = &cs->device->state; - struct wined3d_shader *shader; struct wined3d_cs_draw *op; unsigned int i; @@ -608,20 +640,8 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, int base_vertex_idx, unsigned i if (state->fb->depth_stencil) wined3d_resource_acquire(state->fb->depth_stencil->resource); acquire_shader_resources(state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); - if ((shader = state->shader[WINED3D_SHADER_TYPE_PIXEL])) - { - struct wined3d_unordered_access_view *view; - for (i = 0; i < MAX_UNORDERED_ACCESS_VIEWS; ++i) - { - if (!shader->reg_maps.uav_resource_info[i].type) - continue; - - if (!(view = state->unordered_access_view[i])) - continue; - - wined3d_resource_acquire(view->resource); - } - } + acquire_unordered_access_resources(state->shader[WINED3D_SHADER_TYPE_PIXEL], + state->unordered_access_view); cs->ops->submit(cs); }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
84
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2017