February 2024 - Wine-Commits

Zebediah Figura : wined3d: Make the scissor state dynamic.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: a9c9d49a12193a52f25ad7787dbaeab71b8c3ee2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9c9d49a12193a52f25ad7787dbaea… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 27 18:23:16 2023 -0500 wined3d: Make the scissor state dynamic. --- dlls/wined3d/context_vk.c | 88 ++++++++++++++++++++--------------------------- dlls/wined3d/wined3d_vk.h | 1 - 2 files changed, 37 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 38d5c6ed03b..38f1795c063 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1880,6 +1880,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); context_invalidate_state(&context_vk->c, STATE_STENCIL_REF); context_invalidate_state(&context_vk->c, STATE_VIEWPORT); + context_invalidate_state(&context_vk->c, STATE_SCISSORRECT); VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); @@ -2038,9 +2039,6 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if ((ret = wined3d_uint32_compare(a->ts_desc.patchControlPoints, b->ts_desc.patchControlPoints))) return ret; - if ((ret = memcmp(a->scissors, b->scissors, sizeof(a->scissors)))) - return ret; - if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) return ret; @@ -2093,6 +2091,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context VK_DYNAMIC_STATE_BLEND_CONSTANTS, VK_DYNAMIC_STATE_STENCIL_REFERENCE, VK_DYNAMIC_STATE_VIEWPORT, + VK_DYNAMIC_STATE_SCISSOR, }; key = &context_vk->graphics.pipeline_key_vk; @@ -2117,7 +2116,6 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->ts_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; - key->vp_desc.pScissors = key->scissors; key->vp_desc.viewportCount = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); key->vp_desc.scissorCount = key->vp_desc.viewportCount; @@ -2455,52 +2453,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) - || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) - { - for (i = 0; i < key->vp_desc.viewportCount; ++i) - { - const struct wined3d_viewport *src_viewport = &state->viewports[i]; - VkRect2D *scissor = &key->scissors[i]; - - if (i >= state->viewport_count) - { - memset(scissor, 0, sizeof(*scissor)); - continue; - } - - if (state->rasterizer_state && state->rasterizer_state->desc.scissor) - { - const RECT *r = &state->scissor_rects[i]; - - if (i >= state->scissor_rect_count) - { - memset(scissor, 0, sizeof(*scissor)); - continue; - } - - scissor->offset.x = r->left; - scissor->offset.y = r->top; - scissor->extent.width = r->right - r->left; - scissor->extent.height = r->bottom - r->top; - } - else - { - scissor->offset.x = src_viewport->x; - scissor->offset.y = src_viewport->y; - scissor->extent.width = src_viewport->width; - scissor->extent.height = src_viewport->height; - } - /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ - if (scissor->offset.x < 0) - scissor->offset.x = 0; - if (scissor->offset.y < 0) - scissor->offset.y = 0; - } - - update = true; - } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY))) { @@ -3773,16 +3725,20 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND_FACTOR)) VK_CALL(vkCmdSetBlendConstants(vk_command_buffer, &state->blend_factor.r)); - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT)) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) + || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) { unsigned int viewport_count = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); VkViewport viewports[WINED3D_MAX_VIEWPORTS]; + VkRect2D scissors[WINED3D_MAX_VIEWPORTS]; unsigned int i; for (i = 0; i < viewport_count; ++i) { const struct wined3d_viewport *src_viewport = &state->viewports[i]; VkViewport *viewport = &viewports[i]; + VkRect2D *scissor = &scissors[i]; if (i >= state->viewport_count) { @@ -3792,6 +3748,7 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c viewport->height = 1.0f; viewport->minDepth = 0.0f; viewport->maxDepth = 0.0f; + memset(scissor, 0, sizeof(*scissor)); continue; } @@ -3802,11 +3759,40 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c viewport->minDepth = src_viewport->min_z; viewport->maxDepth = src_viewport->max_z; + if (state->rasterizer_state && state->rasterizer_state->desc.scissor) + { + const RECT *r = &state->scissor_rects[i]; + + if (i >= state->scissor_rect_count) + { + memset(scissor, 0, sizeof(*scissor)); + continue; + } + + scissor->offset.x = r->left; + scissor->offset.y = r->top; + scissor->extent.width = r->right - r->left; + scissor->extent.height = r->bottom - r->top; + } + else + { + scissor->offset.x = src_viewport->x; + scissor->offset.y = src_viewport->y; + scissor->extent.width = src_viewport->width; + scissor->extent.height = src_viewport->height; + } + + /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ + if (scissor->offset.x < 0) + scissor->offset.x = 0; + if (scissor->offset.y < 0) + scissor->offset.y = 0; viewport->y += viewport->height; viewport->height = -viewport->height; } VK_CALL(vkCmdSetViewport(vk_command_buffer, 0, viewport_count, viewports)); + VK_CALL(vkCmdSetScissor(vk_command_buffer, 0, viewport_count, scissors)); } memset(context_vk->c.dirty_graphics_states, 0, sizeof(context_vk->c.dirty_graphics_states)); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 04264e6db84..00f57a9496e 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -497,7 +497,6 @@ struct wined3d_graphics_pipeline_key_vk VkVertexInputBindingDivisorDescriptionEXT divisors[MAX_ATTRIBS]; VkVertexInputAttributeDescription attributes[MAX_ATTRIBS]; VkVertexInputBindingDescription bindings[MAX_ATTRIBS]; - VkRect2D scissors[WINED3D_MAX_VIEWPORTS]; VkSampleMask sample_mask; VkPipelineColorBlendAttachmentState blend_attachments[WINED3D_MAX_RENDER_TARGETS];

