February 2024 - Wine-commits

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

20 Feb '24

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 TEXTUREFACTOR constant loading to arbfp_apply_draw_state().
by Alexandre Julliard 20 Feb '24

20 Feb '24

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

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

20 Feb '24

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 texture constant loading to arbfp_apply_draw_state().
by Alexandre Julliard 20 Feb '24

20 Feb '24

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 FFP bumpenv constant loading to arbfp_apply_draw_state().
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 9a614fefafa5c1d22b83c46dfeb2488e8f825ce7 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a614fefafa5c1d22b83c46dfeb248… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 14:23:25 2023 -0600 wined3d/arb: Move FFP bumpenv constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 131 +++++++++----------------------------- 1 file changed, 29 insertions(+), 102 deletions(-)

1 0

David Kahurani : msi: Avoid leaking stream on DB update.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 386dbe1059ba08485696760c267ef06dbed95bad URL: https://gitlab.winehq.org/wine/wine/-/commit/386dbe1059ba08485696760c267ef0… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Thu Jan 18 12:26:14 2024 +0300 msi: Avoid leaking stream on DB update. MSI_RecordGetIStream adds a reference to the stream. This reference should be negated as we are done setting the stream. Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- dlls/msi/select.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/msi/select.c b/dlls/msi/select.c index cfb17f60b62..975d2b8e066 100644 --- a/dlls/msi/select.c +++ b/dlls/msi/select.c @@ -20,6 +20,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -269,6 +271,7 @@ UINT msi_select_update(MSIVIEW *view, MSIRECORD *rec, UINT row) if (MSI_RecordGetIStream(rec, i + 1, &stream)) return ERROR_FUNCTION_FAILED; r = sv->table->ops->set_stream(sv->table, row, col, stream); + IStream_Release(stream); } else if (type & MSITYPE_STRING) {

1 0

Daniel Lehman : msvcrt/tests: Add tests for strcoll/wcscoll.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: 188d880493da37533adcdaa6cac7487766dd204f URL: https://gitlab.winehq.org/wine/wine/-/commit/188d880493da37533adcdaa6cac748… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 18 09:04:51 2024 -0800 msvcrt/tests: Add tests for strcoll/wcscoll. --- dlls/msvcrt/tests/string.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index a14e95704f3..24902d96f27 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4227,6 +4227,89 @@ static void test__tcsncoll(void) } } +static void test__tcscoll(void) +{ + struct test { + const char *locale; + const char *str1; + const char *str2; + int exp; + BOOL todo; + }; + static const struct test tests[] = { + { "English", "ABCD", "ABCD", 0 }, + { "English", "ABC", "ABCD", -1 }, + { "English", "ABCD", "ABC", 1 }, + { "English", "ABCe", "ABCf", -1 }, + { "English", "abcd", "ABCD", -1 }, + { "English", "AB D", "AB-D", 1, TRUE }, + { "English", "AB D", "AB'D", 1, TRUE }, + + { "C", "ABCD", "ABCD", 0 }, + { "C", "ABC", "ABCD", -1 }, + { "C", "ABCD", "ABC", 1 }, + { "C", "ABCe", "ABCf", -1 }, + { "C", "abcd", "ABCD", 1 }, + { "C", "AB D", "AB-D", -1 }, + { "C", "AB D", "AB'D", -1 }, + }; + WCHAR str1W[16]; + WCHAR str2W[16]; + char str1[16]; + char str2[16]; + size_t len; + int i, ret; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + if (!setlocale(LC_ALL, tests[i].locale)) + { + win_skip("%s locale _tcsncoll tests\n", tests[i].locale); + for (; i+1 < ARRAY_SIZE(tests); i++) + if (strcmp(tests[i].locale, tests[i+1].locale)) break; + continue; + } + + memset(str1, 0xee, sizeof(str1)); + strcpy(str1, tests[i].str1); + + memset(str2, 0xff, sizeof(str2)); + strcpy(str2, tests[i].str2); + + ret = strcoll(str1, str2); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else + todo_wine_if(tests[i].todo) + ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + + memset(str1W, 0xee, sizeof(str1W)); + len = mbstowcs(str1W, str1, ARRAY_SIZE(str1W)); + str1W[len] = 0; + + memset(str2W, 0xff, sizeof(str2W)); + len = mbstowcs(str2W, str2, ARRAY_SIZE(str2W)); + str2W[len] = 0; + + ret = wcscoll(str1W, str2W); + if (!tests[i].exp) + ok(!ret, "expected 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else if (tests[i].exp < 0) + ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + else + todo_wine_if(tests[i].todo) + ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", + ret, str1, str2, tests[i].locale); + } +} + static void test__tcsnicoll(void) { struct test { @@ -4854,6 +4937,7 @@ START_TEST(string) test__memicmp_l(); test__strupr(); test__tcsncoll(); + test__tcscoll(); test__tcsnicoll(); test___strncnt(); test_C_locale();

