February 2024 - Wine-Commits

Zebediah Figura : wined3d/arb: Move texture constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 088da327b557d31fe7d9fca6fd7e3160f3d78b38 URL: https://gitlab.winehq.org/wine/wine/-/commit/088da327b557d31fe7d9fca6fd7e31… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:09:12 2023 -0600 wined3d/arb: Move texture constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 59 ++++++++++++--------------------------- 1 file changed, 18 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7c6c67a395d..fbdbcb4cb6f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5837,35 +5837,6 @@ static unsigned int arbfp_get_emul_mask(const struct wined3d_adapter *adapter) return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } -static void state_tss_constant_arbfp(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) -{ - DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_device *device = context->device; - struct wined3d_color color; - - if (device->shader_backend == &arb_program_shader_backend) - { - struct shader_arb_priv *priv; - - /* Don't load the parameter if we're using an arbfp pixel shader, otherwise we'll overwrite - * application provided constants. - */ - if (use_ps(state)) - return; - - priv = device->shader_priv; - priv->pshader_const_dirty[ARB_FFP_CONST_CONSTANT(stage)] = 1; - priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_CONSTANT(stage) + 1); - } - - wined3d_color_from_d3dcolor(&color, state->texture_states[stage][WINED3D_TSS_CONSTANT]); - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_CONSTANT(stage), &color.r)); - checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_CONSTANT(stage), &color.r)"); -} - static void state_arb_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -5883,7 +5854,9 @@ static void arbfp_update_ps_constants(struct wined3d_context_gl *context_gl, { priv->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; priv->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1; - priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); + for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + priv->pshader_const_dirty[ARB_FFP_CONST_CONSTANT(i)] = 1; + priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_CONSTANT(WINED3D_MAX_FFP_TEXTURES)); } if (state->render_states[WINED3D_RS_SPECULARENABLE]) @@ -5901,6 +5874,13 @@ static void arbfp_update_ps_constants(struct wined3d_context_gl *context_gl, wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, &color.r)); checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR)"); + + for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + { + wined3d_color_from_d3dcolor(&color, state->texture_states[i][WINED3D_TSS_CONSTANT]); + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_CONSTANT(i), &color.r)); + checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_CONSTANT)"); + } } static void set_bumpmat_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -6620,10 +6600,7 @@ static void arbfp_update_shader(struct wined3d_context *context, const struct wi /* Reload fixed function constants since they collide with the * pixel shader constants. */ for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) - { set_bumpmat_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_BUMPENV_MAT00)); - state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); - } context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS | WINED3D_SHADER_CONST_FFP_COLOR_KEY; } context->last_was_pshader = FALSE; @@ -6828,16 +6805,16 @@ static const struct wined3d_state_entry_template arbfp_fragmentstate_template[] {STATE_TEXTURESTAGE(5,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(5,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(6,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(6,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), {STATE_TEXTURESTAGE(7,WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS), textransform}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(0, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(0, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(1, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(1, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(2, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(2, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(3, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(3, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(4, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(4, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(5, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(5, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(6, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(6, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, - {STATE_TEXTURESTAGE(7, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(7, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_arb_specularenable}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(0, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(1, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(2, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(3, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(4, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(5, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(6, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_TEXTURESTAGE(7, WINED3D_TSS_CONSTANT), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SHADEMODE), { STATE_RENDER(WINED3D_RS_SHADEMODE), state_shademode }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Zebediah Figura : wined3d/arb: Move SPECULARENABLE constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 6c1c917750ebefe3107abd62a4e66a175662ed4e URL: https://gitlab.winehq.org/wine/wine/-/commit/6c1c917750ebefe3107abd62a4e66a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 13:52:05 2023 -0600 wined3d/arb: Move SPECULARENABLE constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5025102f15f..fc96c4d517f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5896,22 +5896,17 @@ static void state_tss_constant_arbfp(struct wined3d_context *context, static void state_arb_specularenable(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; +} + +static void arbfp_update_ps_constants(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, struct shader_arb_priv *priv) +{ const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_device *device = context->device; float col[4]; - if (device->shader_backend == &arb_program_shader_backend) + if (context_gl->c.device->shader_backend == &arb_program_shader_backend) { - struct shader_arb_priv *priv; - - /* Don't load the parameter if we're using an arbfp pixel shader, otherwise we'll overwrite - * application provided constants. - */ - if (use_ps(state)) - return; - - priv = device->shader_priv; priv->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); } @@ -6655,7 +6650,7 @@ static void arbfp_update_shader(struct wined3d_context *context, const struct wi state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); } state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); - state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; color_key_arbfp(context, state, STATE_COLOR_KEY); } context->last_was_pshader = FALSE; @@ -6885,7 +6880,10 @@ static void arbfp_free_context_data(struct wined3d_context *context) static void arbfp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct shader_arb_priv *priv = context->device->shader_priv; + uint32_t constant_update_mask; if (use_ps(state)) { @@ -6899,6 +6897,12 @@ static void arbfp_apply_draw_state(struct wined3d_context *context, const struct if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) arbfp_update_shader(context, state); + + /* Note that arbfp_update_shader() may set the constant update mask. */ + constant_update_mask = context->constant_update_mask; + + if (constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) + arbfp_update_ps_constants(context_gl, state, priv); } const struct wined3d_fragment_pipe_ops arbfp_fragment_pipeline =

