July 2019 - Wine-Commits - list.winehq.org

Józef Kucia : vkd3d-common: Move vkd3d_write_mask_is_contiguous() from vkd3d-shader.
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: vkd3d Branch: master Commit: eb340126b615b764254cc230a95575c563976221 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eb340126b615b764254cc23… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:09 2019 +0200 vkd3d-common: Move vkd3d_write_mask_is_contiguous() from vkd3d-shader. 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/private/vkd3d_common.h | 17 ++++++++++ libs/vkd3d-shader/spirv.c | 18 +---------- tests/vkd3d_common.c | 71 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 17 deletions(-) diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h index c696f88..1ac8a63 100644 --- a/include/private/vkd3d_common.h +++ b/include/private/vkd3d_common.h @@ -23,6 +23,8 @@ #include "vkd3d_windows.h" #include <ctype.h> +#include <limits.h> +#include <stdbool.h> #ifndef ARRAY_SIZE # define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x))) @@ -58,6 +60,21 @@ static inline unsigned int vkd3d_popcount(unsigned int v) #endif } +static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) +{ + unsigned int i, j; + + for (i = 0, j = 0; i < sizeof(mask) * CHAR_BIT; ++i) + { + if (mask & (1u << i)) + ++j; + else if (j) + break; + } + + return vkd3d_popcount(mask) == j; +} + /* Undefined for x == 0. */ static inline unsigned int vkd3d_log2i(unsigned int x) { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ee40953..f17c7fa 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3807,22 +3807,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp return id; } -static bool vkd3d_write_mask_is_contiguous(unsigned int mask) -{ - unsigned int i, j; - - assert(mask); - for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) - { - if (mask & (1u << i)) - ++j; - else if (j) - break; - } - - return vkd3d_write_mask_component_count(mask) == j; -} - static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, unsigned int reg_idx, const struct vkd3d_spirv_builtin *builtin, unsigned int *component_count, unsigned int *out_write_mask) @@ -3854,7 +3838,7 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa if (builtin || have_sysval) return true; - if (!vkd3d_write_mask_is_contiguous(write_mask)) + if (!vkd3d_bitmask_is_contiguous(write_mask)) { FIXME("Write mask %#x is non-contiguous.\n", write_mask); return true; diff --git a/tests/vkd3d_common.c b/tests/vkd3d_common.c index 379c8b0..85f1716 100644 --- a/tests/vkd3d_common.c +++ b/tests/vkd3d_common.c @@ -43,7 +43,78 @@ static void test_parse_version(void) check_version("2.3.0", 2, 3); } +static void check_contiguous(uint32_t mask, bool expected_result) +{ + bool r = vkd3d_bitmask_is_contiguous(mask); + ok(r == expected_result, "Got %#x for bitmask %#"PRIx32".\n", r, mask); +} + +static void test_bitmask_is_contiguous(void) +{ + check_contiguous(0x00000000, true); + + check_contiguous(0x00000001, true); + check_contiguous(0x00000002, true); + check_contiguous(0x00000003, true); + check_contiguous(0x00000004, true); + check_contiguous(0x00000005, false); + check_contiguous(0x00000006, true); + check_contiguous(0x00000007, true); + check_contiguous(0x00000008, true); + check_contiguous(0x00000009, false); + check_contiguous(0x0000000a, false); + check_contiguous(0x0000000b, false); + check_contiguous(0x0000000c, true); + check_contiguous(0x0000000d, false); + check_contiguous(0x0000000e, true); + check_contiguous(0x0000000f, true); + + check_contiguous(0x10000000, true); + check_contiguous(0x20000000, true); + check_contiguous(0x30000000, true); + check_contiguous(0x40000000, true); + check_contiguous(0x50000000, false); + check_contiguous(0x60000000, true); + check_contiguous(0x70000000, true); + check_contiguous(0x80000000, true); + check_contiguous(0x90000000, false); + check_contiguous(0xa0000000, false); + check_contiguous(0xb0000000, false); + check_contiguous(0xc0000000, true); + check_contiguous(0xd0000000, false); + check_contiguous(0xe0000000, true); + check_contiguous(0xf0000000, true); + + check_contiguous(0xf000000f, false); + check_contiguous(0x0f0000f0, false); + check_contiguous(0x00f00f00, false); + + check_contiguous(0x000000ff, true); + check_contiguous(0x00000ff0, true); + check_contiguous(0x0000ff00, true); + check_contiguous(0x000ff000, true); + check_contiguous(0x00ff0000, true); + check_contiguous(0xff000000, true); + + check_contiguous(0xfff00000, true); + check_contiguous(0xffff0000, true); + check_contiguous(0xffff0000, true); + check_contiguous(0xfffff000, true); + check_contiguous(0xffffff00, true); + check_contiguous(0xfffffff0, true); + check_contiguous(0xffffffff, true); + + check_contiguous(0x0000001c, true); + check_contiguous(0x000001c0, true); + check_contiguous(0x00001c00, true); + check_contiguous(0x0001c000, true); + check_contiguous(0x001c0000, true); + check_contiguous(0x01c00000, true); + check_contiguous(0x1c000000, true); +} + START_TEST(vkd3d_common) { run_test(test_parse_version); + run_test(test_bitmask_is_contiguous); }

