wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Alex Henrie : mfplat: Rename debugstr_fourcc to mf_debugstr_fourcc.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: ae77ddafb02dbffe32631c925826c9c70de9b7f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae77ddafb02dbffe32631c925826c9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Oct 4 23:31:22 2023 -0600 mfplat: Rename debugstr_fourcc to mf_debugstr_fourcc. --- dlls/mfplat/buffer.c | 2 +- dlls/mfplat/mediatype.c | 4 ++-- dlls/mfplat/mfplat_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index cb1b3176a08..932b1147cb8 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1627,7 +1627,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM */ HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - TRACE("%lu, %lu, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer); + TRACE("%lu, %lu, %s, %d, %p.\n", width, height, mf_debugstr_fourcc(fourcc), bottom_up, buffer); return create_2d_buffer(width, height, fourcc, bottom_up, buffer); } diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index eed06ef02ef..0b4a6fa4eaf 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2696,7 +2696,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s struct uncompressed_video_format *format; GUID subtype; - TRACE("%s, %lu, %p.\n", debugstr_fourcc(fourcc), width, stride); + TRACE("%s, %lu, %p.\n", mf_debugstr_fourcc(fourcc), width, stride); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; @@ -2766,7 +2766,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si unsigned int stride; GUID subtype; - TRACE("%s, %lu, %lu, %p.\n", debugstr_fourcc(fourcc), width, height, size); + TRACE("%s, %lu, %lu, %p.\n", mf_debugstr_fourcc(fourcc), width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 9cd3d601587..c9af96d88f9 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -148,7 +148,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) } } -static inline const char *debugstr_fourcc(DWORD format) +static inline const char *mf_debugstr_fourcc(DWORD format) { static const struct format_name {

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.267.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 17d9841d86b9f5a7863a45cdfc7a9a2153115621 URL: https://gitlab.winehq.org/wine/wine/-/commit/17d9841d86b9f5a7863a45cdfc7a9a… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Oct 6 19:33:28 2023 +0200 winevulkan: Update to VK spec version 1.3.267. --- dlls/winevulkan/loader_thunks.c | 62 +++ dlls/winevulkan/loader_thunks.h | 42 ++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 1165 ++++++++++++++++++++++++++++++++++++++- dlls/winevulkan/vulkan_thunks.h | 10 + dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 375 ++++++++++++- 7 files changed, 1627 insertions(+), 31 deletions(-)

1 0

Zebediah Figura : wined3d: Store a fragment_caps structure in struct wined3d_d3d_info.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 5ce02389f978d184e2a2d48fc2165c2bf5183ca6 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ce02389f978d184e2a2d48fc2165c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 20 19:56:06 2023 -0500 wined3d: Store a fragment_caps structure in struct wined3d_d3d_info. Instead of duplicating multiple members. --- dlls/wined3d/adapter_gl.c | 12 ++++-------- dlls/wined3d/adapter_vk.c | 6 +----- dlls/wined3d/arb_program_shader.c | 11 ++++++++--- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/context_gl.c | 10 +++++----- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 26 ++++++++++++-------------- 10 files changed, 41 insertions(+), 46 deletions(-)

1 0

Zebediah Figura : wined3d: Store the "wined3d_caps" field of struct fragment_caps as separate bool flags.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: ef2ad5ef668675f3e49e0fedb479dea315c5a357 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef2ad5ef668675f3e49e0fedb479de… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 20 19:46:23 2023 -0500 wined3d: Store the "wined3d_caps" field of struct fragment_caps as separate bool flags. --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/arb_program_shader.c | 9 +++++---- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/glsl_shader.c | 9 +++++---- dlls/wined3d/nvidia_texture_shader.c | 3 ++- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_spirv.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/utils.c | 3 +-- dlls/wined3d/wined3d_private.h | 8 +++----- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 576430c9284..7ddcb444450 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5211,7 +5211,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; d3d_info->ffp_alpha_test = !!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; - d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); + d3d_info->shader_color_key = fragment_caps.color_key; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->frag_coord_correction = !!gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 211071fae83..7cf829201a7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2341,7 +2341,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; d3d_info->ffp_alpha_test = false; d3d_info->vs_clipping = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING); - d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); + d3d_info->shader_color_key = fragment_caps.color_key; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = false; /* VK_EXT_shader_viewport_index_layer */ diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b568a9e68ae..726734f88cd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4824,7 +4824,7 @@ static HRESULT shader_arb_alloc(struct wined3d_device *device, const struct wine priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; fragment_pipe->get_caps(device->adapter, &fragment_caps); - priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + priv->ffp_proj_control = fragment_caps.proj_control; device->vertex_priv = vertex_priv; device->fragment_priv = fragment_priv; @@ -5763,9 +5763,10 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen { const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL - | WINED3D_FRAGMENT_CAP_SRGB_WRITE - | WINED3D_FRAGMENT_CAP_COLOR_KEY; + memset(caps, 0, sizeof(*caps)); + caps->proj_control = true; + caps->srgb_write = true; + caps->color_key = true; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | WINED3DTEXOPCAPS_SELECTARG1 | diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 8606d86516d..f19c2028ca4 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1269,7 +1269,8 @@ static void atifs_enable(const struct wined3d_context *context, BOOL enable) static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + memset(caps, 0, sizeof(*caps)); + caps->proj_control = true; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP | WINED3DPMISCCAPS_PERSTAGECONSTANT; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE | diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0fa509a2a6d..e381e8df7a4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11102,7 +11102,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; fragment_pipe->get_caps(device->adapter, &fragment_caps); - priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + priv->ffp_proj_control = fragment_caps.proj_control; priv->legacy_lighting = device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING; device->vertex_priv = vertex_priv; @@ -12050,9 +12050,10 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s { const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; - caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL - | WINED3D_FRAGMENT_CAP_SRGB_WRITE - | WINED3D_FRAGMENT_CAP_COLOR_KEY; + memset(caps, 0, sizeof(*caps)); + caps->proj_control = true; + caps->srgb_write = true; + caps->color_key = true; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP | WINED3DPMISCCAPS_PERSTAGECONSTANT; caps->TextureOpCaps = WINED3DTEXOPCAPS_DISABLE diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index e49ae68a784..55e2a596dd1 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -697,7 +697,8 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct { const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; - caps->wined3d_caps = 0; + memset(caps, 0, sizeof(*caps)); + caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; /* The caps below can be supported but aren't handled yet in utils.c diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index fa9a487edda..9a7919b437b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1990,7 +1990,7 @@ static HRESULT shader_none_alloc(struct wined3d_device *device, const struct win priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; fragment_pipe->get_caps(device->adapter, &fragment_caps); - priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + priv->ffp_proj_control = fragment_caps.proj_control; device->vertex_priv = vertex_priv; device->fragment_priv = fragment_priv; diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 355eac1ef7b..2d98dd526ef 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -993,7 +993,7 @@ static HRESULT shader_spirv_alloc(struct wined3d_device *device, priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; fragment_pipe->get_caps(device->adapter, &fragment_caps); - priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; + priv->ffp_proj_control = fragment_caps.proj_control; memset(&priv->bindings, 0, sizeof(priv->bindings)); device->vertex_priv = vertex_priv; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a492876a093..3f7bcae738c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5150,7 +5150,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct { const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; - caps->wined3d_caps = 0; + memset(caps, 0, sizeof(*caps)); caps->PrimitiveMiscCaps = 0; caps->TextureOpCaps = WINED3DTEXOPCAPS_ADD | WINED3DTEXOPCAPS_ADDSIGNED diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7e4b7bf2f91..6b611dc0fae 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3193,8 +3193,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) - && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); + srgb_write = fragment_caps.srgb_write && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); for (i = 0; i < ARRAY_SIZE(format_texture_info); ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5f28b4f6f88..2e9eab2225d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1988,17 +1988,15 @@ struct wined3d_state_entry_template unsigned int extension; }; -#define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 -#define WINED3D_FRAGMENT_CAP_SRGB_WRITE 0x00000002 -#define WINED3D_FRAGMENT_CAP_COLOR_KEY 0x00000004 - struct fragment_caps { - DWORD wined3d_caps; DWORD PrimitiveMiscCaps; DWORD TextureOpCaps; unsigned int max_blend_stages; unsigned int max_textures; + bool proj_control; + bool srgb_write; + bool color_key; }; #define GL_EXT_EMUL_ARB_MULTITEXTURE 0x00000001

1 0

Zebediah Figura : wined3d: Rename the "MaxTextureBlendStages" field of struct fragment_caps to "max_blend_stages".
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: efb0d67a70696377fa3902356794ebaebfb5b04c URL: https://gitlab.winehq.org/wine/wine/-/commit/efb0d67a70696377fa3902356794eb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 20 19:38:11 2023 -0500 wined3d: Rename the "MaxTextureBlendStages" field of struct fragment_caps to "max_blend_stages". --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f9fb68e437b..576430c9284 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5190,7 +5190,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; d3d_info->limits.ffp_textures = fragment_caps.max_textures; - d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + d3d_info->limits.ffp_blend_stages = fragment_caps.max_blend_stages; TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 919a56ceca8..211071fae83 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2320,7 +2320,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; d3d_info->limits.ffp_textures = fragment_caps.max_textures; - d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; + d3d_info->limits.ffp_blend_stages = fragment_caps.max_blend_stages; d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3b3e9dfb2c3..b568a9e68ae 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5795,7 +5795,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen /* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */ - caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; + caps->max_blend_stages = WINED3D_MAX_FFP_TEXTURES; caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 96bb4a5a6cc..8606d86516d 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1312,7 +1312,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen * The proper fix for this is not to use GL_ATI_fragment_shader on cards newer than the * r200 series and use an ARB or GLSL shader instead */ - caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; + caps->max_blend_stages = WINED3D_MAX_FFP_TEXTURES; caps->max_textures = 6; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 91342de6aa5..ba86e9dc2d4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2529,7 +2529,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->PixelShader1xMaxValue = shader_caps.ps_1x_max_value; caps->TextureOpCaps = fragment_caps.TextureOpCaps; - caps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages; + caps->MaxTextureBlendStages = fragment_caps.max_blend_stages; caps->MaxSimultaneousTextures = fragment_caps.max_textures; caps->MaxUserClipPlanes = vertex_caps.max_user_clip_planes; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2662013f2a0..0fa509a2a6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12080,7 +12080,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s | WINED3DTEXOPCAPS_LERP | WINED3DTEXOPCAPS_BUMPENVMAP | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE; - caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; + caps->max_blend_stages = WINED3D_MAX_FFP_TEXTURES; caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 367041dd412..e49ae68a784 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -747,7 +747,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct WINED3DTEXOPCAPS_PREMODULATE */ #endif - caps->MaxTextureBlendStages = min(WINED3D_MAX_FFP_TEXTURES, gl_info->limits.general_combiners); + caps->max_blend_stages = min(WINED3D_MAX_FFP_TEXTURES, gl_info->limits.general_combiners); caps->max_textures = gl_info->limits.ffp_textures; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fbaa6999326..a492876a093 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5185,7 +5185,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct if (gl_info->supported[ARB_TEXTURE_ENV_DOT3]) caps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3; - caps->MaxTextureBlendStages = gl_info->limits.ffp_textures; + caps->max_blend_stages = gl_info->limits.ffp_textures; caps->max_textures = gl_info->limits.ffp_textures; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 317fc4e5535..5f28b4f6f88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1997,7 +1997,7 @@ struct fragment_caps DWORD wined3d_caps; DWORD PrimitiveMiscCaps; DWORD TextureOpCaps; - DWORD MaxTextureBlendStages; + unsigned int max_blend_stages; unsigned int max_textures; };

1 0

Zebediah Figura : wined3d: Rename the "MaxSimultaneousTextures" field of struct fragment_caps to "max_textures".
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 82873b72a254ce89349804ede36b07af566d8dda URL: https://gitlab.winehq.org/wine/wine/-/commit/82873b72a254ce89349804ede36b07… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 20 19:32:57 2023 -0500 wined3d: Rename the "MaxSimultaneousTextures" field of struct fragment_caps to "max_textures". --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a9454e51b53..f9fb68e437b 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1298,7 +1298,7 @@ static enum wined3d_feature_level feature_level_from_caps(const struct wined3d_g if (fragment_caps->TextureOpCaps & WINED3DTEXOPCAPS_DOTPRODUCT3) return WINED3D_FEATURE_LEVEL_7; - if (fragment_caps->MaxSimultaneousTextures > 1) + if (fragment_caps->max_textures > 1) return WINED3D_FEATURE_LEVEL_6; return WINED3D_FEATURE_LEVEL_5; @@ -5189,7 +5189,7 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; - d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; + d3d_info->limits.ffp_textures = fragment_caps.max_textures; d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index fffe33a76d4..919a56ceca8 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2319,7 +2319,7 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->limits.vs_uniform_count = shader_caps.vs_uniform_count; d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; - d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; + d3d_info->limits.ffp_textures = fragment_caps.max_textures; d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; d3d_info->limits.active_light_count = vertex_caps.max_active_lights; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index f0e1b2bdf99..3b3e9dfb2c3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5796,7 +5796,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen /* TODO: Implement WINED3DTEXOPCAPS_PREMODULATE */ caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; - caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); + caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); } static unsigned int arbfp_get_emul_mask(const struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 2a457a93ff6..96bb4a5a6cc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1313,7 +1313,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen * r200 series and use an ARB or GLSL shader instead */ caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; - caps->MaxSimultaneousTextures = 6; + caps->max_textures = 6; } static unsigned int atifs_get_emul_mask(const struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 78e743900ec..91342de6aa5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2530,7 +2530,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d_adapter *adapter, caps->TextureOpCaps = fragment_caps.TextureOpCaps; caps->MaxTextureBlendStages = fragment_caps.MaxTextureBlendStages; - caps->MaxSimultaneousTextures = fragment_caps.MaxSimultaneousTextures; + caps->MaxSimultaneousTextures = fragment_caps.max_textures; caps->MaxUserClipPlanes = vertex_caps.max_user_clip_planes; caps->MaxActiveLights = vertex_caps.max_active_lights; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b4960fc16a4..2662013f2a0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12081,7 +12081,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s | WINED3DTEXOPCAPS_BUMPENVMAP | WINED3DTEXOPCAPS_BUMPENVMAPLUMINANCE; caps->MaxTextureBlendStages = WINED3D_MAX_FFP_TEXTURES; - caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); + caps->max_textures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_FFP_TEXTURES); } static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 5fd66f73827..367041dd412 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -748,7 +748,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct #endif caps->MaxTextureBlendStages = min(WINED3D_MAX_FFP_TEXTURES, gl_info->limits.general_combiners); - caps->MaxSimultaneousTextures = gl_info->limits.ffp_textures; + caps->max_textures = gl_info->limits.ffp_textures; } static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f7fb3493ea1..fbaa6999326 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5186,7 +5186,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->TextureOpCaps |= WINED3DTEXOPCAPS_DOTPRODUCT3; caps->MaxTextureBlendStages = gl_info->limits.ffp_textures; - caps->MaxSimultaneousTextures = gl_info->limits.ffp_textures; + caps->max_textures = gl_info->limits.ffp_textures; } static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_adapter *adapter) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f1839de440..317fc4e5535 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1998,7 +1998,7 @@ struct fragment_caps DWORD PrimitiveMiscCaps; DWORD TextureOpCaps; DWORD MaxTextureBlendStages; - DWORD MaxSimultaneousTextures; + unsigned int max_textures; }; #define GL_EXT_EMUL_ARB_MULTITEXTURE 0x00000001

1 0

Zebediah Figura : wined3d: Rename the "textures" field of struct wined3d_gl_limits to "ffp_textures".
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 15140e7645c44691cf85c68f964edd3d7f015d76 URL: https://gitlab.winehq.org/wine/wine/-/commit/15140e7645c44691cf85c68f964edd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 19:23:17 2023 -0600 wined3d: Rename the "textures" field of struct wined3d_gl_limits to "ffp_textures". --- dlls/wined3d/adapter_gl.c | 12 ++++++------ dlls/wined3d/ati_fragment_shader.c | 6 +++--- dlls/wined3d/context_gl.c | 8 ++++---- dlls/wined3d/nvidia_texture_shader.c | 10 +++++----- dlls/wined3d/state.c | 10 +++++----- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_gl.h | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-)

1 0

Zebediah Figura : wined3d: Rename WINED3D_MAX_TEXTURES to WINED3D_MAX_FFP_TEXTURES.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: fbee3cf2e062973b37bb14f36c8764d1729bbf18 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbee3cf2e062973b37bb14f36c8764… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 9 19:18:29 2023 -0600 wined3d: Rename WINED3D_MAX_TEXTURES to WINED3D_MAX_FFP_TEXTURES. --- dlls/wined3d/adapter_gl.c | 14 +++---- dlls/wined3d/arb_program_shader.c | 42 ++++++++++--------- dlls/wined3d/ati_fragment_shader.c | 18 ++++----- dlls/wined3d/context_gl.c | 14 +++---- dlls/wined3d/glsl_shader.c | 78 ++++++++++++++++++------------------ dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader.c | 6 +-- dlls/wined3d/state.c | 8 ++-- dlls/wined3d/stateblock.c | 20 ++++----- dlls/wined3d/utils.c | 23 +++++------ dlls/wined3d/wined3d_private.h | 26 ++++++------ include/wine/wined3d.h | 4 +- 12 files changed, 129 insertions(+), 126 deletions(-)

1 0

Jactry Zeng : user32: Add more builtin string resources.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: bcc8c31e0df136f4cebef96222b2c69977c41ec2 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcc8c31e0df136f4cebef96222b2c6… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Oct 5 06:52:54 2023 -0500 user32: Add more builtin string resources. --- dlls/user32/resources.h | 11 +++++ dlls/user32/tests/resource.c | 47 +++++++++++++++++++- dlls/user32/user32.rc | 11 +++++ po/ar.po | 98 +++++++++++++++++++++-------------------- po/ast.po | 98 +++++++++++++++++++++-------------------- po/bg.po | 98 +++++++++++++++++++++-------------------- po/ca.po | 98 +++++++++++++++++++++-------------------- po/cs.po | 98 +++++++++++++++++++++-------------------- po/da.po | 98 +++++++++++++++++++++-------------------- po/de.po | 98 +++++++++++++++++++++-------------------- po/el.po | 98 +++++++++++++++++++++-------------------- po/en.po | 98 +++++++++++++++++++++-------------------- po/en_US.po | 98 +++++++++++++++++++++-------------------- po/eo.po | 98 +++++++++++++++++++++-------------------- po/es.po | 98 +++++++++++++++++++++-------------------- po/fa.po | 98 +++++++++++++++++++++-------------------- po/fi.po | 101 ++++++++++++++++++++++--------------------- po/fr.po | 98 +++++++++++++++++++++-------------------- po/he.po | 98 +++++++++++++++++++++-------------------- po/hi.po | 98 +++++++++++++++++++++-------------------- po/hr.po | 98 +++++++++++++++++++++-------------------- po/hu.po | 98 +++++++++++++++++++++-------------------- po/it.po | 98 +++++++++++++++++++++-------------------- po/ja.po | 98 +++++++++++++++++++++-------------------- po/ka.po | 98 +++++++++++++++++++++-------------------- po/ko.po | 98 +++++++++++++++++++++-------------------- po/lt.po | 98 +++++++++++++++++++++-------------------- po/ml.po | 98 +++++++++++++++++++++-------------------- po/nb_NO.po | 98 +++++++++++++++++++++-------------------- po/nl.po | 98 +++++++++++++++++++++-------------------- po/or.po | 98 +++++++++++++++++++++-------------------- po/pa.po | 98 +++++++++++++++++++++-------------------- po/pl.po | 98 +++++++++++++++++++++-------------------- po/pt_BR.po | 98 +++++++++++++++++++++-------------------- po/pt_PT.po | 98 +++++++++++++++++++++-------------------- po/rm.po | 98 +++++++++++++++++++++-------------------- po/ro.po | 98 +++++++++++++++++++++-------------------- po/ru.po | 98 +++++++++++++++++++++-------------------- po/si.po | 98 +++++++++++++++++++++-------------------- po/sk.po | 98 +++++++++++++++++++++-------------------- po/sl.po | 98 +++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 98 +++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 98 +++++++++++++++++++++-------------------- po/sv.po | 98 +++++++++++++++++++++-------------------- po/ta.po | 98 +++++++++++++++++++++-------------------- po/te.po | 98 +++++++++++++++++++++-------------------- po/th.po | 98 +++++++++++++++++++++-------------------- po/tr.po | 98 +++++++++++++++++++++-------------------- po/uk.po | 98 +++++++++++++++++++++-------------------- po/wa.po | 98 +++++++++++++++++++++-------------------- po/wine.pot | 98 +++++++++++++++++++++-------------------- po/zh_CN.po | 98 +++++++++++++++++++++-------------------- po/zh_TW.po | 98 +++++++++++++++++++++-------------------- 53 files changed, 2569 insertions(+), 2403 deletions(-)

1 0

Joel Holdsworth : ntdll/tests: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709.
by Alexandre Julliard 07 Oct '23

07 Oct '23

Module: wine Branch: master Commit: 72ebbca61b81e5aa4c9b200b3522832a8a07bd92 URL: https://gitlab.winehq.org/wine/wine/-/commit/72ebbca61b81e5aa4c9b200b352283… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Fri Oct 6 10:41:37 2023 +0100 ntdll/tests: Fix FILE_RENAME_INFORMATION_EX test failures on Windows 10 1607 & 1709. These versions of Windows are not included in the TestBot base VM set hence why the failures were not caught when the tests were submitted in the original commit: 07e40a6f9f70338d9810d50b606696b7be984d98 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55733 Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 4e1750a4751..da3611f74f2 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2259,12 +2259,18 @@ static void test_file_rename_information_ex(void) io.Status = 0xdeadbeef; res = pNtSetInformationFile( handle, &io, fri, sizeof(FILE_RENAME_INFORMATION) + fri->FileNameLength, FileRenameInformationEx ); - ok( io.Status == STATUS_SUCCESS, "io.Status expected STATUS_SUCCESS, got %lx\n", io.Status ); - ok( res == STATUS_SUCCESS, "res expected STATUS_SUCCESS, got %lx\n", res ); - fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( fileDeleted, "file should not exist\n" ); - fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; - ok( !fileDeleted, "file should exist\n" ); + ok( io.Status == STATUS_SUCCESS || io.Status == 0xdeadbeef, + "io.Status expected STATUS_SUCCESS or 0xdeadbeef, got %lx\n", io.Status ); + ok( res == STATUS_SUCCESS || res == STATUS_NOT_SUPPORTED, + "res expected STATUS_SUCCESS or STATUS_NOT_SUPPORTED, got %lx\n", res ); + + if (res == STATUS_SUCCESS) + { + fileDeleted = GetFileAttributesW( oldpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( fileDeleted, "file should not exist\n" ); + fileDeleted = GetFileAttributesW( newpath ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "file should exist\n" ); + } CloseHandle( handle ); HeapFree( GetProcessHeap(), 0, fri );

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023