1 0

Zebediah Figura : wined3d/arb: Move color key constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 0f7ef9f47a16dae6e4a56f1b736a7a497df3474c URL: https://gitlab.winehq.org/wine/wine/-/commit/0f7ef9f47a16dae6e4a56f1b736a7a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:05:34 2023 -0600 wined3d/arb: Move color key constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4378180f61f..7c6c67a395d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5998,26 +5998,22 @@ static void alpha_test_arbfp(struct wined3d_context *context, const struct wined } static void color_key_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_COLOR_KEY; +} + +static void arbfp_update_color_key(const struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, struct shader_arb_priv *priv) { const struct wined3d_texture *texture = wined3d_state_get_ffp_texture(state, 0); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_device *device = context->device; struct wined3d_color float_key[2]; if (!texture) return; - if (device->shader_backend == &arb_program_shader_backend) + if (context_gl->c.device->shader_backend == &arb_program_shader_backend) { - struct shader_arb_priv *priv; - - /* Don't load the parameter if we're using an arbfp pixel shader, - * otherwise we'll overwrite application provided constants. */ - if (use_ps(state)) - return; - - priv = device->shader_priv; priv->pshader_const_dirty[ARB_FFP_CONST_COLOR_KEY_LOW] = 1; priv->pshader_const_dirty[ARB_FFP_CONST_COLOR_KEY_HIGH] = 1; priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_COLOR_KEY_HIGH + 1); @@ -6628,8 +6624,7 @@ static void arbfp_update_shader(struct wined3d_context *context, const struct wi set_bumpmat_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_BUMPENV_MAT00)); state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); } - context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - color_key_arbfp(context, state, STATE_COLOR_KEY); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS | WINED3D_SHADER_CONST_FFP_COLOR_KEY; } context->last_was_pshader = FALSE; } @@ -6881,6 +6876,9 @@ static void arbfp_apply_draw_state(struct wined3d_context *context, const struct if (constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) arbfp_update_ps_constants(context_gl, state, priv); + + if (constant_update_mask & WINED3D_SHADER_CONST_FFP_COLOR_KEY) + arbfp_update_color_key(context_gl, state, priv); } const struct wined3d_fragment_pipe_ops arbfp_fragment_pipeline =

1 0

