July 2023 - Wine-commits - list.winehq.org

Fabian Maurer : gdiplus: Prevent infinite loops due to floating point inaccuracy.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 36c3a51d6abbdba4054e02c2a10b9fd38f8a3d5d URL: https://gitlab.winehq.org/wine/wine/-/commit/36c3a51d6abbdba4054e02c2a10b9f… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jul 24 17:23:44 2023 +0200 gdiplus: Prevent infinite loops due to floating point inaccuracy. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52492 --- dlls/gdiplus/graphicspath.c | 12 +++++++----- dlls/gdiplus/tests/graphicspath.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 06e17d4b98a..545aaa8441e 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -183,14 +183,16 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R mp[2].X = (mp[1].X + mp[3].X) / 2.0; mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; - /* Is one pair of the new control points equal to the old control points? */ - if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || - (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) - continue; - pt = end->pt; pt_st = start->pt; + /* Test for closely spaced points that don't need to be flattened + * Also avoids limited-precision errors in flatness check + */ + if((fabs(pt.X - mp[2].X) + fabs(pt.Y - mp[2].Y) + + fabs(pt_st.X - mp[2].X) + fabs(pt_st.Y - mp[2].Y) ) <= flatness * 0.5) + continue; + /* check flatness as a half of distance between middle point and a linearized path * formula for distance point from line for point (x0, y0) and line (x1, y1) (x2, y2) * is defined as (area_triangle / distance_start_end): diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 7cbcb51edfc..558eedc147f 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1253,6 +1253,42 @@ static void test_flatten(void) GdipDeletePath(path); } +static void test_flatten2(void) +{ + GpStatus status; + GpPath *path; + + status = GdipCreatePath(0, &path); + expect(Ok, status); + status = GdipStartPathFigure(path); + expect(Ok, status); + + /* path seen in the wild that caused a stack overflow */ + status = GdipAddPathArc(path, -136.33, 20.00, 786.00, 786.00, -105.00, 30.00); + expect(Ok, status); + status = GdipAddPathArc(path, 256.67, 413.00, 0.00, 0.00, -75.00, -30.00); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + + status = GdipFlattenPath(path, NULL, 1.0); + expect(Ok, status); + + /* path seen in the wild that caused a stack overflow */ + /* same path but redo with the manual points that caused a crash */ + status = GdipResetPath(path); + expect(Ok, status); + status = GdipAddPathBezier(path, 154.950806, 33.391144, 221.586075, 15.536285, 291.747314, 15.536285, 358.382568, 33.391144); + expect(Ok, status); + status = GdipAddPathBezier(path, 256.666809, 412.999512, 256.666718, 412.999481, 256.666656, 412.999481, 256.666565, 412.999512); + expect(Ok, status); + status = GdipClosePathFigure(path); + expect(Ok, status); + status = GdipFlattenPath(path, NULL, 1.0); + + GdipDeletePath(path); +} + static path_test_t widenline_path[] = { {5.0, 5.0, PathPointTypeStart, 0, 0}, /*0*/ {50.0, 5.0, PathPointTypeLine, 0, 0}, /*1*/ @@ -1935,6 +1971,7 @@ START_TEST(graphicspath) test_widen_cap(); test_isvisible(); test_empty_rect(); + test_flatten2(); GdiplusShutdown(gdiplusToken); }

1 0

Zebediah Figura : wined3d: Move wined3d_device_apply_stateblock() to stateblock.c.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: a10540753cf0c597981c910a877b3794351acdb5 URL: https://gitlab.winehq.org/wine/wine/-/commit/a10540753cf0c597981c910a877b37… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 15:33:59 2022 -0600 wined3d: Move wined3d_device_apply_stateblock() to stateblock.c. All other code touching stateblocks is in stateblock.c; this is a more intuitive and modular place for it. This may merit renaming the function, but should be a subsequent commit. --- dlls/wined3d/device.c | 934 ---------------------------------------- dlls/wined3d/stateblock.c | 1034 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 1034 insertions(+), 934 deletions(-)

1 0

