wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Jacek Caban : uiautomationcore: Added UiaClientsAreListening stub.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 1cc93e3f05bce5ae9758fad44f69f44e1462d81b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc93e3f05bce5ae9758fad44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 19:05:43 2017 +0100 uiautomationcore: Added UiaClientsAreListening stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 9 +++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index 6e6180e..994d8e6 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -36,3 +36,12 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv) return TRUE; } + +/*********************************************************************** + * UiaClientsAreListening (uiautomationcore.@) + */ +BOOL WINAPI UiaClientsAreListening(void) +{ + FIXME("()\n"); + return FALSE; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index 3df7425..3026001 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -52,7 +52,7 @@ @ stub TransformPattern_Resize @ stub TransformPattern_Rotate @ stub UiaAddEvent -@ stub UiaClientsAreListening +@ stdcall UiaClientsAreListening() @ stub UiaEventAddWindow @ stub UiaEventRemoveWindow @ stub UiaFind

1 0

Jacek Caban : uiautomationcore: Added stub dll.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: aca0a27cedfde05414112a505f727df2e36c95b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aca0a27cedfde05414112a505… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 19:05:33 2017 +0100 uiautomationcore: Added stub dll. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/uiautomationcore/Makefile.in | 4 ++ dlls/uiautomationcore/uia_main.c | 38 ++++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 93 +++++++++++++++++++++++++++++ 5 files changed, 138 insertions(+) diff --git a/configure b/configure index 255dcdc..a64a766 100755 --- a/configure +++ b/configure @@ -1420,6 +1420,7 @@ enable_tdi_sys enable_traffic enable_twain_32 enable_ucrtbase +enable_uiautomationcore enable_unicows enable_updspapi enable_url @@ -18345,6 +18346,7 @@ wine_fn_config_test dlls/twain_32/tests twain_32_test wine_fn_config_dll typelib.dll16 enable_win16 wine_fn_config_dll ucrtbase enable_ucrtbase implib wine_fn_config_test dlls/ucrtbase/tests ucrtbase_test +wine_fn_config_dll uiautomationcore enable_uiautomationcore wine_fn_config_dll unicows enable_unicows implib wine_fn_config_dll updspapi enable_updspapi wine_fn_config_dll url enable_url implib diff --git a/configure.ac b/configure.ac index 367851d..cdef9e6 100644 --- a/configure.ac +++ b/configure.ac @@ -3402,6 +3402,7 @@ WINE_CONFIG_TEST(dlls/twain_32/tests) WINE_CONFIG_DLL(typelib.dll16,enable_win16) WINE_CONFIG_DLL(ucrtbase,,[implib]) WINE_CONFIG_TEST(dlls/ucrtbase/tests) +WINE_CONFIG_DLL(uiautomationcore) WINE_CONFIG_DLL(unicows,,[implib]) WINE_CONFIG_DLL(updspapi) WINE_CONFIG_DLL(url,,[implib]) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in new file mode 100644 index 0000000..78d6254 --- /dev/null +++ b/dlls/uiautomationcore/Makefile.in @@ -0,0 +1,4 @@ +MODULE = uiautomationcore.dll + +C_SRCS = \ + uia_main.c diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c new file mode 100644 index 0000000..6e6180e --- /dev/null +++ b/dlls/uiautomationcore/uia_main.c @@ -0,0 +1,38 @@ +/* + * Copyright 2017 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "uiautomationcore.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(uiautomation); + +BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, void *lpv) +{ + TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + + switch(fdwReason) { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hInstDLL); + break; + } + + return TRUE; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec new file mode 100644 index 0000000..3df7425 --- /dev/null +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -0,0 +1,93 @@ +@ stub DllCanUnloadNow +@ stub DllGetClassObject +@ stub DllRegisterServer +@ stub DllUnregisterServer +@ stub DockPattern_SetDockPosition +@ stub ExpandCollapsePattern_Collapse +@ stub ExpandCollapsePattern_Expand +@ stub GridPattern_GetItem +@ stub InvokePattern_Invoke +@ stub ItemContainerPattern_FindItemByProperty +@ stub LegacyIAccessiblePattern_DoDefaultAction +@ stub LegacyIAccessiblePattern_GetIAccessible +@ stub LegacyIAccessiblePattern_Select +@ stub LegacyIAccessiblePattern_SetValue +@ stub MultipleViewPattern_GetViewName +@ stub MultipleViewPattern_SetCurrentView +@ stub RangeValuePattern_SetValue +@ stub ScrollItemPattern_ScrollIntoView +@ stub ScrollPattern_Scroll +@ stub ScrollPattern_SetScrollPercent +@ stub SelectionItemPattern_AddToSelection +@ stub SelectionItemPattern_RemoveFromSelection +@ stub SelectionItemPattern_Select +@ stub SynchronizedInputPattern_Cancel +@ stub SynchronizedInputPattern_StartListening +@ stub TextPattern_GetSelection +@ stub TextPattern_GetVisibleRanges +@ stub TextPattern_RangeFromChild +@ stub TextPattern_RangeFromPoint +@ stub TextPattern_get_DocumentRange +@ stub TextPattern_get_SupportedTextSelection +@ stub TextRange_AddToSelection +@ stub TextRange_Clone +@ stub TextRange_Compare +@ stub TextRange_CompareEndpoints +@ stub TextRange_ExpandToEnclosingUnit +@ stub TextRange_FindAttribute +@ stub TextRange_FindText +@ stub TextRange_GetAttributeValue +@ stub TextRange_GetBoundingRectangles +@ stub TextRange_GetChildren +@ stub TextRange_GetEnclosingElement +@ stub TextRange_GetText +@ stub TextRange_Move +@ stub TextRange_MoveEndpointByRange +@ stub TextRange_MoveEndpointByUnit +@ stub TextRange_RemoveFromSelection +@ stub TextRange_ScrollIntoView +@ stub TextRange_Select +@ stub TogglePattern_Toggle +@ stub TransformPattern_Move +@ stub TransformPattern_Resize +@ stub TransformPattern_Rotate +@ stub UiaAddEvent +@ stub UiaClientsAreListening +@ stub UiaEventAddWindow +@ stub UiaEventRemoveWindow +@ stub UiaFind +@ stub UiaGetErrorDescription +@ stub UiaGetPatternProvider +@ stub UiaGetPropertyValue +@ stub UiaGetReservedMixedAttributeValue +@ stub UiaGetReservedNotSupportedValue +@ stub UiaGetRootNode +@ stub UiaGetRuntimeId +@ stub UiaGetUpdatedCache +@ stub UiaHPatternObjectFromVariant +@ stub UiaHTextRangeFromVariant +@ stub UiaHUiaNodeFromVariant +@ stub UiaHasServerSideProvider +@ stub UiaHostProviderFromHwnd +@ stub UiaLookupId +@ stub UiaNavigate +@ stub UiaNodeFromFocus +@ stub UiaNodeFromHandle +@ stub UiaNodeFromPoint +@ stub UiaNodeFromProvider +@ stub UiaNodeRelease +@ stub UiaPatternRelease +@ stub UiaRaiseAsyncContentLoadedEvent +@ stub UiaRaiseAutomationEvent +@ stub UiaRaiseAutomationPropertyChangedEvent +@ stub UiaRaiseStructureChangedEvent +@ stub UiaRegisterProviderCallback +@ stub UiaRemoveEvent +@ stub UiaReturnRawElementProvider +@ stub UiaSetFocus +@ stub UiaTextRangeRelease +@ stub ValuePattern_SetValue +@ stub VirtualizedItemPattern_Realize +@ stub WindowPattern_Close +@ stub WindowPattern_SetWindowVisualState +@ stub WindowPattern_WaitForInputIdle

1 0

Jacek Caban : server: Moved server-independent parts of pipe_server_flush into separated function.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: e50d49c17a3c9d51621a5781dda1a107bee0b949 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e50d49c17a3c9d51621a5781d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 14:51:17 2017 +0100 server: Moved server-independent parts of pipe_server_flush into separated function. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 4a4769b..6861e0f 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -548,23 +548,31 @@ static void check_flushed( void *arg ) } } +static obj_handle_t pipe_end_flush( struct pipe_end *pipe_end, struct async *async, int blocking ) +{ + obj_handle_t handle = 0; + + if (!fd_queue_async( pipe_end->fd, async, ASYNC_TYPE_WAIT )) return 0; + + if (!blocking || (handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ))) + set_error( STATUS_PENDING ); + return handle; +} + static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int blocking ) { struct pipe_server *server = get_fd_user( fd ); - obj_handle_t handle = 0; + obj_handle_t handle; if (!server || server->state != ps_connected_server) return 0; if (!pipe_data_remaining( server )) return 0; - if (fd_queue_async( server->pipe_end.fd, async, ASYNC_TYPE_WAIT )) - { - /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ - if (!server->flush_poll) - server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); - if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 ); - set_error( STATUS_PENDING ); - } + handle = pipe_end_flush( &server->pipe_end, async, blocking ); + + /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ + if (handle && !server->flush_poll) + server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); return handle; }

1 0

Jacek Caban : server: Introduced new pipe_end struct containing common parts of pipe_client and pipe_server.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 89898675446ba7158e3ecc5b2dddc4d0c55bc46d URL: http://source.winehq.org/git/wine.git/?a=commit;h=89898675446ba7158e3ecc5b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 14:51:06 2017 +0100 server: Introduced new pipe_end struct containing common parts of pipe_client and pipe_server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 99 ++++++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=89898675446ba7158e3ec…

1 0

Jacek Caban : server: Pass existing async object to fd_queue_async.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: a3acdf117f0d7ffa37d26d76c25f5eb8ac7a892b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3acdf117f0d7ffa37d26d76c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 22 14:50:49 2017 +0100 server: Pass existing async object to fd_queue_async. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 5 ----- server/change.c | 5 +++-- server/device.c | 29 +++++++++-------------------- server/fd.c | 33 +++++++++++++-------------------- server/file.h | 3 +-- server/mailslot.c | 3 +-- server/named_pipe.c | 6 ++---- server/serial.c | 3 +-- 8 files changed, 30 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a3acdf117f0d7ffa37d26…

1 0

Józef Kucia : wined3d: Implement compute shader resource binding.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 1f1efea0d3579aba10b6defe1082c9bc54a4539a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1efea0d3579aba10b6defe1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:36 2017 +0100 wined3d: Implement compute shader resource binding. 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 | 103 +++++++++++++++++++++++++++++-------------------- 1 file changed, 62 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 92c2819..076ebee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3350,17 +3350,57 @@ static void context_load_shader_resources(struct wined3d_context *context, const } } -static void context_bind_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) +static void context_bind_shader_resources(struct wined3d_context *context, + const struct wined3d_state *state, enum wined3d_shader_type shader_type, + unsigned int base_idx, unsigned int count) { const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_device *device = context->device; struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; + unsigned int shader_sampler_count, i; + const struct wined3d_shader *shader; struct wined3d_sampler *sampler; - struct wined3d_shader *shader; - unsigned int i, j, count; GLuint sampler_name; + if (!(shader = state->shader[shader_type])) + return; + + shader_sampler_count = shader->reg_maps.sampler_map.count; + if (shader_sampler_count > count) + FIXME("Shader %p needs %u samplers, but only %u are supported.\n", + shader, shader_sampler_count, count); + count = min(shader_sampler_count, count); + + for (i = 0; i < count; ++i) + { + entry = &shader->reg_maps.sampler_map.entries[i]; + + if (!(view = state->shader_resource_view[shader_type][entry->resource_idx])) + { + WARN("No resource view bound at index %u, %u.\n", shader_type, entry->resource_idx); + continue; + } + + if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) + sampler_name = device->default_sampler; + else if ((sampler = state->sampler[shader_type][entry->sampler_idx])) + sampler_name = sampler->name; + else + sampler_name = device->null_sampler; + + context_active_texture(context, gl_info, base_idx + entry->bind_idx); + GL_EXTCALL(glBindSampler(base_idx + entry->bind_idx, sampler_name)); + checkGLcall("glBindSampler"); + wined3d_shader_resource_view_bind(view, context); + } +} + +static void context_bind_graphics_shader_resources(struct wined3d_context *context, + const struct wined3d_state *state) +{ + unsigned int i; + static const struct { enum wined3d_shader_type type; @@ -3374,41 +3414,8 @@ static void context_bind_shader_resources(struct wined3d_context *context, const }; for (i = 0; i < ARRAY_SIZE(shader_types); ++i) - { - if (!(shader = state->shader[shader_types[i].type])) - continue; - - count = shader->reg_maps.sampler_map.count; - if (count > shader_types[i].count) - { - FIXME("Shader %p needs %u samplers, but only %u are supported.\n", - shader, count, shader_types[i].count); - count = shader_types[i].count; - } - - for (j = 0; j < count; ++j) - { - entry = &shader->reg_maps.sampler_map.entries[j]; - - if (!(view = state->shader_resource_view[shader_types[i].type][entry->resource_idx])) - { - WARN("No resource view bound at index %u, %u.\n", shader_types[i].type, entry->resource_idx); - continue; - } - - if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - sampler_name = device->default_sampler; - else if ((sampler = state->sampler[shader_types[i].type][entry->sampler_idx])) - sampler_name = sampler->name; - else - sampler_name = device->null_sampler; - - context_active_texture(context, gl_info, shader_types[i].base_idx + entry->bind_idx); - GL_EXTCALL(glBindSampler(shader_types[i].base_idx + entry->bind_idx, sampler_name)); - checkGLcall("glBindSampler"); - wined3d_shader_resource_view_bind(view, context); - } - } + context_bind_shader_resources(context, state, shader_types[i].type, + shader_types[i].base_idx, shader_types[i].count); } static void context_load_unordered_access_resources(struct wined3d_context *context, @@ -3502,12 +3509,12 @@ BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; + const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; WORD map; - if (!context_validate_rt_config(context->gl_info->limits.buffers, - fb->render_targets, fb->depth_stencil)) + if (!context_validate_rt_config(gl_info->limits.buffers, fb->render_targets, fb->depth_stencil)) return FALSE; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && isStateDirty(context, STATE_FRAMEBUFFER)) @@ -3575,8 +3582,10 @@ BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_shader_resource_bindings) { - context_bind_shader_resources(context, state); + context_bind_graphics_shader_resources(context, state); context->update_shader_resource_bindings = 0; + if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) + context->update_compute_shader_resource_bindings = 1; } if (context->update_unordered_access_view_bindings) @@ -3603,6 +3612,7 @@ void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { const struct StateEntry *state_table = context->state_table; + const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int state_id, i, j; context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); @@ -3625,6 +3635,17 @@ void context_apply_compute_state(struct wined3d_context *context, context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } + if (context->update_compute_shader_resource_bindings) + { + unsigned int base_idx, count; + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, + WINED3D_SHADER_TYPE_COMPUTE, &base_idx, &count); + context_bind_shader_resources(context, state, WINED3D_SHADER_TYPE_COMPUTE, base_idx, count); + context->update_compute_shader_resource_bindings = 0; + if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) + context->update_shader_resource_bindings = 1; + } + if (context->update_compute_unordered_access_view_bindings) { context_bind_unordered_access_views(context,

1 0

Józef Kucia : wined3d: Load sampler bindings for compute shaders.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: 7d9b0a6e166eb1c021915129f5eea946f48d6216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d9b0a6e166eb1c021915129f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:35 2017 +0100 wined3d: Load sampler bindings 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 | 64 +++++++++++++++++++++++++----------------- dlls/wined3d/utils.c | 17 +++++++++++ dlls/wined3d/wined3d_private.h | 4 ++- 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a8f7f86..44e1513 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -560,14 +560,41 @@ void shader_glsl_validate_link(const struct wined3d_gl_info *gl_info, GLuint pro /* Context activation is done by the caller. */ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, - struct shader_glsl_priv *priv, const DWORD *tex_unit_map, GLuint program_id) + struct shader_glsl_priv *priv, const char *prefix, unsigned int base_idx, + unsigned int count, const DWORD *tex_unit_map, GLuint program_id) { - unsigned int mapped_unit; struct wined3d_string_buffer *sampler_name = string_buffer_get(&priv->string_buffers); - const char *prefix; - unsigned int i, j; + unsigned int mapped_unit, i; GLint name_loc; + for (i = 0; i < count; ++i) + { + string_buffer_sprintf(sampler_name, "%s_sampler%u", prefix, i); + name_loc = GL_EXTCALL(glGetUniformLocation(program_id, sampler_name->buffer)); + if (name_loc == -1) + continue; + + mapped_unit = tex_unit_map ? tex_unit_map[base_idx + i] : base_idx + i; + if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.combined_samplers) + { + ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name->buffer, mapped_unit); + continue; + } + + TRACE("Loading sampler %s on unit %u.\n", sampler_name->buffer, mapped_unit); + GL_EXTCALL(glUniform1i(name_loc, mapped_unit)); + } + checkGLcall("Load sampler bindings"); + string_buffer_release(&priv->string_buffers, sampler_name); +} + +/* Context activation is done by the caller. */ +static void shader_glsl_load_graphics_samplers(const struct wined3d_gl_info *gl_info, + struct shader_glsl_priv *priv, const DWORD *tex_unit_map, GLuint program_id) +{ + const char *prefix; + unsigned int i; + static const struct { enum wined3d_shader_type type; @@ -583,27 +610,9 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, for (i = 0; i < ARRAY_SIZE(sampler_info); ++i) { prefix = shader_glsl_get_prefix(sampler_info[i].type); - - for (j = 0; j < sampler_info[i].count; ++j) - { - string_buffer_sprintf(sampler_name, "%s_sampler%u", prefix, j); - name_loc = GL_EXTCALL(glGetUniformLocation(program_id, sampler_name->buffer)); - if (name_loc == -1) - continue; - - mapped_unit = tex_unit_map[sampler_info[i].base_idx + j]; - if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.graphics_samplers) - { - ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name->buffer, mapped_unit); - continue; - } - - TRACE("Loading sampler %s on unit %u.\n", sampler_name->buffer, mapped_unit); - GL_EXTCALL(glUniform1i(name_loc, mapped_unit)); - } + shader_glsl_load_samplers(gl_info, priv, prefix, + sampler_info[i].base_idx, sampler_info[i].count, tex_unit_map, program_id); } - checkGLcall("Load sampler bindings"); - string_buffer_release(&priv->string_buffers, sampler_name); } static void shader_glsl_load_icb(const struct wined3d_gl_info *gl_info, struct shader_glsl_priv *priv, @@ -8293,6 +8302,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int base_sampler_idx, sampler_count; struct glsl_shader_prog_link *entry = NULL; struct wined3d_shader *shader; struct glsl_program_key key; @@ -8351,6 +8361,10 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex shader_glsl_init_uniform_block_bindings(gl_info, priv, program_id, &shader->reg_maps); shader_glsl_load_icb(gl_info, priv, program_id, &shader->reg_maps); shader_glsl_load_images(gl_info, priv, program_id, &shader->reg_maps); + wined3d_gl_limits_get_texture_unit_range(&gl_info->limits, WINED3D_SHADER_TYPE_COMPUTE, + &base_sampler_idx, &sampler_count); + shader_glsl_load_samplers(gl_info, priv, shader_glsl_get_prefix(WINED3D_SHADER_TYPE_COMPUTE), + base_sampler_idx, sampler_count, NULL, program_id); entry->constant_update_mask = 0; } @@ -8629,7 +8643,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const /* Texture unit mapping is set up to be the same each time the shader * program is used so we can hardcode the sampler uniform values. */ - shader_glsl_load_samplers(gl_info, priv, context->tex_unit_map, program_id); + shader_glsl_load_graphics_samplers(gl_info, priv, context->tex_unit_map, program_id); entry->constant_update_mask = 0; if (vshader) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 61f7a8a..b076783 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5943,3 +5943,20 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g ERR("Unrecognized shader type %#x.\n", shader_type); *count = 0; } + +void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) +{ + if (shader_type != WINED3D_SHADER_TYPE_COMPUTE) + { + *base = *count = 0; + ERR("Unhandled shader type %#x.\n", shader_type); + return; + } + + if (gl_limits->combined_samplers == gl_limits->graphics_samplers) + *base = 0; + else + *base = gl_limits->graphics_samplers - 1; + *count = gl_limits->compute_samplers; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8217cb6..087e4d2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2236,6 +2236,8 @@ struct wined3d_gl_limits UINT arb_ps_temps; }; +void wined3d_gl_limits_get_texture_unit_range(const struct wined3d_gl_limits *gl_limits, + enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *gl_limits, enum wined3d_shader_type shader_type, unsigned int *base, unsigned int *count) DECLSPEC_HIDDEN; @@ -2568,7 +2570,7 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; -#define WINED3D_UNMAPPED_STAGE ~0U +#define WINED3D_UNMAPPED_STAGE ~0u /* Multithreaded flag. Removed from the public header to signal that * wined3d_device_create() ignores it. */