Zebediah Figura : wined3d/arb: Move TEXTUREFACTOR constant loading to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 8faac9b94a5d64fd9ae9dd242e4203da54abb394 URL: https://gitlab.winehq.org/wine/wine/-/commit/8faac9b94a5d64fd9ae9dd242e4203… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:01:58 2023 -0600 wined3d/arb: Move TEXTUREFACTOR constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index fc96c4d517f..4378180f61f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5837,33 +5837,6 @@ static unsigned int arbfp_get_emul_mask(const struct wined3d_adapter *adapter) return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } -static void state_texfactor_arbfp(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_device *device = context->device; - struct wined3d_color color; - - if (device->shader_backend == &arb_program_shader_backend) - { - struct shader_arb_priv *priv; - - /* Don't load the parameter if we're using an arbfp pixel shader, - * otherwise we'll overwrite application provided constants. */ - if (use_ps(state)) - return; - - priv = device->shader_priv; - priv->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1; - priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_TFACTOR + 1); - } - - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); - GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, &color.r)); - checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, &color.r)"); -} - static void state_tss_constant_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -5903,11 +5876,13 @@ static void arbfp_update_ps_constants(struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct shader_arb_priv *priv) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_color color; float col[4]; if (context_gl->c.device->shader_backend == &arb_program_shader_backend) { priv->pshader_const_dirty[ARB_FFP_CONST_SPECULAR_ENABLE] = 1; + priv->pshader_const_dirty[ARB_FFP_CONST_TFACTOR] = 1; priv->highest_dirty_ps_const = max(priv->highest_dirty_ps_const, ARB_FFP_CONST_SPECULAR_ENABLE + 1); } @@ -5922,6 +5897,10 @@ static void arbfp_update_ps_constants(struct wined3d_context_gl *context_gl, } GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_SPECULAR_ENABLE, col)); checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_SPECULAR_ENABLE, col)"); + + wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); + GL_EXTCALL(glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR, &color.r)); + checkGLcall("glProgramEnvParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, ARB_FFP_CONST_TFACTOR)"); } static void set_bumpmat_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -6649,7 +6628,6 @@ static void arbfp_update_shader(struct wined3d_context *context, const struct wi set_bumpmat_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_BUMPENV_MAT00)); state_tss_constant_arbfp(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); } - state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; color_key_arbfp(context, state, STATE_COLOR_KEY); } @@ -6712,7 +6690,6 @@ static void textransform(struct wined3d_context *context, const struct wined3d_s static const struct wined3d_state_entry_template arbfp_fragmentstate_template[] = { - {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, @@ -6865,6 +6842,7 @@ static const struct wined3d_state_entry_template arbfp_fragmentstate_template[] {STATE_TEXTURESTAGE(6, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(6, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(7, WINED3D_TSS_CONSTANT), { STATE_TEXTURESTAGE(7, WINED3D_TSS_CONSTANT), state_tss_constant_arbfp}, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_arb_specularenable}, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SHADEMODE), { STATE_RENDER(WINED3D_RS_SHADEMODE), state_shademode }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Alexandre Julliard : ntdll/tests: Move unwinding tests to a separate file.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 510fc64140de80037a121cfda2528e911ef1c1e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/510fc64140de80037a121cfda2528e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 12:47:01 2024 +0100 ntdll/tests: Move unwinding tests to a separate file. --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/exception.c | 3236 +----------------------------------------- dlls/ntdll/tests/unwind.c | 3220 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 3258 insertions(+), 3199 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Run dynamic unwind tests on ARM platforms.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: ec5e33cad6e30b9e6e3fd7b048c19c476f6c75ce URL: https://gitlab.winehq.org/wine/wine/-/commit/ec5e33cad6e30b9e6e3fd7b048c19c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 14:03:48 2024 +0100 ntdll/tests: Run dynamic unwind tests on ARM platforms. --- dlls/ntdll/tests/unwind.c | 89 +++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 41 deletions(-)

1 0

Alexandre Julliard : ntdll/tests: Run RtlVirtualUnwind tests on ARM64EC.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: f0584966c252cfe2a84c5f0ca7858e9063bc034d URL: https://gitlab.winehq.org/wine/wine/-/commit/f0584966c252cfe2a84c5f0ca7858e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 17:16:30 2024 +0100 ntdll/tests: Run RtlVirtualUnwind tests on ARM64EC. --- dlls/ntdll/tests/unwind.c | 295 +++++++++++++++++++++++++++------------------- 1 file changed, 171 insertions(+), 124 deletions(-)

1 0