Zebediah Figura : wined3d: Remove states not used by d3d10+ from wined3d_device_context_set_state().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 31eacea31a368fba6b0fc698ad96fb2825806372 URL: https://gitlab.winehq.org/wine/wine/-/commit/31eacea31a368fba6b0fc698ad96fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 15:39:14 2022 -0600 wined3d: Remove states not used by d3d10+ from wined3d_device_context_set_state(). --- dlls/wined3d/device.c | 164 +------------------------------------------------- 1 file changed, 1 insertion(+), 163 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8bb879b41cd..711bc4e7bc5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1545,111 +1545,6 @@ static void wined3d_device_get_transform(const struct wined3d_device *device, *matrix = device->cs->c.state->transforms[state]; } -/* Note lights are real special cases. Although the device caps state only - * e.g. 8 are supported, you can reference any indexes you want as long as - * that number max are enabled at any one point in time. Therefore since the - * indices can be anything, we need a hashmap of them. However, this causes - * stateblock problems. When capturing the state block, I duplicate the - * hashmap, but when recording, just build a chain pretty much of commands to - * be replayed. */ -static void wined3d_device_context_set_light(struct wined3d_device_context *context, - unsigned int light_idx, const struct wined3d_light *light) -{ - struct wined3d_light_info *object = NULL; - float rho; - - if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) - return; - - /* Initialize the object. */ - TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " - "position {%.8e, %.8e, %.8e}, direction {%.8e, %.8e, %.8e}, " - "range %.8e, falloff %.8e, theta %.8e, phi %.8e.\n", - light_idx, light->type, debug_color(&light->diffuse), - debug_color(&light->specular), debug_color(&light->ambient), - light->position.x, light->position.y, light->position.z, - light->direction.x, light->direction.y, light->direction.z, - light->range, light->falloff, light->theta, light->phi); - - switch (light->type) - { - case WINED3D_LIGHT_POINT: - /* Position */ - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - object->cutoff = 180.0f; - /* FIXME: Range */ - break; - - case WINED3D_LIGHT_DIRECTIONAL: - /* Direction */ - object->direction.x = -light->direction.x; - object->direction.y = -light->direction.y; - object->direction.z = -light->direction.z; - object->direction.w = 0.0f; - object->exponent = 0.0f; - object->cutoff = 180.0f; - break; - - case WINED3D_LIGHT_SPOT: - /* Position */ - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - - /* Direction */ - object->direction.x = light->direction.x; - object->direction.y = light->direction.y; - object->direction.z = light->direction.z; - object->direction.w = 0.0f; - - /* opengl-ish and d3d-ish spot lights use too different models - * for the light "intensity" as a function of the angle towards - * the main light direction, so we only can approximate very - * roughly. However, spot lights are rather rarely used in games - * (if ever used at all). Furthermore if still used, probably - * nobody pays attention to such details. */ - if (!light->falloff) - { - /* Falloff = 0 is easy, because d3d's and opengl's spot light - * equations have the falloff resp. exponent parameter as an - * exponent, so the spot light lighting will always be 1.0 for - * both of them, and we don't have to care for the rest of the - * rather complex calculation. */ - object->exponent = 0.0f; - } - else - { - rho = light->theta + (light->phi - light->theta) / (2 * light->falloff); - if (rho < 0.0001f) - rho = 0.0001f; - object->exponent = -0.3f / logf(cosf(rho / 2)); - } - - if (object->exponent > 128.0f) - object->exponent = 128.0f; - - object->cutoff = (float)(light->phi * 90 / M_PI); - /* FIXME: Range */ - break; - - case WINED3D_LIGHT_PARALLELPOINT: - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - break; - - default: - FIXME("Unrecognized light type %#x.\n", light->type); - } - - wined3d_device_context_emit_set_light(context, object); -} - HRESULT CDECL wined3d_device_set_clip_status(struct wined3d_device *device, const struct wined3d_clip_status *clip_status) { @@ -1758,8 +1653,7 @@ void CDECL wined3d_device_context_reset_state(struct wined3d_device_context *con void CDECL wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state) { - struct wined3d_light_info *light; - unsigned int i, j; + unsigned int i; TRACE("context %p, state %p.\n", context, state); @@ -1795,65 +1689,9 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte wined3d_device_context_emit_set_unordered_access_views(context, i, 0, MAX_UNORDERED_ACCESS_VIEWS, state->unordered_access_view[i], NULL); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_F, - 0, WINED3D_MAX_VS_CONSTS_F, state->vs_consts_f); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_I, - 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_B, - 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); - - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_F, - 0, WINED3D_MAX_PS_CONSTS_F, state->ps_consts_f); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_I, - 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); - wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_B, - 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); - - for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) - { - wined3d_device_context_emit_set_texture(context, i, state->textures[i]); - for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) - { - wined3d_device_context_emit_set_sampler_state(context, i, j, state->sampler_states[i][j]); - } - } - - for (i = 0; i < WINED3D_MAX_TEXTURES; ++i) - { - for (j = 0; j < WINED3D_HIGHEST_TEXTURE_STATE + 1; ++j) - { - wined3d_device_context_emit_set_texture_state(context, i, j, state->texture_states[i][j]); - } - } - - for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) - { - if (context->device->state_table[STATE_TRANSFORM(i)].representative) - wined3d_device_context_emit_set_transform(context, i, state->transforms + i); - } - - for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) - { - wined3d_device_context_emit_set_clip_plane(context, i, state->clip_planes + i); - } - - wined3d_device_context_emit_set_material(context, &state->material); - wined3d_device_context_emit_set_viewports(context, state->viewport_count, state->viewports); wined3d_device_context_emit_set_scissor_rects(context, state->scissor_rect_count, state->scissor_rects); - RB_FOR_EACH_ENTRY(light, &state->light_state.lights_tree, struct wined3d_light_info, entry) - { - wined3d_device_context_set_light(context, light->OriginalIndex, &light->OriginalParms); - wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); - } - - for (i = 0; i < WINEHIGHEST_RENDER_STATE + 1; ++i) - { - if (context->device->state_table[STATE_RENDER(i)].representative) - wined3d_device_context_emit_set_render_state(context, i, state->render_states[i]); - } - wined3d_device_context_emit_set_blend_state(context, state->blend_state, &state->blend_factor, state->sample_mask); wined3d_device_context_emit_set_depth_stencil_state(context, state->depth_stencil_state, state->stencil_ref); wined3d_device_context_emit_set_rasterizer_state(context, state->rasterizer_state);

