January 2022 - Wine-devel - list.winehq.org

[PATCH v3 5/6] msvcp140_atomic_wait: Implement __std_close_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 9 ++++++--- 3 files changed, 13 insertions(+), 4 deletions(-)

1 0

[PATCH v3 4/6] msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH v3 3/6] msvcp140_atomic_wait: Implement __std_submit_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-)

1 0

[PATCH v3 2/6] msvcp140_atomic_wait: Implement __std_create_threadpool_work.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ .../msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-)

1 0

[PATCH v3 1/6] msvcp140_atomic_wait/tests: Add test for threadpool_work functions.
by Piotr Caban 28 Jan '22

28 Jan '22

From: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v3: - fix compilation warnings .../tests/msvcp140_atomic_wait.c | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+)

1 0

[PATCH 6/6] wined3d: Use wined3d_buffer_load_location() in wined3d_buffer_get_memory().
by Henri Verbeet 28 Jan '22

28 Jan '22

From: Zebediah Figura <zfigura(a)codeweavers.com> wined3d_buffer_load_location() can handle loading from WINED3D_LOCATION_DISCARDED just fine, so use it instead of duplicating the functionality here. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 224835. v2: Add a commit messages. Otherwise unmodified. dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b42c7bd919a..3d66af3e5e6 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -653,14 +653,12 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co if (locations & WINED3D_LOCATION_DISCARDED) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); - if (!wined3d_buffer_prepare_location(buffer, context, locations)) + if (!wined3d_buffer_load_location(buffer, context, locations)) { data->buffer_object = 0; data->addr = NULL; return 0; } - wined3d_buffer_validate_location(buffer, locations); - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); } if (locations & WINED3D_LOCATION_BUFFER) { -- 2.30.2

1 0

[PATCH 5/6] wined3d: Use wined3d_bit_scan() in shader_arb_load_np2fixup_constants().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 820ba0199e8..54a90a690ac 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -497,27 +497,26 @@ static void shader_arb_load_np2fixup_constants(const struct arb_ps_np2fixup_info const struct wined3d_gl_info *gl_info, const struct wined3d_state *state) { GLfloat np2fixup_constants[4 * WINED3D_MAX_FRAGMENT_SAMPLERS]; - WORD active = fixup->super.active; - UINT i; + uint32_t active = fixup->super.active; + const struct wined3d_texture *tex; + unsigned char idx; + GLfloat *tex_dim; + unsigned int i; if (!active) return; - for (i = 0; active; active >>= 1, ++i) + while (active) { - const struct wined3d_texture *tex = state->textures[i]; - unsigned char idx = fixup->super.idx[i]; - GLfloat *tex_dim = &np2fixup_constants[(idx >> 1) * 4]; - - if (!(active & 1)) - continue; - - if (!tex) + i = wined3d_bit_scan(&active); + if (!(tex = state->textures[i])) { ERR("Nonexistent texture is flagged for NP2 texcoord fixup.\n"); continue; } + idx = fixup->super.idx[i]; + tex_dim = &np2fixup_constants[(idx >> 1) * 4]; if (idx % 2) { tex_dim[2] = tex->pow2_matrix[0]; -- 2.30.2

1 0

[PATCH 4/6] wined3d: Use wined3d_bit_scan() in shader_glsl_generate_fragment_shader().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5a2111e46a7..d10b84a9e05 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7643,7 +7643,7 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; - DWORD map; + uint32_t map; memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.gl_info = gl_info; @@ -7762,11 +7762,10 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); } - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + map = reg_maps->bumpmat; + while (map) { - if (!(map & 1)) - continue; - + i = wined3d_bit_scan(&map); shader_addline(buffer, "uniform mat2 bumpenv_mat%u;\n", i); if (reg_maps->luminanceparams & (1u << i)) @@ -7903,7 +7902,6 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ if (reg_maps->shader_version.major < 3 || args->vp_mode != WINED3D_VP_MODE_SHADER) { unsigned int i; - WORD map = reg_maps->texcoord; if (legacy_syntax) { @@ -7913,19 +7911,18 @@ static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_ shader_addline(buffer, "ffp_varying_specular = gl_SecondaryColor;\n"); } - for (i = 0; map; map >>= 1, ++i) + map = reg_maps->texcoord; + while (map) { - if (map & 1) - { - if (args->pointsprite) - shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); - else if (args->texcoords_initialized & (1u << i)) - shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, - legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); - else - shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); - shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); - } + i = wined3d_bit_scan(&map); + if (args->pointsprite) + shader_addline(buffer, "ffp_texcoord[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", i); + else if (args->texcoords_initialized & (1u << i)) + shader_addline(buffer, "ffp_texcoord[%u] = %s[%u];\n", i, + legacy_syntax ? "gl_TexCoord" : "ffp_varying_texcoord", i); + else + shader_addline(buffer, "ffp_texcoord[%u] = vec4(0.0);\n", i); + shader_addline(buffer, "vec4 T%u = ffp_texcoord[%u];\n", i, i); } if (legacy_syntax) -- 2.30.2