Eric Pouech : dbghelp: Don't expected a fixed number of substreams in DBI header (PDB).
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 552bc893e17a0e046c2f598e0f18dc31850a8199 URL: https://gitlab.winehq.org/wine/wine/-/commit/552bc893e17a0e046c2f598e0f18dc… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Dec 12 08:34:10 2023 +0100 dbghelp: Don't expected a fixed number of substreams in DBI header (PDB). MSC no longer emits a fixed number of substreams (depending on version of PDB file), but can emit less. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 30 ++++++++++-------------------- dlls/dbghelp/tests/path.c | 6 +++--- include/wine/mscvpdb.h | 25 ------------------------- 3 files changed, 13 insertions(+), 48 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 26e921f7a0f..12ed93380b6 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3823,7 +3823,8 @@ static BOOL pdb_process_internal(const struct process* pcs, struct codeview_type_parse ipi_ctp; BYTE* file; int header_size = 0; - PDB_STREAM_INDEXES* psi; + unsigned num_sub_streams; + const unsigned short* sub_streams; BOOL ipi_ok; pdb_convert_symbols_header(&symbols, &header_size, symbols_image); @@ -3839,25 +3840,14 @@ static BOOL pdb_process_internal(const struct process* pcs, symbols.version, symbols.version); } - switch (symbols.stream_index_size) - { - case 0: - case sizeof(PDB_STREAM_INDEXES_OLD): - /* no fpo ext stream in this case */ - break; - case sizeof(PDB_STREAM_INDEXES): - case sizeof(PDB_STREAM_INDEXES) + 2: - psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + - symbols.module_size + symbols.sectcontrib_size + - symbols.segmap_size + symbols.srcmodule_size + - symbols.pdbimport_size + symbols.unknown2_size); - pdb_file->fpoext_stream = psi->FPO_EXT; - break; - default: - FIXME("Unknown PDB_STREAM_INDEXES size (%u)\n", symbols.stream_index_size); - pdb_free(symbols_image); - return FALSE; - } + num_sub_streams = symbols.stream_index_size / sizeof(sub_streams[0]); + sub_streams = (const unsigned short*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + + symbols.module_size + symbols.sectcontrib_size + + symbols.segmap_size + symbols.srcmodule_size + + symbols.pdbimport_size + symbols.unknown2_size); + if (PDB_SIDX_FPO < num_sub_streams) + pdb_file->fpoext_stream = sub_streams[PDB_SIDX_FPO]; + files_image = pdb_read_strings(pdb_file); pdb_process_symbol_imports(pcs, msc_dbg, &symbols, symbols_image, image, diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index fb7c103d845..781df3dd771 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -587,7 +587,7 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag .hash_records_size = 0, .unknown = 0 }; - PDB_STREAM_INDEXES pddt = {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, }; + unsigned short dbi_substream[] = {0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, }; char unknown[] = { 0xfe, 0xef, 0xfe, 0xef, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, @@ -650,7 +650,7 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag DBI.unknown2_size = stream->size - mark; mark = stream->size; - pdb_append_to_stream(stream, &pddt, sizeof(pddt)); + pdb_append_to_stream(stream, dbi_substream, sizeof(dbi_substream)); DBI.stream_index_size = stream->size - mark; stream = pdb_add_stream(&pdb, NULL, &IPI, sizeof(IPI)); /* always stream #4 */ @@ -658,7 +658,7 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag stream = pdb_add_stream(&pdb, &DBI.global_hash_stream, &GHASH, sizeof(GHASH)); stream = pdb_add_stream(&pdb, &DBI.gsym_stream, NULL, 0); - stream = pdb_add_stream(&pdb, &pddt.sections_stream, &ro_section, sizeof(ro_section)); + stream = pdb_add_stream(&pdb, &dbi_substream[PDB_SIDX_SECTIONS], &ro_section, sizeof(ro_section)); hfile = CreateFileW(pdb_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); ok(hfile != INVALID_HANDLE_VALUE, "failed to create %ls err %lu\n", pdb_name, GetLastError()); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index c0f9c70a4e1..08353f11811 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2576,31 +2576,6 @@ enum PDB_STREAM_INDEX PDB_SIDX_FPOEXT = 9 }; -typedef struct -{ - unsigned short FPO; - unsigned short unk0; - unsigned short unk1; - unsigned short unk2; - unsigned short unk3; - unsigned short sections_stream; -} PDB_STREAM_INDEXES_OLD; - -typedef struct -{ - unsigned short FPO; - unsigned short unk0; - unsigned short unk1; - unsigned short unk2; - unsigned short unk3; - unsigned short sections_stream; - unsigned short unk4; - unsigned short unk5; - unsigned short unk6; - unsigned short FPO_EXT; - unsigned short unk7; -} PDB_STREAM_INDEXES; - typedef struct _PDB_FPO_DATA { unsigned int start;