1 0

Zebediah Figura : wined3d: Add helpers to retrieve shader constants from a wined3d_stateblock.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 5323042f7a2aa69c01bce8248a457bcc8533c61c URL: https://gitlab.winehq.org/wine/wine/-/commit/5323042f7a2aa69c01bce8248a457b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Feb 18 15:45:58 2023 -0600 wined3d: Add helpers to retrieve shader constants from a wined3d_stateblock. --- dlls/d3d8/device.c | 26 ++++---------- dlls/d3d9/device.c | 71 ++++++++++---------------------------- dlls/wined3d/stateblock.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 6 ++++ include/wine/wined3d.h | 12 +++++++ 5 files changed, 129 insertions(+), 72 deletions(-)

1 0

Zebediah Figura : wined3d: Store push constants in wined3d_buffers in struct wined3d_state.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: c065b4fe0b3622e0c737a4c7c1c514273ad2d8a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c065b4fe0b3622e0c737a4c7c1c514… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 19 17:33:03 2023 -0600 wined3d: Store push constants in wined3d_buffers in struct wined3d_state. We will need them in buffers for Vulkan, as well as for software vertex shaders. Currently we simply store them in sysmem buffers and read directly back out of them to load GL uniforms. This does decrease memory usage a bit for d3d10+. --- dlls/wined3d/arb_program_shader.c | 69 ++++++++++++++++--------- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_gl.c | 2 +- dlls/wined3d/cs.c | 105 +++++++++++++++++++++----------------- dlls/wined3d/glsl_shader.c | 69 ++++++++++++++++--------- dlls/wined3d/stateblock.c | 6 --- dlls/wined3d/wined3d_private.h | 44 ++++++---------- 7 files changed, 166 insertions(+), 131 deletions(-)

1 0