1 0

[PATCH 3/6] wined3d: Use wined3d_bit_scan() in shader_generate_glsl_declarations().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index aa3c8780269..5a2111e46a7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2168,7 +2168,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c const struct wined3d_shader_lconst *lconst; const char *prefix; unsigned int i; - DWORD map; + uint32_t map; if (wined3d_settings.strict_shader_math) shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); @@ -2176,9 +2176,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ - for (i = 0, map = reg_maps->labels; map; map >>= 1, ++i) + map = reg_maps->labels; + while (map) { - if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "void subroutine%u();\n", i); } if (version->type != WINED3D_SHADER_TYPE_PIXEL && version->type != WINED3D_SHADER_TYPE_COMPUTE) @@ -2500,9 +2502,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c } /* Declare address variables */ - for (i = 0, map = reg_maps->address; map; map >>= 1, ++i) + map = reg_maps->address; + while (map) { - if (map & 1) shader_addline(buffer, "ivec4 A%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "ivec4 A%u;\n", i); } /* Declare output register temporaries */ @@ -2517,10 +2521,11 @@ static void shader_generate_glsl_declarations(const struct wined3d_context_gl *c } else if (version->major < 4) { - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + map = reg_maps->temporary; + while (map) { - if (map & 1) - shader_addline(buffer, "vec4 R%u;\n", i); + i = wined3d_bit_scan(&map); + shader_addline(buffer, "vec4 R%u;\n", i); } } -- 2.30.2

1 0

[PATCH 2/6] wined3d: Use wined3d_bit_scan() in shader_glsl_load_constantsB().
by Henri Verbeet 28 Jan '22

28 Jan '22

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1ebd067ae56..aa3c8780269 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1239,16 +1239,15 @@ static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, co } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const GLint locations[WINED3D_MAX_CONSTS_B], const BOOL *constants, WORD constants_set) +static void shader_glsl_load_constants_b(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const BOOL *constants, const GLint locations[WINED3D_MAX_CONSTS_B], uint32_t constants_set) { unsigned int i; struct list* ptr; - for (i = 0; constants_set; constants_set >>= 1, ++i) + while (constants_set) { - if (!(constants_set & 1)) continue; - + i = wined3d_bit_scan(&constants_set); GL_EXTCALL(glUniform1iv(locations[i], 1, &constants[i])); } @@ -1546,8 +1545,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->vs.uniform_i_locations, vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) - shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, - vshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(vshader, gl_info, state->vs_consts_b, + prog->vs.uniform_b_locations, vshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_VS_CLIP_PLANES) { @@ -1699,8 +1698,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) - shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, - pshader->reg_maps.boolean_constants); + shader_glsl_load_constants_b(pshader, gl_info, state->ps_consts_b, + prog->ps.uniform_b_locations, pshader->reg_maps.boolean_constants); if (update_mask & WINED3D_SHADER_CONST_PS_BUMP_ENV) { -- 2.30.2

1 0