1 0

Eric Pouech : winedump: Don't expect a fixed number of substreams in DBI header (PDB).
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: dee3be21a3d4ad0ce12e5fae521f3d5370a84db6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dee3be21a3d4ad0ce12e5fae521f3d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Dec 12 08:14:20 2023 +0100 winedump: Don't expect a fixed number of substreams in DBI header (PDB). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- include/wine/mscvpdb.h | 8 ++++++ tools/winedump/pdb.c | 73 +++++++++++++++----------------------------------- 2 files changed, 29 insertions(+), 52 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 3502e0faed0..c0f9c70a4e1 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2568,6 +2568,14 @@ typedef struct _PDB_SYMBOLS unsigned int resvd4; } PDB_SYMBOLS, *PPDB_SYMBOLS; +/* FIXME other entries are unknown */ +enum PDB_STREAM_INDEX +{ + PDB_SIDX_FPO, + PDB_SIDX_SECTIONS = 5, + PDB_SIDX_FPOEXT = 9 +}; + typedef struct { unsigned short FPO; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index c028f2df2b6..dc59695a826 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -489,10 +489,8 @@ static void pdb_dump_symbols(struct pdb_reader* reader) unsigned char* modimage; const char* file; char tcver[32]; - PDB_STREAM_INDEXES sidx; - - sidx.FPO = sidx.unk0 = sidx.unk1 = sidx.unk2 = sidx.unk3 = sidx.sections_stream = - sidx.unk4 = sidx.unk5 = sidx.unk6 = sidx.FPO_EXT = sidx.unk7 = -1; + const unsigned short* sub_streams = NULL; + unsigned num_sub_streams = 0; symbols = reader->read_stream(reader, 3); if (!symbols) return; @@ -736,52 +734,20 @@ static void pdb_dump_symbols(struct pdb_reader* reader) } if (symbols->stream_index_size && globals_dump_sect("image")) { + const char* sub_stream_names[] = {"FPO", NULL, NULL, NULL, NULL, "Sections stream", NULL, NULL, NULL, "FPO-ext"}; + int i; + printf("\t------------stream indexes--------------\n"); - switch (symbols->stream_index_size) + num_sub_streams = symbols->stream_index_size / sizeof(sub_streams[0]); + sub_streams = (const unsigned short*)((const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + + symbols->pdbimport_size + symbols->unknown2_size); + for (i = 0; i < num_sub_streams; i++) { - case sizeof(PDB_STREAM_INDEXES_OLD): - /* PDB_STREAM_INDEXES is a superset of PDB_STREAM_INDEX_OLD - * FIXME: to be confirmed when all fields are fully understood - */ - memcpy(&sidx, - (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + - symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + - symbols->pdbimport_size + symbols->unknown2_size, - sizeof(PDB_STREAM_INDEXES_OLD)); - printf("\tFPO: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\tSections stream: %04x\n", - sidx.FPO, sidx.unk0, sidx.unk1, sidx.unk2, sidx.unk3, - sidx.sections_stream); - break; - case sizeof(PDB_STREAM_INDEXES): - case sizeof(PDB_STREAM_INDEXES) + 2: - memcpy(&sidx, - (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + - symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + - symbols->pdbimport_size + symbols->unknown2_size, - sizeof(sidx)); - printf("\tFPO: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\tSection stream: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\t?: %04x\n" - "\tFPO-ext: %04x\n" - "\t?: %04x\n", - sidx.FPO, sidx.unk0, sidx.unk1, sidx.unk2, sidx.unk3, - sidx.sections_stream, sidx.unk4, sidx.unk5, sidx.unk6, sidx.FPO_EXT, - sidx.unk7); - break; - default: - printf("unexpected size for stream index %d\n", symbols->stream_index_size); - break; + const char* name = "?"; + if (i < ARRAY_SIZE(sub_stream_names) && sub_stream_names[i]) + name = sub_stream_names[i]; + printf("\t%s:%.*s%04x\n", name, (int)(21 - strlen(name)), "", sub_streams[i]); } } @@ -835,11 +801,14 @@ static void pdb_dump_symbols(struct pdb_reader* reader) dump_global_symbol(reader, symbols->global_hash_stream); dump_public_symbol(reader, symbols->public_stream); - if (globals_dump_sect("image")) + if (sub_streams && globals_dump_sect("image")) { - pdb_dump_fpo(reader, sidx.FPO); - pdb_dump_fpo_ext(reader, sidx.FPO_EXT); - pdb_dump_sections(reader, sidx.sections_stream); + if (PDB_SIDX_FPO < num_sub_streams) + pdb_dump_fpo(reader, sub_streams[PDB_SIDX_FPO]); + if (PDB_SIDX_FPOEXT < num_sub_streams) + pdb_dump_fpo_ext(reader, sub_streams[PDB_SIDX_FPOEXT]); + if (PDB_SIDX_SECTIONS < num_sub_streams) + pdb_dump_sections(reader, sub_streams[PDB_SIDX_SECTIONS]); } free(symbols);