1 0

Józef Kucia : vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for upload buffers.
by Alexandre Julliard July 5, 2019

July 5, 2019

Module: vkd3d Branch: master Commit: 8589935420b4934046911cb1928f0ee89d89912c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8589935420b4934046911cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jul 4 16:41:08 2019 +0200 vkd3d: Set VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT for upload buffers. 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/resource.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f0864ab..9d56330 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -723,16 +723,13 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, | VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; - if (heap_type == D3D12_HEAP_TYPE_DEFAULT) - { - if (device->vk_info.EXT_conditional_rendering) - buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; + if (device->vk_info.EXT_conditional_rendering) + buffer_info.usage |= VK_BUFFER_USAGE_CONDITIONAL_RENDERING_BIT_EXT; - if (device->vk_info.EXT_transform_feedback) - { - buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT - | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; - } + if (heap_type == D3D12_HEAP_TYPE_DEFAULT && device->vk_info.EXT_transform_feedback) + { + buffer_info.usage |= VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_BUFFER_BIT_EXT + | VK_BUFFER_USAGE_TRANSFORM_FEEDBACK_COUNTER_BUFFER_BIT_EXT; } if (heap_type == D3D12_HEAP_TYPE_UPLOAD)

1 0

Marcus Meissner : mshtml: Fixed buffer size to WideCharToMultiByte.
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: 201d13a3c31131f204f89d61be37bf75d58dc6dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=201d13a3c31131f204f89d61… Author: Marcus Meissner <meissner(a)suse.de> Date: Thu Jul 4 17:22:29 2019 +0200 mshtml: Fixed buffer size to WideCharToMultiByte. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 92c79b7..ff7c62b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -566,7 +566,7 @@ static const elem_type_info_t elem_type_infos[] = { static int strncmp_wa(LPCWSTR strw, const char *stra, size_t len) { WCHAR buf[512]; - size_t wlen = MultiByteToWideChar(CP_ACP, 0, stra, len, buf, sizeof(buf)); + size_t wlen = MultiByteToWideChar(CP_ACP, 0, stra, len, buf, ARRAY_SIZE(buf)); return wlen == len && memcmp(strw, buf, len * sizeof(WCHAR)); } @@ -580,7 +580,7 @@ static BOOL is_prefix_wa(const WCHAR *strw, const char *prefix) int len, prefix_len; CHAR buf[512]; - len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL)-1; + len = WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, ARRAY_SIZE(buf), NULL, NULL)-1; prefix_len = lstrlenA(prefix); if(len < prefix_len) return FALSE;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program().
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: 14f1cc73e7a5e6b5a790d6bbe94e4179fb203821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14f1cc73e7a5e6b5a790d6bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:00 2019 +0430 wined3d: Pass a wined3d_context_gl structure to glsl_blitter_get_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0c6b6b6..e8357f8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12803,9 +12803,9 @@ static void glsl_blitter_upload_palette(struct wined3d_glsl_blitter *blitter, /* Context activation is done by the caller. */ static struct glsl_blitter_program *glsl_blitter_get_program(struct wined3d_glsl_blitter *blitter, - struct wined3d_context *context, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) + struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl, BOOL use_colour_key) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct glsl_blitter_program *program; struct glsl_blitter_args args; struct wine_rb_entry *entry; @@ -13052,7 +13052,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli colour_key = NULL; } - if (!(program = glsl_blitter_get_program(glsl_blitter, context, src_texture_gl, !!colour_key))) + if (!(program = glsl_blitter_get_program(glsl_blitter, context_gl, src_texture_gl, !!colour_key))) { ERR("Failed to get blitter program.\n"); return dst_location;

1 0

Henri Verbeet : wined3d: Try harder to reuse the current context.
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: 64d41b3dec0635c56268be64d407ed9bfd8c0695 URL: https://source.winehq.org/git/wine.git/?a=commit;h=64d41b3dec0635c56268be64… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:03 2019 +0430 wined3d: Try harder to reuse the current context. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 4 +--- dlls/wined3d/swapchain.c | 38 -------------------------------------- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 619b5ff..32cbc02 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4215,14 +4215,12 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { struct wined3d_context *current_context = context_get_current(); struct wined3d_context *context; - BOOL swapchain_texture; TRACE("device %p, texture %p, sub_resource_idx %u.\n", device, texture, sub_resource_idx); if (current_context && current_context->destroyed) current_context = NULL; - swapchain_texture = texture && texture->swapchain; if (!texture) { if (current_context @@ -4248,7 +4246,7 @@ struct wined3d_context *wined3d_context_gl_acquire(const struct wined3d_device * { context = current_context; } - else if (swapchain_texture) + else if (texture && !wined3d_resource_is_offscreen(&texture->resource)) { TRACE("Rendering onscreen.\n"); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 69580ad..bf0c308 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -717,25 +717,6 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s *quality = 0; } -static void wined3d_swapchain_cs_init(void *object) -{ - struct wined3d_swapchain *swapchain = object; - struct wined3d_context *context; - - if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) - { - WARN("Failed to acquire context.\n"); - return; - } - - if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && (!swapchain->desc.enable_auto_depth_stencil - || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) - FIXME("Add OpenGL context recreation support.\n"); - - context_release(context); -} - void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device) { /* Subtract 1 for the implicit OpenGL latency. */ @@ -890,25 +871,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 } } - if (!(device->wined3d->flags & WINED3D_NO3D)) - { - if (!(swapchain->context = heap_alloc(sizeof(*swapchain->context)))) - { - ERR("Failed to create the context array.\n"); - hr = E_OUTOFMEMORY; - goto err; - } - - wined3d_cs_init_object(device->cs, wined3d_swapchain_cs_init, swapchain); - wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); - - if (!swapchain->num_contexts) - { - hr = WINED3DERR_NOTAVAILABLE; - goto err; - } - } - if (swapchain->desc.backbuffer_count > 0) { if (!(swapchain->back_buffers = heap_calloc(swapchain->desc.backbuffer_count,

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to set_glsl_shader_program().
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: 48d710dce93aa26b26727c3430995985f08d43c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d710dce93aa26b26727c34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:45:59 2019 +0430 wined3d: Pass a wined3d_context_gl structure to set_glsl_shader_program(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1cd6bb6..0c6b6b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10089,12 +10089,11 @@ static void set_glsl_compute_shader_program(const struct wined3d_context_gl *con } /* Context activation is done by the caller. */ -static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, +static void set_glsl_shader_program(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const struct wined3d_shader *pre_rasterization_shader; const struct ps_np2fixup_info *np2fixup_info = NULL; struct wined3d_shader *hshader, *dshader, *gshader; @@ -10114,7 +10113,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const WORD attribs_map; struct wined3d_string_buffer *tmp_name; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_VERTEX)) && ctx_data->glsl_program) { vs_id = ctx_data->glsl_program->vs.id; vs_list = &ctx_data->glsl_program->vs.shader_entry; @@ -10128,7 +10127,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; - find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, context); + find_vs_compile_args(state, vshader, context_gl->c.stream_info.swizzle_map, &vs_compile_args, &context_gl->c); vs_id = find_glsl_vertex_shader(context_gl, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; } @@ -10137,20 +10136,20 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_vertex_shader *ffp_shader; struct wined3d_ffp_vs_settings settings; - wined3d_ffp_get_vs_settings(context, state, &settings); + wined3d_ffp_get_vs_settings(&context_gl->c, state, &settings); ffp_shader = shader_glsl_find_ffp_vertex_shader(priv, gl_info, &settings); vs_id = ffp_shader->id; vs_list = &ffp_shader->linked_programs; } hshader = state->shader[WINED3D_SHADER_TYPE_HULL]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_HULL)) && ctx_data->glsl_program) hs_id = ctx_data->glsl_program->hs.id; else if (hshader) hs_id = find_glsl_hull_shader(context_gl, priv, hshader); dshader = state->shader[WINED3D_SHADER_TYPE_DOMAIN]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_DOMAIN)) && ctx_data->glsl_program) { ds_id = ctx_data->glsl_program->ds.id; } @@ -10158,12 +10157,12 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ds_compile_args args; - find_ds_compile_args(state, dshader, &args, context); + find_ds_compile_args(state, dshader, &args, &context_gl->c); ds_id = find_glsl_domain_shader(context_gl, priv, dshader, &args); } gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program) + if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program) { gs_id = ctx_data->glsl_program->gs.id; } @@ -10171,7 +10170,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct gs_compile_args args; - find_gs_compile_args(state, gshader, &args, context); + find_gs_compile_args(state, gshader, &args, &context_gl->c); gs_id = find_glsl_geometry_shader(context_gl, priv, gshader, &args); } @@ -10181,7 +10180,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const ps_id = 0; ps_list = NULL; } - else if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) + else if (!(context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) { ps_id = ctx_data->glsl_program->ps.id; ps_list = &ctx_data->glsl_program->ps.shader_entry; @@ -10193,7 +10192,8 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { struct ps_compile_args ps_compile_args; pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - find_ps_compile_args(state, pshader, context->stream_info.position_transformed, &ps_compile_args, context); + find_ps_compile_args(state, pshader, context_gl->c.stream_info.position_transformed, + &ps_compile_args, &context_gl->c); ps_id = find_glsl_fragment_shader(context_gl, &priv->shader_buffer, &priv->string_buffers, pshader, &ps_compile_args, &np2fixup_info); ps_list = &pshader->linked_programs; @@ -10204,7 +10204,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct glsl_ffp_fragment_shader *ffp_shader; struct ffp_frag_settings settings; - gen_ffp_frag_op(context, state, &settings, FALSE); + gen_ffp_frag_op(&context_gl->c, state, &settings, FALSE); ffp_shader = shader_glsl_find_ffp_fragment_shader(priv, &settings, context_gl); ps_id = ffp_shader->id; ps_list = &ffp_shader->linked_programs; @@ -10490,7 +10490,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const { entry->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - shader_glsl_load_samplers(context, priv, program_id, NULL); + shader_glsl_load_samplers(&context_gl->c, priv, program_id, NULL); } for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) @@ -10542,7 +10542,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_shader_program(context, state, priv, ctx_data); + set_glsl_shader_program(context_gl, state, priv, ctx_data); glsl_program = ctx_data->glsl_program; if (glsl_program)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions().
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: 2e49b85f9719f9d517785a7e4ee24e91ac51f43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e49b85f9719f9d517785a7e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:01 2019 +0430 wined3d: Pass a wined3d_context_gl structure to nvts_activate_dimensions(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/nvidia_texture_shader.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index f4b0791..1cffbe4 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -30,9 +30,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* Context activation for state handlers is done by the caller. */ -static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD stage, struct wined3d_context *context) +static void nvts_activate_dimensions(const struct wined3d_state *state, + unsigned int stage, struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture *texture; BOOL bumpmap = FALSE; @@ -41,11 +42,11 @@ static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD st || state->texture_states[stage - 1][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP)) { bumpmap = TRUE; - context->texShaderBumpMap |= (1u << stage); + context_gl->c.texShaderBumpMap |= (1u << stage); } else { - context->texShaderBumpMap &= ~(1u << stage); + context_gl->c.texShaderBumpMap &= ~(1u << stage); } if ((texture = state->textures[stage])) @@ -550,13 +551,9 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s if (tex_used) { if (gl_info->supported[NV_TEXTURE_SHADER2]) - { - nvts_activate_dimensions(state, stage, context); - } + nvts_activate_dimensions(state, stage, context_gl); else - { texture_activate_dimensions(state->textures[stage], gl_info); - } } } @@ -580,7 +577,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s if (usesBump != usedBump) { wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); - nvts_activate_dimensions(state, stage + 1, context); + nvts_activate_dimensions(state, stage + 1, context_gl); wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } } @@ -620,7 +617,7 @@ static void nvts_texdim(struct wined3d_context *context, const struct wined3d_st if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) return; - nvts_activate_dimensions(state, sampler, context); + nvts_activate_dimensions(state, sampler, context_gl); } static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to wined3d_query_create_buffer_object ().
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: d7fd641482eed80f85f194ac5261467208d95258 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7fd641482eed80f85f194ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 4 16:46:02 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_query_create_buffer_object(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 58e757c..b167737 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -37,10 +37,10 @@ static BOOL wined3d_query_buffer_is_valid(struct wined3d_query *query) return query->map_ptr[0] == query->map_ptr[1]; } -static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +static void wined3d_query_create_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint buffer_object; GL_EXTCALL(glGenBuffers(1, &buffer_object)); @@ -75,6 +75,7 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, * instead of from the csmt-thread. */ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; GLsync tmp_sync; @@ -96,7 +97,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s } if (!query->buffer_object) - wined3d_query_create_buffer_object(context, query); + wined3d_query_create_buffer_object(context_gl, query); GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */

