May 2019 - Wine-commits - list.winehq.org

Józef Kucia : vkd3d: Remember the last fence we waited for.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 58e0a89d7695e5c5518f333678a13a1de14edf93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=58e0a89d7695e5c5518f333… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:20 2019 +0200 vkd3d: Remember the last fence we waited for. An application uses the following pattern: Wait(queue, fence, value); ExecuteCommandLists(queue, count, lists); Wait(queue, fence, value); ExecuteCommandLists(queue, count2, lists2); In this case, we don't need to wait for the fence again. 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> --- libs/vkd3d/command.c | 41 ++++++++++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 3 +++ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 07de716..606c5bb 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5471,11 +5471,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; struct vkd3d_signaled_semaphore *semaphore; - VkQueue vk_queue = VK_NULL_HANDLE; uint64_t completed_value = 0; struct vkd3d_queue *queue; struct d3d12_fence *fence; VkSubmitInfo submit_info; + VkQueue vk_queue; VkResult vr; HRESULT hr; @@ -5486,18 +5486,34 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if fence = unsafe_impl_from_ID3D12Fence(fence_iface); - if (!(semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value))) + semaphore = d3d12_fence_acquire_vk_semaphore(fence, value, &completed_value); + if (!semaphore && completed_value >= value) + { + /* We don't get a Vulkan semaphore if the fence was signaled on CPU. */ + TRACE("Already signaled %p, value %#"PRIx64".\n", fence, completed_value); + return S_OK; + } + + if (!(vk_queue = vkd3d_queue_acquire(queue))) + { + ERR("Failed to acquire queue %p.\n", queue); + hr = E_FAIL; + goto fail; + } + + if (!semaphore) { - if (completed_value >= value) + if (command_queue->last_waited_fence == fence && command_queue->last_waited_fence_value >= value) { - TRACE("Already signaled %p, value %#"PRIx64".\n", fence, completed_value); + WARN("Already waited on fence %p, value %#"PRIx64".\n", fence, value); } else { - FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64", completed value %#"PRIx64".\n", - fence, value, completed_value); + FIXME("Failed to acquire Vulkan semaphore for fence %p, value %#"PRIx64 + ", completed value %#"PRIx64".\n", fence, value, completed_value); } + vkd3d_queue_release(queue); return S_OK; } @@ -5511,13 +5527,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if submit_info.signalSemaphoreCount = 0; submit_info.pSignalSemaphores = NULL; - if (!(vk_queue = vkd3d_queue_acquire(queue))) - { - ERR("Failed to acquire queue %p.\n", queue); - hr = E_FAIL; - goto fail; - } - if (!vkd3d_array_reserve((void **)&queue->semaphores, &queue->semaphores_size, queue->semaphore_count + 1, sizeof(*queue->semaphores))) { @@ -5532,6 +5541,9 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if queue->semaphores[queue->semaphore_count].vk_semaphore = semaphore->vk_semaphore; queue->semaphores[queue->semaphore_count].sequence_number = queue->submitted_sequence_number + 1; ++queue->semaphore_count; + + command_queue->last_waited_fence = fence; + command_queue->last_waited_fence_value = value; } vkd3d_queue_release(queue); @@ -5632,6 +5644,9 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (!(queue->vkd3d_queue = d3d12_device_get_vkd3d_queue(device, desc->Type))) return E_NOTIMPL; + queue->last_waited_fence = NULL; + queue->last_waited_fence_value = 0; + if (desc->Priority == D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME) { FIXME("Global realtime priority is not implemented.\n"); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index b5beffa..402ac0a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -924,6 +924,9 @@ struct d3d12_command_queue struct vkd3d_queue *vkd3d_queue; + const struct d3d12_fence *last_waited_fence; + uint64_t last_waited_fence_value; + struct d3d12_device *device; struct vkd3d_private_store private_store;

1 0

Józef Kucia : vkd3d: Introduce vkd3d_application_info.
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 08e2e583b5a167851867f1070f46d6ba998ec60c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=08e2e583b5a167851867f10… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:21 2019 +0200 vkd3d: Introduce vkd3d_application_info. 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> --- include/vkd3d.h | 14 ++++++++++++++ libs/vkd3d/device.c | 39 ++++++++++++++++++++++++++++++++++++--- tests/vkd3d_api.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 3 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 24cb34e..b78076e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -43,6 +43,7 @@ enum vkd3d_structure_type VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO, VKD3D_STRUCTURE_TYPE_OPTIONAL_DEVICE_EXTENSIONS_INFO, + VKD3D_STRUCTURE_TYPE_APPLICATION_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_STRUCTURE_TYPE), }; @@ -83,6 +84,19 @@ struct vkd3d_optional_instance_extensions_info uint32_t extension_count; }; +/* Extends vkd3d_instance_create_info. */ +struct vkd3d_application_info +{ + enum vkd3d_structure_type type; + const void *next; + + const char *application_name; + uint32_t application_version; + + const char *engine_name; /* "vkd3d" if NULL */ + uint32_t engine_version; /* vkd3d version if engine_name is NULL */ +}; + struct vkd3d_device_create_info { enum vkd3d_structure_type type; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a107e1e..ae8893d 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -18,6 +18,8 @@ #include "vkd3d_private.h" +#include <ctype.h> + #ifdef HAVE_DLFCN_H #include <dlfcn.h> @@ -104,6 +106,25 @@ static void *vk_find_struct_(struct vk_struct *chain, VkStructureType sType) return NULL; } +static uint32_t vkd3d_get_vk_version(void) +{ + const char *ptr = PACKAGE_VERSION; + int major, minor; + + major = atoi(ptr); + + while (isdigit(*ptr)) + ++ptr; + if (*ptr == '.') + ++ptr; + + minor = atoi(ptr); + + TRACE("Version %d.%d.\n", major, minor); + + return VK_MAKE_VERSION(major, minor, 0); +} + struct vkd3d_optional_extension_info { const char *extension_name; @@ -459,6 +480,7 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; const struct vkd3d_optional_instance_extensions_info *optional_extensions; + const struct vkd3d_application_info *vkd3d_application_info; bool *user_extension_supported = NULL; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; @@ -509,12 +531,23 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pNext = NULL; - application_info.pApplicationName = PACKAGE_NAME; + application_info.pApplicationName = NULL; application_info.applicationVersion = 0; - application_info.pEngineName = NULL; - application_info.engineVersion = 0; + application_info.pEngineName = PACKAGE_NAME; + application_info.engineVersion = vkd3d_get_vk_version(); application_info.apiVersion = VK_API_VERSION_1_0; + if ((vkd3d_application_info = vkd3d_find_struct(create_info->next, APPLICATION_INFO))) + { + application_info.pApplicationName = vkd3d_application_info->application_name; + application_info.applicationVersion = vkd3d_application_info->application_version; + if (vkd3d_application_info->engine_name) + { + application_info.pEngineName = vkd3d_application_info->engine_name; + application_info.engineVersion = vkd3d_application_info->engine_version; + } + } + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) { if (instance->libvulkan) diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 14d0914..5acec56 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -1052,6 +1052,49 @@ static void test_formats(void) } } +static void test_application_info(void) +{ + struct vkd3d_instance_create_info create_info; + struct vkd3d_application_info app_info; + struct vkd3d_instance *instance; + ULONG refcount; + HRESULT hr; + + app_info.type = VKD3D_STRUCTURE_TYPE_APPLICATION_INFO; + app_info.next = NULL; + app_info.engine_name = NULL; + app_info.engine_version = 0; + app_info.application_name = NULL; + app_info.application_version = 0; + + create_info = instance_default_create_info; + create_info.next = &app_info; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + app_info.application_name = "vkd3d_api_tests"; + app_info.application_version = 0xdeadbeef; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + app_info.engine_name = "engine_name"; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); + + app_info.engine_name = "engine_name"; + app_info.engine_version = 2; + hr = vkd3d_create_instance(&create_info, &instance); + ok(hr == S_OK, "Failed to create instance, hr %#x.\n", hr); + refcount = vkd3d_instance_decref(instance); + ok(!refcount, "Instance has %u references left.\n", refcount); +} + static bool have_d3d12_device(void) { ID3D12Device *device; @@ -1083,4 +1126,5 @@ START_TEST(vkd3d_api) run_test(test_external_resource_map); run_test(test_external_resource_present_state); run_test(test_formats); + run_test(test_application_info); }

1 0

Józef Kucia : vkd3d: Trace queue in vkd3d_queue_update_sequence_number().
by Alexandre Julliard 13 May '19

13 May '19

Module: vkd3d Branch: master Commit: 0e93657b4b94008b5461398f9b91769a33c44f33 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0e93657b4b94008b5461398… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 10 14:15:23 2019 +0200 vkd3d: Trace queue in vkd3d_queue_update_sequence_number(). 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> --- libs/vkd3d/command.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 606c5bb..e4221c9 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -152,7 +152,8 @@ static void vkd3d_queue_update_sequence_number(struct vkd3d_queue *queue, completed_sequence_number = queue->completed_sequence_number; queue->completed_sequence_number = max(sequence_number, queue->completed_sequence_number); - TRACE("Sequence number %"PRIu64" -> %"PRIu64".\n", completed_sequence_number, queue->completed_sequence_number); + TRACE("Queue %p sequence number %"PRIu64" -> %"PRIu64".\n", + queue, completed_sequence_number, queue->completed_sequence_number); for (i = 0; i < queue->semaphore_count; ++i) {

1 0

Alexandre Julliard : Wine release 4.8
by Alexandre Julliard 10 May '19

10 May '19

Module: website Branch: master Commit: ede4560ec78110a9497ef78d13ec8768ae424935 URL: https://source.winehq.org/git/website.git/?a=commit;h=ede4560ec78110a9497ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 17:45:31 2019 +0200 Wine release 4.8 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019051001.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2019051001.xml b/news/en/2019051001.xml new file mode 100644 index 0000000..aeb0b95 --- /dev/null +++ b/news/en/2019051001.xml @@ -0,0 +1,18 @@ +<news> +<date>May 10, 2019</date> +<title>Wine 4.8 Released</title> +<body> + The Wine development release 4.8 is now available. + <a href="{$root}/announce/4.8">What's new</a> in this release: +<ul> + <li>Support building most programs in PE format.</li> + <li>Unicode data updated to Unicode 12.0.</li> + <li>Support for MSI patch files.</li> + <li>Default to non-PIC builds on i386.</li> + <li>Joystick support improvements.</li> + <li>Asturian locale.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.8.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 4.8.
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: aaf9c833ee1b9dca8cffcb2a60c96093fdd36405 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf9c833ee1b9dca8cffcb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 17:43:42 2019 +0200 Release 4.8. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 800 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 441 insertions(+), 383 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aaf9c833ee1b9dca8cff…

1 0

Tag wine-4.8 : Alexandre Julliard : Release 4.8
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: refs/tags/wine-4.8 Tag: 1055ea4144db7bb51c4d34479f7da3ff5c4e5e37 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1055ea4144db7bb51c4d34479f7… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 10 17:43:42 2019 +0200 Release 4.8

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_stage().
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: be7f65dfdc0ab881ca46c4d7945ebfdd934bfcbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be7f65dfdc0ab881ca46c4d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_stage(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cf164d5..9146b81 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3224,19 +3224,19 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; } -static void context_map_stage(struct wined3d_context *context, DWORD stage, DWORD unit) +static void wined3d_context_gl_map_stage(struct wined3d_context_gl *context_gl, unsigned int stage, unsigned int unit) { - DWORD i = context->rev_tex_unit_map[unit]; - DWORD j = context->tex_unit_map[stage]; + unsigned int i = context_gl->c.rev_tex_unit_map[unit]; + unsigned int j = context_gl->c.tex_unit_map[stage]; TRACE("Mapping stage %u to unit %u.\n", stage, unit); - context->tex_unit_map[stage] = unit; + context_gl->c.tex_unit_map[stage] = unit; if (i != WINED3D_UNMAPPED_STAGE && i != stage) - context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + context_gl->c.tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - context->rev_tex_unit_map[unit] = stage; + context_gl->c.rev_tex_unit_map[unit] = stage; if (j != WINED3D_UNMAPPED_STAGE && j != unit) - context->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; + context_gl->c.rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; } static void context_invalidate_texture_stage(struct wined3d_context *context, DWORD stage) @@ -3304,6 +3304,7 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int i, tex; WORD ffu_map; @@ -3320,7 +3321,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (context->tex_unit_map[i] != i) { - context_map_stage(context, i, i); + wined3d_context_gl_map_stage(context_gl, i, i); context_invalidate_state(context, STATE_SAMPLER(i)); context_invalidate_texture_stage(context, i); } @@ -3337,7 +3338,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (context->tex_unit_map[i] != tex) { - context_map_stage(context, i, tex); + wined3d_context_gl_map_stage(context_gl, i, tex); context_invalidate_state(context, STATE_SAMPLER(i)); context_invalidate_texture_stage(context, i); } @@ -3348,6 +3349,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; @@ -3357,7 +3359,7 @@ static void context_map_psamplers(struct wined3d_context *context, const struct { if (resource_info[i].type && context->tex_unit_map[i] != i) { - context_map_stage(context, i, i); + wined3d_context_gl_map_stage(context_gl, i, i); context_invalidate_state(context, STATE_SAMPLER(i)); if (i < d3d_info->limits.ffp_blend_stages) context_invalidate_texture_stage(context, i); @@ -3395,6 +3397,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { const struct wined3d_shader_resource_info *vs_resource_info = state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_shader_resource_info *ps_resource_info = NULL; const struct wined3d_gl_info *gl_info = context->gl_info; int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; @@ -3417,7 +3420,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { if (context->tex_unit_map[vsampler_idx] != start) { - context_map_stage(context, vsampler_idx, start); + wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_fixed_function_samplers ().
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: e6ad0cd7e351c503a8cbd046b192041eaa2e503f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ad0cd7e351c503a8cbd046… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_fixed_function_samplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9146b81..2758619 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3301,29 +3301,28 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont } } -static void context_map_fixed_function_samplers(struct wined3d_context *context, +static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; unsigned int i, tex; WORD ffu_map; - ffu_map = context->fixed_function_usage_map; + ffu_map = context_gl->c.fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages - || context->lowest_disabled_stage <= d3d_info->limits.ffp_textures) + || context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures) { for (i = 0; ffu_map; ffu_map >>= 1, ++i) { if (!(ffu_map & 1)) continue; - if (context->tex_unit_map[i] != i) + if (context_gl->c.tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(context, STATE_SAMPLER(i)); - context_invalidate_texture_stage(context, i); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); + context_invalidate_texture_stage(&context_gl->c, i); } } return; @@ -3336,11 +3335,11 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (!(ffu_map & 1)) continue; - if (context->tex_unit_map[i] != tex) + if (context_gl->c.tex_unit_map[i] != tex) { wined3d_context_gl_map_stage(context_gl, i, tex); - context_invalidate_state(context, STATE_SAMPLER(i)); - context_invalidate_texture_stage(context, i); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); + context_invalidate_texture_stage(&context_gl->c, i); } ++tex; @@ -3438,6 +3437,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); @@ -3456,7 +3456,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s if (ps) context_map_psamplers(context, state); else - context_map_fixed_function_samplers(context, state); + wined3d_context_gl_map_fixed_function_samplers(context_gl, state); if (vs) context_map_vsamplers(context, ps, state);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_psamplers().
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: 1d0f83711d9462a8054a7556eb80d66fed3ddaf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0f83711d9462a8054a7556… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_psamplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2758619..936ad5b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3346,22 +3346,21 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex } } -static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) +static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) { - if (resource_info[i].type && context->tex_unit_map[i] != i) + if (resource_info[i].type && context_gl->c.tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(context, STATE_SAMPLER(i)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); if (i < d3d_info->limits.ffp_blend_stages) - context_invalidate_texture_stage(context, i); + context_invalidate_texture_stage(&context_gl->c, i); } } } @@ -3454,7 +3453,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s return; if (ps) - context_map_psamplers(context, state); + wined3d_context_gl_map_psamplers(context_gl, state); else wined3d_context_gl_map_fixed_function_samplers(context_gl, state);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_vsamplers().
by Alexandre Julliard 10 May '19