1 0

Shaun Ren : sapi: Implement ISpeechVoice::GetIDsOfNames.
by Alexandre Julliard Feb. 20, 2024

Feb. 20, 2024

Module: wine Branch: master Commit: 9d044669f3a50fa154cbe4d1d804dee319dbbf09 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d044669f3a50fa154cbe4d1d804de… Author: Shaun Ren <shaun.ren(a)linux.com> Date: Fri Feb 16 20:04:41 2024 -0500 sapi: Implement ISpeechVoice::GetIDsOfNames. --- dlls/sapi/tests/tts.c | 7 +++++++ dlls/sapi/tts.c | 13 ++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index 111d0a0bc6c..7566bd5c5cb 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -418,6 +418,7 @@ static void test_spvoice(void) { static const WCHAR test_token_id[] = L"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Speech\\Voices\\Tokens\\WinetestVoice"; static const WCHAR test_text[] = L"Hello! This is a test sentence."; + static const WCHAR *get_voices = L"GetVoices"; ISpVoice *voice; IUnknown *dummy; @@ -438,6 +439,7 @@ static void test_spvoice(void) UINT info_count; ITypeInfo *typeinfo; TYPEATTR *typeattr; + DISPID dispid; HRESULT hr; if (waveOutGetNumDevs() == 0) { @@ -732,6 +734,11 @@ static void test_spvoice(void) ITypeInfo_ReleaseTypeAttr(typeinfo, typeattr); ITypeInfo_Release(typeinfo); + dispid = 0xdeadbeef; + hr = ISpeechVoice_GetIDsOfNames(speech_voice, &IID_NULL, (WCHAR **)&get_voices, 1, 0x409, &dispid); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(dispid == DISPID_SVGetVoices, "got %#lx.\n", dispid); + ISpeechVoice_Release(speech_voice); done: diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 8e597252b31..d08b0c5de22 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -195,11 +195,18 @@ static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT index, } static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names, - UINT count, LCID lcid, DISPID *dispid) + UINT count, LCID lcid, DISPID *dispids) { - FIXME("(%p, %s, %p, %u, %lu, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + ITypeInfo *typeinfo; + HRESULT hr; - return E_NOTIMPL; + TRACE("(%p, %s, %p, %u, %#lx, %p).\n", iface, debugstr_guid(riid), names, count, lcid, dispids); + + if (FAILED(hr = get_typeinfo(ISpeechVoice_tid, &typeinfo))) + return hr; + hr = ITypeInfo_GetIDsOfNames(typeinfo, names, count, dispids); + ITypeInfo_Release(typeinfo); + return hr; } static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, REFIID riid, LCID lcid,

1 0