1 0

Alexandre Julliard : rpcrt4/tests: Fix some malloc/HeapAlloc mismatches.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 18bdd435f12714859794da49ba52806f37a120f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/18bdd435f12714859794da49ba5280… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 16 14:23:28 2024 +0100 rpcrt4/tests: Fix some malloc/HeapAlloc mismatches. Fixes regressions caused by a38e05636df9596ff3e41301c771fe93523808f1. --- dlls/rpcrt4/tests/cstub.c | 4 ++-- dlls/rpcrt4/tests/ndr_marshall.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 266d34c3c7f..12ea13363b0 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -62,13 +62,13 @@ static int my_free_called; static void * CALLBACK my_alloc(SIZE_T size) { my_alloc_called++; - return NdrOleAllocate(size); + return malloc(size); } static void CALLBACK my_free(void *ptr) { my_free_called++; - NdrOleFree(ptr); + free(ptr); } typedef struct _MIDL_PROC_FORMAT_STRING diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index ba9ceaf18fb..d86f3b0556e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -41,13 +41,13 @@ static int my_free_called; static void * CALLBACK my_alloc(SIZE_T size) { my_alloc_called++; - return NdrOleAllocate(size); + return malloc(size); } static void CALLBACK my_free(void *ptr) { my_free_called++; - NdrOleFree(ptr); + free(ptr); } static const MIDL_STUB_DESC Object_StubDesc = @@ -2222,7 +2222,7 @@ static void test_nonconformant_string(void) ok(mem != mem_orig, "mem not alloced\n"); ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); - NdrOleFree(mem); + free(mem); my_alloc_called = 0; mem = mem_orig; @@ -2295,7 +2295,7 @@ static void test_nonconformant_string(void) ok(mem != mem_orig, "mem not alloced\n"); ok(mem != StubMsg.BufferStart + 8, "mem pointing at buffer\n"); ok(my_alloc_called == 1, "alloc called %d\n", my_alloc_called); - NdrOleFree(mem); + free(mem); my_alloc_called = 0; mem = mem_orig;

1 0