1 0

Jacek Caban : server: Fix debug event order in generate_startup_debug_events.
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: 3fded30a10eb47beb48e5afdd10e8356e9a61fe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fded30a10eb47beb48e5afd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jul 4 13:37:38 2019 +0200 server: Fix debug event order in generate_startup_debug_events. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 227949e..361513e 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -290,7 +290,6 @@ static void process_attach_events(struct debugger_context *ctx) if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) /* Vista+ reports ntdll.dll before reporting threads */ { ok(ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx->ev.dwDebugEventCode); - todo_wine ok(ctx->ev.u.LoadDll.lpBaseOfDll == ntdll, "The first reported DLL is not ntdll.dll\n"); next_event(ctx, 0); } @@ -302,7 +301,6 @@ static void process_attach_events(struct debugger_context *ctx) { next_event(ctx, 2000); if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) - todo_wine_if(ctx->ev.u.LoadDll.lpBaseOfDll == ntdll) ok(ctx->ev.u.LoadDll.lpBaseOfDll != ntdll, "ntdll.dll reported out of order\n"); } while (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT || ctx->ev.dwDebugEventCode == UNLOAD_DLL_DEBUG_EVENT); ok(ctx->dll_cnt > 2, "dll_cnt = %d\n", ctx->dll_cnt); diff --git a/server/debugger.c b/server/debugger.c index bff813a..38fe788 100644 --- a/server/debugger.c +++ b/server/debugger.c @@ -516,22 +516,28 @@ void generate_startup_debug_events( struct process *process, client_ptr_t entry struct list *ptr; struct thread *thread, *first_thread = get_process_first_thread( process ); + generate_debug_event( first_thread, CREATE_PROCESS_DEBUG_EVENT, &entry ); + ptr = list_head( &process->dlls ); /* skip main module reported in create process event */ + + /* generate ntdll.dll load event */ + if (ptr && (ptr = list_next( &process->dlls, ptr ))) + { + struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); + generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll ); + } + /* generate creation events */ LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry ) { - if (thread == first_thread) - generate_debug_event( thread, CREATE_PROCESS_DEBUG_EVENT, &entry ); - else + if (thread != first_thread) generate_debug_event( thread, CREATE_THREAD_DEBUG_EVENT, NULL ); } - /* generate dll events (in loading order, i.e. reverse list order) */ - ptr = list_tail( &process->dlls ); - while (ptr != list_head( &process->dlls )) + /* generate dll events (in loading order) */ + while (ptr && (ptr = list_next( &process->dlls, ptr ))) { struct process_dll *dll = LIST_ENTRY( ptr, struct process_dll, entry ); generate_debug_event( first_thread, LOAD_DLL_DEBUG_EVENT, dll ); - ptr = list_prev( &process->dlls, ptr ); } }