10 May '19

Module: wine Branch: master Commit: 167a0f573831d14dbc7c49cfb8e313aa243a2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=167a0f573831d14dbc7c49cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:22 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_vsamplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 936ad5b..e6b4503 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3391,13 +3391,13 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, return TRUE; } -static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) +static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_gl, + BOOL ps, const struct wined3d_state *state) { const struct wined3d_shader_resource_info *vs_resource_info = state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_shader_resource_info *ps_resource_info = NULL; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; int i; @@ -3414,12 +3414,12 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { while (start >= 0) { - if (context_unit_free_for_vs(context, ps_resource_info, start)) + if (context_unit_free_for_vs(&context_gl->c, ps_resource_info, start)) { - if (context->tex_unit_map[vsampler_idx] != start) + if (context_gl->c.tex_unit_map[vsampler_idx] != start) { wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); - context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(vsampler_idx)); } --start; @@ -3428,7 +3428,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons --start; } - if (context->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) + if (context_gl->c.tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); } } @@ -3458,7 +3458,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s wined3d_context_gl_map_fixed_function_samplers(context_gl, state); if (vs) - context_map_vsamplers(context, ps, state); + wined3d_context_gl_map_vsamplers(context_gl, ps, state); } /* Context activation is done by the caller. */

1 0