Zebediah Figura : wined3d/arb: Move fragment program compilation from fragment_prog_arbfp() to arbfp_apply_draw_state().
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: fabf45a9d87a24090b11b158ab06218c562ea814 URL: https://gitlab.winehq.org/wine/wine/-/commit/fabf45a9d87a24090b11b158ab0621… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 22:22:57 2023 -0600 wined3d/arb: Move fragment program compilation from fragment_prog_arbfp() to arbfp_apply_draw_state(). --- dlls/wined3d/arb_program_shader.c | 123 +++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 9ca6dd8ff46..5025102f15f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4665,6 +4665,8 @@ static void shader_arb_update_graphics_shaders(struct shader_arb_priv *priv, if (ps->load_local_constsF) context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; + + context->last_was_pshader = TRUE; } else { @@ -5739,23 +5741,6 @@ struct arbfp_ffp_desc GLuint shader; }; -/* Context activation is done by the caller. */ -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; - - if (!use_ps(state)) - { - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); - } - else - { - gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); - checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - } -} - static void arbfp_disable(const struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; @@ -6615,67 +6600,65 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } static void fragment_prog_arbfp(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + if (use_ps(state) && !context->last_was_pshader && context->device->shader_backend == &arb_program_shader_backend) + { + /* Reload pixel shader constants since they collide with the + * fixed function constants. */ + context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; + } + + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; +} + +static void arbfp_update_shader(struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context_gl->gl_info; const struct wined3d_device *device = context->device; struct shader_arb_priv *priv = device->fragment_priv; - BOOL use_pshader = use_ps(state); struct ffp_frag_settings settings; const struct arbfp_ffp_desc *desc; unsigned int i; - TRACE("context %p, state %p, state_id %#lx.\n", context, state, state_id); - - if (!use_pshader) + /* Find or create a shader implementing the fixed function pipeline + * settings, then activate it. */ + wined3d_ffp_get_fs_settings(context, state, &settings, FALSE); + desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); + if (!desc) { - /* Find or create a shader implementing the fixed function pipeline - * settings, then activate it. */ - wined3d_ffp_get_fs_settings(context, state, &settings, FALSE); - desc = (const struct arbfp_ffp_desc *)find_ffp_frag_shader(&priv->fragment_shaders, &settings); - if (!desc) - { - struct arbfp_ffp_desc *new_desc; - - if (!(new_desc = heap_alloc(sizeof(*new_desc)))) - { - ERR("Out of memory\n"); - return; - } + struct arbfp_ffp_desc *new_desc; - new_desc->parent.settings = settings; - new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); - add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); - TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); - desc = new_desc; + if (!(new_desc = heap_alloc(sizeof(*new_desc)))) + { + ERR("Out of memory\n"); + return; } - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); - checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); + new_desc->parent.settings = settings; + new_desc->shader = gen_arbfp_ffp_shader(&settings, gl_info); + add_ffp_frag_shader(&priv->fragment_shaders, &new_desc->parent); + TRACE("Allocated fixed function replacement shader descriptor %p\n", new_desc); + desc = new_desc; + } + + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)); + checkGLcall("glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, desc->shader)"); - if (device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) + if (device->shader_backend == &arb_program_shader_backend && context->last_was_pshader) + { + /* Reload fixed function constants since they collide with the + * pixel shader constants. */ + for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) { - /* 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)); - } - state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); - state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); - color_key_arbfp(context, state, STATE_COLOR_KEY); + 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->last_was_pshader = FALSE; + state_texfactor_arbfp(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); + state_arb_specularenable(context, state, STATE_RENDER(WINED3D_RS_SPECULARENABLE)); + color_key_arbfp(context, state, STATE_COLOR_KEY); } - else if (!context->last_was_pshader) - { - if (device->shader_backend == &arb_program_shader_backend) - context->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - context->last_was_pshader = TRUE; - } - - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + context->last_was_pshader = FALSE; } /* We can't link the fog states to the fragment state directly since the @@ -6900,6 +6883,24 @@ 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; + + if (use_ps(state)) + { + gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); + return; + } + + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_PROGRAM_ARB); + checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB)"); + + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) + arbfp_update_shader(context, state); +} + const struct wined3d_fragment_pipe_ops arbfp_fragment_pipeline = { .fp_apply_draw_state = arbfp_apply_draw_state,

1 0