1 0

Daniel Lehman : msvcrt: Use string sort for strcoll/wcscoll.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: fb5302c29b8185e5d09941d5b022344b221bb0ed URL: https://gitlab.winehq.org/wine/wine/-/commit/fb5302c29b8185e5d09941d5b02234… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 18 09:09:10 2024 -0800 msvcrt: Use string sort for strcoll/wcscoll. --- dlls/msvcrt/string.c | 3 ++- dlls/msvcrt/tests/string.c | 7 ++----- dlls/msvcrt/wcs.c | 3 ++- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e6323da3b01..7f7959e81e6 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1162,7 +1162,8 @@ int CDECL _strcoll_l( const char* str1, const char* str2, _locale_t locale ) if(!locinfo->lc_handle[LC_COLLATE]) return strcmp(str1, str2); - return CompareStringA(locinfo->lc_handle[LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; + return CompareStringA(locinfo->lc_handle[LC_COLLATE], SORT_STRINGSORT, + str1, -1, str2, -1)-CSTR_EQUAL; } /********************************************************************* diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 24902d96f27..23f4205e785 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4234,7 +4234,6 @@ static void test__tcscoll(void) const char *str1; const char *str2; int exp; - BOOL todo; }; static const struct test tests[] = { { "English", "ABCD", "ABCD", 0 }, @@ -4242,8 +4241,8 @@ static void test__tcscoll(void) { "English", "ABCD", "ABC", 1 }, { "English", "ABCe", "ABCf", -1 }, { "English", "abcd", "ABCD", -1 }, - { "English", "AB D", "AB-D", 1, TRUE }, - { "English", "AB D", "AB'D", 1, TRUE }, + { "English", "AB D", "AB-D", 1 }, + { "English", "AB D", "AB'D", 1 }, { "C", "ABCD", "ABCD", 0 }, { "C", "ABC", "ABCD", -1 }, @@ -4284,7 +4283,6 @@ static void test__tcscoll(void) ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); else - todo_wine_if(tests[i].todo) ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); @@ -4304,7 +4302,6 @@ static void test__tcscoll(void) ok(ret < 0, "expected < 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); else - todo_wine_if(tests[i].todo) ok(ret > 0, "expected > 0, got %d for %s, %s for locale %s\n", ret, str1, str2, tests[i].locale); } diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index af684e6be2e..1b7bc3e54e0 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1994,7 +1994,8 @@ int CDECL _wcscoll_l(const wchar_t* str1, const wchar_t* str2, _locale_t locale) if(!locinfo->lc_handle[LC_COLLATE]) return wcscmp(str1, str2); - return CompareStringW(locinfo->lc_handle[LC_COLLATE], 0, str1, -1, str2, -1)-CSTR_EQUAL; + return CompareStringW(locinfo->lc_handle[LC_COLLATE], SORT_STRINGSORT, + str1, -1, str2, -1)-CSTR_EQUAL; } /*********************************************************************

1 0