1 0

Józef Kucia : wined3d: Allocate texture binding set for compute pipeline.
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: b3a7d3adaa23a2bf01222afe206c7c8ff797f4fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3a7d3adaa23a2bf01222afe2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:34 2017 +0100 wined3d: Allocate texture binding set for compute pipeline. It seems that a majority of OpenGL implementations allow to statically partition texture bindings. For other implementations we are going to invalidate graphics pipeline texture bindings when appplying compute pipeline texture bindings, and vice versa. 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/directx.c | 10 ++++++++++ dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 4 +--- dlls/wined3d/wined3d_private.h | 8 +++++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d60248d..92c2819 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1713,7 +1713,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, /* Initialize the texture unit mapping to a 1:1 mapping */ for (s = 0; s < MAX_COMBINED_SAMPLERS; ++s) { - if (s < gl_info->limits.combined_samplers) + if (s < gl_info->limits.graphics_samplers) { ret->tex_unit_map[s] = s; ret->rev_tex_unit_map[s] = s; @@ -2962,7 +2962,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; const struct wined3d_shader_resource_info *ps_resource_info = NULL; const struct wined3d_gl_info *gl_info = context->gl_info; - int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.combined_samplers) - 1; + int start = min(MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; int i; /* Note that we only care if a resource is used or not, not the @@ -3012,7 +3012,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s * When the mapping of a stage is changed, sampler and ALL texture stage * states have to be reset. */ - if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS) + if (gl_info->limits.graphics_samplers >= MAX_COMBINED_SAMPLERS) return; if (ps) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8342325..5b1605d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3352,7 +3352,9 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; gl_info->limits.vertex_samplers = 0; + gl_info->limits.compute_samplers = 0; gl_info->limits.combined_samplers = gl_info->limits.fragment_samplers + gl_info->limits.vertex_samplers; + gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; gl_info->limits.vertex_attribs = 16; gl_info->limits.texture_buffer_offset_alignment = 1; gl_info->limits.glsl_vs_float_constants = 0; @@ -3471,6 +3473,7 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) TRACE("Max vertex samplers: %u.\n", gl_info->limits.vertex_samplers); TRACE("Max combined samplers: %u.\n", gl_info->limits.combined_samplers); TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); + gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; } if (gl_info->supported[ARB_VERTEX_BLEND]) { @@ -3570,6 +3573,13 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) 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); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS, &gl_max); + gl_info->limits.compute_samplers = gl_max; + TRACE("Max compute samplers: %u.\n", gl_info->limits.compute_samplers); + /* A majority of OpenGL implementations allow to statically partition + * the set of texture bindings into six separate sets. */ + if (gl_info->limits.combined_samplers >= MAX_COMBINED_SAMPLERS + gl_info->limits.compute_samplers) + gl_info->limits.graphics_samplers -= gl_info->limits.compute_samplers; } if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) { diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 41adac1..a8f7f86 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -592,7 +592,7 @@ static void shader_glsl_load_samplers(const struct wined3d_gl_info *gl_info, continue; mapped_unit = tex_unit_map[sampler_info[i].base_idx + j]; - if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.combined_samplers) + if (mapped_unit == WINED3D_UNMAPPED_STAGE || mapped_unit >= gl_info->limits.graphics_samplers) { ERR("Trying to load sampler %s on unsupported unit %u.\n", sampler_name->buffer, mapped_unit); continue; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ff79c7a..b73f4a8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3604,10 +3604,8 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state return; } - if (mapped_stage >= gl_info->limits.combined_samplers) - { + if (mapped_stage >= gl_info->limits.graphics_samplers) return; - } context_active_texture(context, gl_info, mapped_stage); if (state->textures[sampler_idx]) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a74ea77..8217cb6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2202,9 +2202,11 @@ struct wined3d_gl_limits UINT textures; UINT texture_coords; unsigned int uniform_blocks[WINED3D_SHADER_TYPE_COUNT]; - UINT fragment_samplers; - UINT vertex_samplers; - UINT combined_samplers; + unsigned int fragment_samplers; + unsigned int vertex_samplers; + unsigned int compute_samplers; + unsigned int graphics_samplers; + unsigned int combined_samplers; UINT general_combiners; UINT user_clip_distances; UINT texture_size;

1 0

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

22 Feb '17

Module: wine Branch: master Commit: 4c18c1b06620ae7ca48d63312e10c68d0eb71f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c18c1b06620ae7ca48d63312… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:33 2017 +0100 d3d11: Implement d3d11_immediate_context_CSSetSamplers(). 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 | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 356f9f0..6269c68 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1260,8 +1260,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_cs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_CSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_set_cs_sampler().
by Alexandre Julliard 22 Feb '17

22 Feb '17

Module: wine Branch: master Commit: c9f080f4a629d888fe939fe6760b900b1a24fe8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f080f4a629d888fe939fe67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Feb 22 13:19:32 2017 +0100 wined3d: Introduce wined3d_device_set_cs_sampler(). 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/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dea01e6..5a4eb25 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2753,6 +2753,14 @@ void CDECL wined3d_device_set_cs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_COMPUTE, idx, view); } +void CDECL wined3d_device_set_cs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_COMPUTE, idx, sampler); +} + static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_device *device, enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a80cec2..875e7e3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -113,6 +113,7 @@ @ cdecl wined3d_device_set_compute_shader(ptr ptr) @ cdecl wined3d_device_set_cs_cb(ptr long ptr) @ cdecl wined3d_device_set_cs_resource_view(ptr long ptr) +@ cdecl wined3d_device_set_cs_sampler(ptr long ptr) @ cdecl wined3d_device_set_cs_uav(ptr long ptr) @ cdecl wined3d_device_set_cursor_position(ptr long long long) @ cdecl wined3d_device_set_cursor_properties(ptr long long ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 60697b4..03f3db9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2256,6 +2256,8 @@ void __cdecl wined3d_device_set_compute_shader(struct wined3d_device *device, st void __cdecl wined3d_device_set_cs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_cs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_set_cs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_cs_uav(struct wined3d_device *device, unsigned int idx, struct wined3d_unordered_access_view *uav); void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device,

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
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