Zebediah Figura : wined3d: Make the viewport state dynamic.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: e8a2f816f034f166e2d28855bee36d8bbb797291 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8a2f816f034f166e2d28855bee36d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jun 27 18:13:22 2023 -0500 wined3d: Make the viewport state dynamic. --- dlls/wined3d/context_vk.c | 69 +++++++++++++++++++++++++++++------------------ dlls/wined3d/wined3d_vk.h | 1 - 2 files changed, 43 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 6583460aa1a..38d5c6ed03b 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1879,6 +1879,7 @@ void wined3d_context_vk_submit_command_buffer(struct wined3d_context_vk *context context_invalidate_state(&context_vk->c, STATE_INDEXBUFFER); context_invalidate_state(&context_vk->c, STATE_BLEND_FACTOR); context_invalidate_state(&context_vk->c, STATE_STENCIL_REF); + context_invalidate_state(&context_vk->c, STATE_VIEWPORT); VK_CALL(vkEndCommandBuffer(buffer->vk_command_buffer)); @@ -2037,8 +2038,6 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if ((ret = wined3d_uint32_compare(a->ts_desc.patchControlPoints, b->ts_desc.patchControlPoints))) return ret; - if ((ret = memcmp(a->viewports, b->viewports, sizeof(a->viewports)))) - return ret; if ((ret = memcmp(a->scissors, b->scissors, sizeof(a->scissors)))) return ret; @@ -2093,6 +2092,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context { VK_DYNAMIC_STATE_BLEND_CONSTANTS, VK_DYNAMIC_STATE_STENCIL_REFERENCE, + VK_DYNAMIC_STATE_VIEWPORT, }; key = &context_vk->graphics.pipeline_key_vk; @@ -2117,7 +2117,6 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->ts_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_TESSELLATION_STATE_CREATE_INFO; key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; - key->vp_desc.pViewports = key->viewports; key->vp_desc.pScissors = key->scissors; key->vp_desc.viewportCount = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); key->vp_desc.scissorCount = key->vp_desc.viewportCount; @@ -2456,36 +2455,20 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte update = true; } - if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT) - || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) { for (i = 0; i < key->vp_desc.viewportCount; ++i) { const struct wined3d_viewport *src_viewport = &state->viewports[i]; - VkViewport *viewport = &key->viewports[i]; VkRect2D *scissor = &key->scissors[i]; if (i >= state->viewport_count) { - viewport->x = 0.0f; - viewport->y = 0.0f; - viewport->width = 1.0f; - viewport->height = 1.0f; - viewport->minDepth = 0.0f; - viewport->maxDepth = 0.0f; - memset(scissor, 0, sizeof(*scissor)); continue; } - viewport->x = src_viewport->x; - viewport->y = src_viewport->y; - viewport->width = src_viewport->width; - viewport->height = src_viewport->height; - viewport->minDepth = src_viewport->min_z; - viewport->maxDepth = src_viewport->max_z; - if (state->rasterizer_state && state->rasterizer_state->desc.scissor) { const RECT *r = &state->scissor_rects[i]; @@ -2503,18 +2486,16 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte } else { - scissor->offset.x = viewport->x; - scissor->offset.y = viewport->y; - scissor->extent.width = viewport->width; - scissor->extent.height = viewport->height; + scissor->offset.x = src_viewport->x; + scissor->offset.y = src_viewport->y; + scissor->extent.width = src_viewport->width; + scissor->extent.height = src_viewport->height; } /* Scissor offsets need to be non-negative (VUID-VkPipelineViewportStateCreateInfo-x-02821) */ if (scissor->offset.x < 0) scissor->offset.x = 0; if (scissor->offset.y < 0) scissor->offset.y = 0; - viewport->y += viewport->height; - viewport->height = -viewport->height; } update = true; @@ -3792,6 +3773,42 @@ VkCommandBuffer wined3d_context_vk_apply_draw_state(struct wined3d_context_vk *c if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_BLEND_FACTOR)) VK_CALL(vkCmdSetBlendConstants(vk_command_buffer, &state->blend_factor.r)); + if (wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_VIEWPORT)) + { + unsigned int viewport_count = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); + VkViewport viewports[WINED3D_MAX_VIEWPORTS]; + unsigned int i; + + for (i = 0; i < viewport_count; ++i) + { + const struct wined3d_viewport *src_viewport = &state->viewports[i]; + VkViewport *viewport = &viewports[i]; + + if (i >= state->viewport_count) + { + viewport->x = 0.0f; + viewport->y = 0.0f; + viewport->width = 1.0f; + viewport->height = 1.0f; + viewport->minDepth = 0.0f; + viewport->maxDepth = 0.0f; + continue; + } + + viewport->x = src_viewport->x; + viewport->y = src_viewport->y; + viewport->width = src_viewport->width; + viewport->height = src_viewport->height; + viewport->minDepth = src_viewport->min_z; + viewport->maxDepth = src_viewport->max_z; + + viewport->y += viewport->height; + viewport->height = -viewport->height; + } + + VK_CALL(vkCmdSetViewport(vk_command_buffer, 0, viewport_count, viewports)); + } + memset(context_vk->c.dirty_graphics_states, 0, sizeof(context_vk->c.dirty_graphics_states)); context_vk->c.shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 90e0a3de497..04264e6db84 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -497,7 +497,6 @@ struct wined3d_graphics_pipeline_key_vk VkVertexInputBindingDivisorDescriptionEXT divisors[MAX_ATTRIBS]; VkVertexInputAttributeDescription attributes[MAX_ATTRIBS]; VkVertexInputBindingDescription bindings[MAX_ATTRIBS]; - VkViewport viewports[WINED3D_MAX_VIEWPORTS]; VkRect2D scissors[WINED3D_MAX_VIEWPORTS]; VkSampleMask sample_mask; VkPipelineColorBlendAttachmentState blend_attachments[WINED3D_MAX_RENDER_TARGETS];