Zebediah Figura : d3d11/tests: Mark test failures specific to the Vulkan or GL renderers.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 9a19e34bf8f47b33ec1bcad9ca42fa38c2ed2a5b URL: https://gitlab.winehq.org/wine/wine/-/commit/9a19e34bf8f47b33ec1bcad9ca42fa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jun 22 20:16:22 2023 -0500 d3d11/tests: Mark test failures specific to the Vulkan or GL renderers. --- dlls/d3d11/tests/d3d11.c | 137 +++++++++++++++++++++++++++++++---------------- 1 file changed, 91 insertions(+), 46 deletions(-)

1 0

Zebediah Figura : wined3d: Use the varying count from struct wined3d_d3d_info in pixel_shader_init().
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 6b0984dc3f83ee37b934158b263a92feb357318c URL: https://gitlab.winehq.org/wine/wine/-/commit/6b0984dc3f83ee37b934158b263a92… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 13:24:04 2023 -0600 wined3d: Use the varying count from struct wined3d_d3d_info in pixel_shader_init(). These two fields are always identical. --- dlls/wined3d/shader.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2728929045f..96b47db9ed6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3052,7 +3052,7 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, const struct wined3d_shader_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops) { - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; unsigned int i, highest_reg_used = 0, num_regs_used = 0; HRESULT hr; @@ -3060,7 +3060,7 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d return hr; if (FAILED(hr = shader_set_function(shader, device, - WINED3D_SHADER_TYPE_PIXEL, device->adapter->d3d_info.limits.ps_uniform_count))) + WINED3D_SHADER_TYPE_PIXEL, d3d_info->limits.ps_uniform_count))) { shader_cleanup(shader); return hr; @@ -3077,11 +3077,11 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d /* Don't do any register mapping magic if it is not needed, or if we can't * achieve anything anyway */ - if (highest_reg_used < (gl_info->limits.glsl_varyings / 4) - || num_regs_used > (gl_info->limits.glsl_varyings / 4) + if (highest_reg_used < (d3d_info->limits.varying_count / 4) + || num_regs_used > (d3d_info->limits.varying_count / 4) || shader->reg_maps.shader_version.major >= 4) { - if (num_regs_used > (gl_info->limits.glsl_varyings / 4)) + if (num_regs_used > (d3d_info->limits.varying_count / 4)) { /* This happens with relative addressing. The input mapper function * warns about this if the higher registers are declared too, so

1 0