1 0

Zebediah Figura : user32: Introduce and use an array_reserve() helper.
by Alexandre Julliard July 4, 2019

July 4, 2019

Module: wine Branch: master Commit: e1d6146fca36179fe9ed8d7bd5326206b2a89dcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1d6146fca36179fe9ed8d7b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 2 18:07:59 2019 -0500 user32: Introduce and use an array_reserve() helper. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 51 +++++++++++++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 56ea249..2949264 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -58,6 +58,33 @@ static CRITICAL_SECTION_DEBUG hid_devices_cs_debug = }; static CRITICAL_SECTION hid_devices_cs = { &hid_devices_cs_debug, -1, 0, 0, 0, 0 }; +static BOOL array_reserve(void **elements, unsigned int *capacity, unsigned int count, unsigned int size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + static void find_hid_devices(void) { static ULONGLONG last_check; @@ -125,26 +152,12 @@ static void find_hid_devices(void) continue; } - if (didx >= hid_devices_max) + if (!array_reserve((void **)&hid_devices, &hid_devices_max, didx + 1, sizeof(*hid_devices))) { - if (hid_devices) - { - hid_devices_max *= 2; - hid_devices = heap_realloc(hid_devices, - hid_devices_max * sizeof(hid_devices[0])); - } - else - { - hid_devices_max = 8; - hid_devices = heap_alloc(hid_devices_max * sizeof(hid_devices[0])); - } - if (!hid_devices) - { - ERR("Failed to allocate memory.\n"); - CloseHandle(file); - heap_free(path); - goto done; - } + ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); + goto done; } TRACE("Found HID device %s.\n", debugstr_w(path));

1 0