1 0

Zebediah Figura : wined3d: Pass a wined3d_state pointer to the vp_enable() and fp_enable() methods.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: dfb1665b5f5f7da01f70bbcfeebf086bbbb9eab6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfb1665b5f5f7da01f70bbcfeebf08… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:53:59 2023 -0600 wined3d: Pass a wined3d_state pointer to the vp_enable() and fp_enable() methods. Rename to *_apply_draw_state() per Henri's suggestion. --- dlls/wined3d/arb_program_shader.c | 14 +++++++------- dlls/wined3d/ati_fragment_shader.c | 6 +++--- dlls/wined3d/ffp_gl.c | 12 ++++++------ dlls/wined3d/glsl_shader.c | 13 +++++++------ dlls/wined3d/nvidia_texture_shader.c | 14 +++++++------- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/shader_spirv.c | 13 +++++++------ dlls/wined3d/wined3d_private.h | 4 ++-- 8 files changed, 41 insertions(+), 39 deletions(-)

1 0

Zebediah Figura : wined3d: Set the pipeline key viewport and scissor count at initialization.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 3b59be59ae5c574e4b313eae33853b980159f107 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b59be59ae5c574e4b313eae33853b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 7 18:09:01 2023 -0500 wined3d: Set the pipeline key viewport and scissor count at initialization. It never changes. --- dlls/wined3d/context_vk.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index c73db4f20cd..6583460aa1a 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2119,6 +2119,8 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->vp_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO; key->vp_desc.pViewports = key->viewports; key->vp_desc.pScissors = key->scissors; + key->vp_desc.viewportCount = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); + key->vp_desc.scissorCount = key->vp_desc.viewportCount; key->rs_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_RASTERIZATION_STATE_CREATE_INFO; key->rs_desc.lineWidth = 1.0f; @@ -2458,9 +2460,6 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_SCISSORRECT) || wined3d_context_is_graphics_state_dirty(&context_vk->c, STATE_RASTERIZER)) { - key->vp_desc.viewportCount = (context_vk->vk_info->multiple_viewports ? WINED3D_MAX_VIEWPORTS : 1); - key->vp_desc.scissorCount = key->vp_desc.viewportCount; - for (i = 0; i < key->vp_desc.viewportCount; ++i) { const struct wined3d_viewport *src_viewport = &state->viewports[i];

1 0

Zebediah Figura : wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 17b9c453117ca8e4b180934262f0aed221a0c7da URL: https://gitlab.winehq.org/wine/wine/-/commit/17b9c453117ca8e4b180934262f0ae… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 13:14:30 2023 -0600 wined3d: Pass a non-const wined3d_context pointer to the FFP *_apply_draw_state() methods. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/ffp_gl.c | 4 ++-- dlls/wined3d/glsl_shader.c | 5 ++--- dlls/wined3d/nvidia_texture_shader.c | 4 ++-- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8a31d67662d..9ca6dd8ff46 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5740,7 +5740,7 @@ struct arbfp_ffp_desc }; /* Context activation is done by the caller. */ -static void arbfp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +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; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 45e6c081ba0..925b712f372 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1251,7 +1251,7 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[] }; /* Context activation is done by the caller. */ -static void atifs_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void atifs_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; diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index 0b5f1fab653..dbc82a1ba4d 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -4840,7 +4840,7 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = }; /* Context activation is done by the caller. */ -static void ffp_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void ffp_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void ffp_pipe_disable(const struct wined3d_context *context) {} @@ -4967,7 +4967,7 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline = .states = ffp_fragmentstate_template, }; -static void none_pipe_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void none_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void none_pipe_disable(const struct wined3d_context *context) {} diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4cff60b1775..5a2133bf5a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11563,7 +11563,7 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = shader_glsl_shader_compile, }; -static void glsl_vertex_pipe_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) {} +static void glsl_vertex_pipe_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) {} static void glsl_vertex_pipe_vp_disable(const struct wined3d_context *context) {} @@ -12060,8 +12060,7 @@ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = .vp_states = glsl_vertex_pipe_vp_states, }; -static void glsl_fragment_pipe_apply_draw_state( - const struct wined3d_context *context, const struct wined3d_state *state) +static void glsl_fragment_pipe_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index c68dc42b690..0575e72ef43 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -660,7 +660,7 @@ static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d } /* Context activation is done by the caller. */ -static void nvrc_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void nvrc_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; @@ -685,7 +685,7 @@ static void nvrc_disable(const struct wined3d_context *context) } /* Context activation is done by the caller. */ -static void nvts_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void nvts_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; diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 70affa1558e..5be17815d3a 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1136,7 +1136,7 @@ const struct wined3d_shader_backend_ops *wined3d_spirv_shader_backend_init_vk(vo return &spirv_shader_backend_vk; } -static void spirv_vertex_pipe_vk_vp_apply_draw_state(const struct wined3d_context *context, const struct wined3d_state *state) +static void spirv_vertex_pipe_vk_vp_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } @@ -1219,7 +1219,7 @@ const struct wined3d_vertex_pipe_ops *wined3d_spirv_vertex_pipe_init_vk(void) } static void spirv_fragment_pipe_vk_fp_apply_draw_state( - const struct wined3d_context *context, const struct wined3d_state *state) + struct wined3d_context *context, const struct wined3d_state *state) { /* Nothing to do. */ } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 74c0ea52f3a..ae9e049a054 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2001,7 +2001,7 @@ struct wined3d_state_entry_template struct wined3d_fragment_pipe_ops { - void (*fp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state); + void (*fp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state); void (*fp_disable)(const struct wined3d_context *context); void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); unsigned int (*get_emul_mask)(const struct wined3d_adapter *adapter); @@ -2029,7 +2029,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { - void (*vp_apply_draw_state)(const struct wined3d_context *context, const struct wined3d_state *state); + void (*vp_apply_draw_state)(struct wined3d_context *context, const struct wined3d_state *state); void (*vp_disable)(const struct wined3d_context *context); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter);

1 0

Zebediah Figura : wined3d: Introduce a separate fp_disable() method.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: b64cc15d615659200643f0094f07133ec8b028b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/b64cc15d615659200643f0094f0713… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:32:17 2023 -0600 wined3d: Introduce a separate fp_disable() method. Analogous to shader_disable(). We'd like to pass a wined3d_state pointer to fp_enable() to let it handle actually compiling the fragment pipeline, which doesn't mesh well conceptually with its use in shader_disable(). --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++------- dlls/wined3d/ati_fragment_shader.c | 27 ++++++++++++------ dlls/wined3d/ffp_gl.c | 37 ++++++++++++------------ dlls/wined3d/glsl_shader.c | 25 +++++++++------- dlls/wined3d/nvidia_texture_shader.c | 55 ++++++++++++++++++++++++------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_spirv.c | 8 +++++- dlls/wined3d/wined3d_private.h | 1 + 8 files changed, 117 insertions(+), 67 deletions(-)

1 0

Eric Pouech : kernel32/tests: Check if thread is suspended in debugger attachment tests.
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: 5efab1175287421c3977e3cb3a537500824cd777 URL: https://gitlab.winehq.org/wine/wine/-/commit/5efab1175287421c3977e3cb3a5375… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Feb 14 11:10:58 2024 +0100 kernel32/tests: Check if thread is suspended in debugger attachment tests. Looks like thread is suspended until DBG_CONTINUE is sent on thread creation debug event. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/debugger.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 9fb953f281a..301714342e4 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -416,16 +416,34 @@ static void wait_for_breakpoint_(unsigned line, struct debugger_context *ctx) ctx->ev.u.Exception.ExceptionRecord.ExceptionCode); } +#define check_thread_running(h) ok(_check_thread_suspend_count(h) == 0, "Expecting running thread\n") +#define check_thread_suspended(h) ok(_check_thread_suspend_count(h) > 0, "Expecting suspended thread\n") + +static LONG _check_thread_suspend_count(HANDLE h) +{ + DWORD suspend_count; + + suspend_count = SuspendThread(h); + if (suspend_count != (DWORD)-1 && ResumeThread(h) == (DWORD)-1) + return (DWORD)-2; + return suspend_count; +} + static void process_attach_events(struct debugger_context *ctx, BOOL pass_exception) { DEBUG_EVENT ev; BOOL ret; + HANDLE prev_thread; ctx->ev.dwDebugEventCode = -1; next_event(ctx, 0); ok(ctx->ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); + todo_wine + check_thread_suspended(ctx->ev.u.CreateProcessInfo.hThread); + prev_thread = ctx->ev.u.CreateProcessInfo.hThread; next_event(ctx, 0); + if (ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT) /* Vista+ reports ntdll.dll before reporting threads */ { ok(ctx->ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %ld\n", ctx->ev.dwDebugEventCode); @@ -434,7 +452,13 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except } while (ctx->ev.dwDebugEventCode == CREATE_THREAD_DEBUG_EVENT) + { + todo_wine + check_thread_suspended(ctx->ev.u.CreateThread.hThread); + check_thread_running(prev_thread); + prev_thread = ctx->ev.u.CreateThread.hThread; next_event(ctx, 0); + } do { @@ -455,9 +479,12 @@ static void process_attach_events(struct debugger_context *ctx, BOOL pass_except DWORD last_threads[5]; unsigned thd_idx = 0, i; + check_thread_running(prev_thread); + /* sometimes (at least Win10) several thread creations are reported here */ do { + check_thread_running(ctx->ev.u.CreateThread.hThread); if (thd_idx < ARRAY_SIZE(last_threads)) last_threads[thd_idx++] = ctx->ev.dwThreadId; next_event(ctx, WAIT_EVENT_TIMEOUT);

1 0

Zebediah Figura : dinput/tests: Return void from test_winmm_joystick().
by Alexandre Julliard Feb. 16, 2024

Feb. 16, 2024

Module: wine Branch: master Commit: a97a4af0ddd237108b42ca4c4239b5d207b085b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a97a4af0ddd237108b42ca4c4239b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 3 12:04:23 2023 -0500 dinput/tests: Return void from test_winmm_joystick(). --- dlls/dinput/tests/joystick8.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/dinput/tests/joystick8.c b/dlls/dinput/tests/joystick8.c index 788f59549c2..0553cb96a63 100644 --- a/dlls/dinput/tests/joystick8.c +++ b/dlls/dinput/tests/joystick8.c @@ -4464,7 +4464,7 @@ done: cleanup_registry_keys(); } -static BOOL test_winmm_joystick(void) +static void test_winmm_joystick(void) { #include "psh_hid_macros.h" const unsigned char report_desc[] = @@ -4821,8 +4821,6 @@ static BOOL test_winmm_joystick(void) done: hid_device_stop( &desc, 1 ); cleanup_registry_keys(); - - return device != NULL; } #define check_interface( a, b, c ) check_interface_( __LINE__, a, b, c )

1 0