Biswapriyo Nath : include: Add IDirect3DSurface in windows.graphics.directx.direct3d11.idl.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: fe4f7632a7c48251bc3e1792db8babd3074f09aa URL: https://gitlab.winehq.org/wine/wine/-/commit/fe4f7632a7c48251bc3e1792db8bab… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:06:55 2024 +0000 include: Add IDirect3DSurface in windows.graphics.directx.direct3d11.idl. --- include/windows.graphics.directx.direct3d11.idl | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/windows.graphics.directx.direct3d11.idl b/include/windows.graphics.directx.direct3d11.idl index f53140545b0..cf58cee4256 100644 --- a/include/windows.graphics.directx.direct3d11.idl +++ b/include/windows.graphics.directx.direct3d11.idl @@ -32,6 +32,13 @@ namespace Windows.Graphics.DirectX.Direct3D11 { typedef struct Direct3DSurfaceDescription Direct3DSurfaceDescription; interface IDirect3DDevice; + interface IDirect3DSurface; + + declare { + interface Windows.Foundation.Collections.IIterable<Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *>; + interface Windows.Foundation.Collections.IIterator<Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *>; + interface Windows.Foundation.Collections.IVectorView<Windows.Graphics.DirectX.Direct3D11.IDirect3DSurface *>; + } [ contract(Windows.Foundation.UniversalApiContract, 1.0) @@ -62,4 +69,15 @@ namespace Windows.Graphics.DirectX.Direct3D11 { { HRESULT Trim(); } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + uuid(0bf4a146-13c1-4694-bee3-7abf15eaf586) + ] + interface IDirect3DSurface : IInspectable + requires Windows.Foundation.IClosable + { + [propget] HRESULT Description( + [out, retval] Windows.Graphics.DirectX.Direct3D11.Direct3DSurfaceDescription *value); + } }

1 0

Biswapriyo Nath : include: Add BitmapBuffer runtimeclass in windows.graphics.imaging.idl.
by Alexandre Julliard 20 Feb '24

20 Feb '24

Module: wine Branch: master Commit: af4838321e3a2d04ac134b35f6d12aef4b9552ff URL: https://gitlab.winehq.org/wine/wine/-/commit/af4838321e3a2d04ac134b35f6d12a… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Feb 15 15:07:10 2024 +0000 include: Add BitmapBuffer runtimeclass in windows.graphics.imaging.idl. --- include/windows.graphics.imaging.idl | 70 ++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/include/windows.graphics.imaging.idl b/include/windows.graphics.imaging.idl new file mode 100644 index 00000000000..5c6a6c2ea60 --- /dev/null +++ b/include/windows.graphics.imaging.idl @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2024 Biswapriyo Nath + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "asyncinfo.idl"; +import "eventtoken.idl"; +import "windowscontracts.idl"; +import "windows.foundation.idl"; +import "windows.graphics.directx.direct3d11.idl"; +import "windows.storage.streams.idl"; + +namespace Windows.Graphics.Imaging { + typedef struct BitmapPlaneDescription BitmapPlaneDescription; + + interface IBitmapBuffer; + + runtimeclass BitmapBuffer; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + struct BitmapPlaneDescription + { + INT32 StartIndex; + INT32 Width; + INT32 Height; + INT32 Stride; + }; + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Graphics.Imaging.BitmapBuffer), + uuid(a53e04c4-399c-438c-b28f-a63a6b83d1a1) + ] + interface IBitmapBuffer : IInspectable + requires Windows.Foundation.IMemoryBuffer, Windows.Foundation.IClosable + { + HRESULT GetPlaneCount([out, retval] INT32 *value); + HRESULT GetPlaneDescription([in] INT32 index, [out, retval] Windows.Graphics.Imaging.BitmapPlaneDescription *value); + } + + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + marshaling_behavior(agile), + threading(both) + ] + runtimeclass BitmapBuffer + { + [default] interface Windows.Graphics.Imaging.IBitmapBuffer; + interface Windows.Foundation.IMemoryBuffer; + interface Windows.Foundation.IClosable; + } +}

1 0