Zebediah Figura : wined3d: Track WINED3D_GL_NORMALIZED_TEXRECT in struct wined3d_d3d_info as well.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 1cab38b6aee2815885802cb4caa8708ae347b073 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cab38b6aee2815885802cb4caa870… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 13:37:40 2023 -0600 wined3d: Track WINED3D_GL_NORMALIZED_TEXRECT in struct wined3d_d3d_info as well. --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/resource.c | 4 +--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8cd8a883975..e1cc1119e85 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5215,6 +5215,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->texture_npot = !!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO]; d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]; + d3d_info->normalized_texrect = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]; d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; d3d_info->vertex_bgra = !!gl_info->supported[ARB_VERTEX_ARRAY_BGRA]; d3d_info->texture_swizzle = !!gl_info->supported[ARB_TEXTURE_SWIZZLE]; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 3dcf2230643..bc1039e0358 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2330,6 +2330,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ d3d_info->texture_npot = true; d3d_info->texture_npot_conditional = true; + d3d_info->normalized_texrect = false; d3d_info->draw_base_vertex_offset = true; d3d_info->vertex_bgra = true; d3d_info->texture_swizzle = true; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 6d4dbb75ef6..03a755391ee 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -60,7 +60,6 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * const struct wined3d_d3d_info *d3d_info = &device->adapter->d3d_info; enum wined3d_gl_resource_type base_type = WINED3D_GL_RES_TYPE_COUNT; enum wined3d_gl_resource_type gl_type = WINED3D_GL_RES_TYPE_COUNT; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; BOOL tex_2d_ok = FALSE; unsigned int i; @@ -143,8 +142,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * continue; } if (((width & (width - 1)) || (height & (height - 1))) - && !d3d_info->texture_npot - && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] + && !d3d_info->texture_npot && !d3d_info->normalized_texrect && gl_type == WINED3D_GL_RES_TYPE_TEX_2D) { TRACE("Skipping 2D texture type to try texture rectangle.\n"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6c558faa7d2..4805127d72c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -248,6 +248,7 @@ struct wined3d_d3d_info uint32_t viewport_array_index_any_shader : 1; uint32_t texture_npot : 1; uint32_t texture_npot_conditional : 1; + uint32_t normalized_texrect : 1; uint32_t draw_base_vertex_offset : 1; uint32_t vertex_bgra : 1; uint32_t texture_swizzle : 1;

1 0

Zebediah Figura : wined3d: Store the sample count in struct wined3d_d3d_info.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 3624e1191d6e0000117b07a66407ad2294f339e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/3624e1191d6e0000117b07a66407ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 5 19:10:18 2023 -0600 wined3d: Store the sample count in struct wined3d_d3d_info. Read that in wined3d_swapchain_apply_sample_count_override(). --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/adapter_vk.c | 6 ++++++ dlls/wined3d/swapchain.c | 4 +--- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index e1cc1119e85..d253a8d70bb 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5195,6 +5195,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; d3d_info->limits.texture_size = gl_info->limits.texture_size; + d3d_info->limits.sample_count = gl_info->limits.samples; gl_info->gl_ops.gl.p_glGetFloatv(gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? GL_ALIASED_POINT_SIZE_RANGE : GL_POINT_SIZE_RANGE, f); diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index bc1039e0358..a27e8e41d88 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2290,6 +2290,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ struct wined3d_physical_device_info device_info; struct wined3d_vertex_caps vertex_caps; struct fragment_caps fragment_caps; + unsigned int sample_counts_mask; struct shader_caps shader_caps; get_physical_device_info(adapter_vk, &device_info); @@ -2316,6 +2317,11 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->limits.max_clip_distances = WINED3D_MAX_CLIP_DISTANCES; d3d_info->limits.texture_size = adapter_vk->device_limits.maxImageDimension2D; d3d_info->limits.pointsize_max = adapter_vk->device_limits.pointSizeRange[1]; + sample_counts_mask = adapter_vk->device_limits.framebufferColorSampleCounts + | adapter_vk->device_limits.framebufferDepthSampleCounts + | adapter_vk->device_limits.framebufferStencilSampleCounts + | adapter_vk->device_limits.framebufferNoAttachmentsSampleCounts; + d3d_info->limits.sample_count = (1u << wined3d_log2i(sample_counts_mask)); d3d_info->wined3d_creation_flags = wined3d_creation_flags; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ac6f9ea6222..f8179e2a70d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1353,7 +1353,6 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s enum wined3d_format_id format_id, enum wined3d_multisample_type *type, unsigned int *quality) { const struct wined3d_adapter *adapter; - const struct wined3d_gl_info *gl_info; const struct wined3d_format *format; enum wined3d_multisample_type t; @@ -1361,11 +1360,10 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s return; adapter = swapchain->device->adapter; - gl_info = &adapter->gl_info; if (!(format = wined3d_get_format(adapter, format_id, WINED3D_BIND_RENDER_TARGET))) return; - if ((t = min(wined3d_settings.sample_count, gl_info->limits.samples))) + if ((t = min(wined3d_settings.sample_count, adapter->d3d_info.limits.sample_count))) while (!(format->multisample_types & 1u << (t - 1))) ++t; TRACE("Using sample count %u.\n", t); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4805127d72c..9a78cd2d122 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -213,6 +213,7 @@ struct wined3d_d3d_limits unsigned int max_rt_count; unsigned int max_clip_distances; unsigned int texture_size; + unsigned int sample_count; float pointsize_max; };

1 0

Zebediah Figura : wined3d: Move struct wined3d_gl_info to struct wined3d_adapter_gl.
by Alexandre Julliard 27 Jul '23

27 Jul '23

Module: wine Branch: master Commit: 7c814a3e01db69e1cf67cfb9c40693cbeba327d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c814a3e01db69e1cf67cfb9c40693… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 13:38:02 2023 -0600 wined3d: Move struct wined3d_gl_info to struct wined3d_adapter_gl. --- dlls/wined3d/adapter_gl.c | 36 +++++++++++++++++++----------------- dlls/wined3d/arb_program_shader.c | 6 +++--- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_gl.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/query.c | 14 +++++++------- dlls/wined3d/sampler.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/texture.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 15 files changed, 50 insertions(+), 45 deletions(-)

1 0