- Wine-Commits - list.winehq.org

Alexandre Julliard : msvcp71: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: cedf9b3563ec8d6b748c3e2c1ff3093ad1d5e0d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/cedf9b3563ec8d6b748c3e2c1ff309… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:32:01 2024 +0200 msvcp71: Add missing C++ mangled names for ARM. --- dlls/msvcp71/msvcp71.spec | 1943 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1943 insertions(+)

1 0

Alexandre Julliard : msvcp80: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 2a31da0061b09942f4111217f7d50ac34c2c2c02 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a31da0061b09942f4111217f7d50a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:32:12 2024 +0200 msvcp80: Add missing C++ mangled names for ARM. --- dlls/msvcp80/msvcp80.spec | 2129 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2129 insertions(+)

1 0

Alexandre Julliard : msvcp60: Add missing C++ mangled names for ARM.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: c665c10b0fc5b1818c59c57c1caa83c04fc60607 URL: https://gitlab.winehq.org/wine/wine/-/commit/c665c10b0fc5b1818c59c57c1caa83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 29 12:31:40 2024 +0200 msvcp60: Add missing C++ mangled names for ARM. --- dlls/msvcp60/msvcp60.spec | 1383 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 1381 insertions(+), 2 deletions(-)

1 0

Krzysztof Bogacki : win32u: Prefer Vulkan PCI IDs over empty ones.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 93b95767f68da205d61a346e5f3b1019116fce73 URL: https://gitlab.winehq.org/wine/wine/-/commit/93b95767f68da205d61a346e5f3b10… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Tue May 28 00:12:34 2024 +0200 win32u: Prefer Vulkan PCI IDs over empty ones. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index bd1100cbb98..890ca8129de 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1252,6 +1252,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; + if (!pci_id->vendor && !pci_id->device && vulkan_gpu) pci_id = &vulkan_gpu->pci_id; + if ((!name || !strcmp( name, "Wine GPU" )) && vulkan_gpu) name = vulkan_gpu->name; if (name) RtlUTF8ToUnicodeN( ctx->gpu.name, sizeof(ctx->gpu.name) - sizeof(WCHAR), &len, name, strlen( name ) );

1 0

Krzysztof Bogacki : win32u: Use common name for fake GPUs and prefer Vulkan name over it.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: cb98a9b5abf483868730322d176367912c6a3c08 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb98a9b5abf483868730322d176367… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Mon May 27 23:48:47 2024 +0200 win32u: Use common name for fake GPUs and prefer Vulkan name over it. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 4 ++-- dlls/wineandroid.drv/init.c | 2 +- dlls/winewayland.drv/display.c | 2 +- dlls/winex11.drv/xinerama.c | 2 +- dlls/winex11.drv/xrandr.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index c556f79719d..bd1100cbb98 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1252,7 +1252,7 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; - if (!name && vulkan_gpu) name = vulkan_gpu->name; + if ((!name || !strcmp( name, "Wine GPU" )) && vulkan_gpu) name = vulkan_gpu->name; if (name) RtlUTF8ToUnicodeN( ctx->gpu.name, sizeof(ctx->gpu.name) - sizeof(WCHAR), &len, name, strlen( name ) ); snprintf( ctx->gpu.path, sizeof(ctx->gpu.path), "PCI\\VEN_%04X&DEV_%04X&SUBSYS_%08X&REV_%02X\\%08X", @@ -1799,7 +1799,7 @@ static NTSTATUS default_update_display_devices( struct device_manager_ctx *ctx ) struct gdi_monitor monitor = {0}; DEVMODEW mode = {.dmSize = sizeof(mode)}; - add_gpu( "Default GPU", &pci_id, NULL, ctx ); + add_gpu( "Wine GPU", &pci_id, NULL, ctx ); add_source( "Default", source_flags, ctx ); if (!read_source_mode( ctx->source_key, ENUM_CURRENT_SETTINGS, &mode )) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index dd102375e44..d48c4153b06 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -281,7 +281,7 @@ UINT ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag }; DEVMODEW current = mode; - device_manager->add_gpu( "Android GPU", &pci_id, NULL, param ); + device_manager->add_gpu( "Wine GPU", &pci_id, NULL, param ); device_manager->add_source( "Default", source_flags, param ); device_manager->add_monitor( &gdi_monitor, param ); diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 002bcd0f542..9b4ebe7cdc1 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -193,7 +193,7 @@ static void wayland_add_device_gpu(const struct gdi_device_manager *device_manag TRACE("\n"); - device_manager->add_gpu("Wayland GPU", &pci_id, NULL, param); + device_manager->add_gpu("Wine GPU", &pci_id, NULL, param); } static void wayland_add_device_source(const struct gdi_device_manager *device_manager, diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index c394c8a49b4..1fd170b0e07 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -199,7 +199,7 @@ static BOOL xinerama_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL ge if (!gpus) return FALSE; - gpus[0].name = strdup( "Xinerama GPU" ); + gpus[0].name = strdup( "Wine GPU" ); *new_gpus = gpus; *count = 1; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index d255864fe57..9a4284f493f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -787,7 +787,7 @@ static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count, BOOL ge if (!provider_resources->nproviders) { WARN("XRandR implementation doesn't report any providers, faking one.\n"); - gpus[0].name = strdup( "Xrandr GPU" ); + gpus[0].name = strdup( "Wine GPU" ); *new_gpus = gpus; *count = 1; ret = TRUE;

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context.namedArraysLoaded field.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: 4a4292d3e10911aad45b1b503598cf8dd54ff35f URL: https://gitlab.winehq.org/wine/wine/-/commit/4a4292d3e10911aad45b1b503598cf… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Tue Apr 23 16:01:25 2024 -0500 wined3d: Remove the no longer used wined3d_context.namedArraysLoaded field. --- dlls/wined3d/context_gl.c | 30 ------------------------------ dlls/wined3d/wined3d_gl.h | 1 - dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 8072ec15500..49d54d49e33 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4874,18 +4874,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s TRACE("Draw completed.\n"); } -void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - unsigned int texture_idx; - - for (texture_idx = 0; texture_idx < gl_info->limits.texture_coords; ++texture_idx) - { - gl_info->gl_ops.ext.p_glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx); - gl_info->gl_ops.gl.p_glDisableClientState(GL_TEXTURE_COORD_ARRAY); - } -} - static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_element *element, const struct wined3d_state *state) { @@ -4896,22 +4884,6 @@ static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_el return offset; } -/* This should match any arrays loaded in wined3d_context_gl_load_vertex_data(). */ -static void wined3d_context_gl_unload_vertex_data(struct wined3d_context_gl *context_gl) -{ - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - - if (!context_gl->c.namedArraysLoaded) - return; - gl_info->gl_ops.gl.p_glDisableClientState(GL_VERTEX_ARRAY); - gl_info->gl_ops.gl.p_glDisableClientState(GL_NORMAL_ARRAY); - gl_info->gl_ops.gl.p_glDisableClientState(GL_COLOR_ARRAY); - if (gl_info->supported[EXT_SECONDARY_COLOR]) - gl_info->gl_ops.gl.p_glDisableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); - wined3d_context_gl_unload_tex_coords(context_gl); - context_gl->c.namedArraysLoaded = FALSE; -} - static void wined3d_context_gl_unload_numbered_array(struct wined3d_context_gl *context_gl, unsigned int i) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -5164,7 +5136,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - wined3d_context_gl_unload_vertex_data(context_gl); wined3d_context_gl_load_numbered_arrays(context_gl, &context_gl->c.stream_info, state); } @@ -5243,7 +5214,6 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, GL_EXTCALL(glGenBuffers(1, &context_gl->blit_vbo)); GL_EXTCALL(glBindBuffer(GL_ARRAY_BUFFER, context_gl->blit_vbo)); - wined3d_context_gl_unload_vertex_data(context_gl); wined3d_context_gl_unload_numbered_arrays(context_gl); GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW)); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 1dfa4138894..060d92318f8 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -762,7 +762,6 @@ BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl); void wined3d_context_gl_submit_command_fence(struct wined3d_context_gl *context_gl); void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl); -void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *context_gl); void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, unsigned int range_count, const struct wined3d_range *ranges); void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c762de4b5bf..2d1bab87b00 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1930,11 +1930,10 @@ struct wined3d_context DWORD current : 1; DWORD destroyed : 1; DWORD destroy_delayed : 1; - DWORD namedArraysLoaded : 1; DWORD update_primitive_type : 1; DWORD update_patch_vertex_count : 1; DWORD update_multisample_state : 1; - DWORD padding : 13; + DWORD padding : 14; DWORD clip_distance_mask : 8; /* WINED3D_MAX_CLIP_DISTANCES, 8 */

1 0

Krzysztof Bogacki : win32u: Prefer Vulkan UUIDs over empty ones.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: ef36081fe7b0b449c990db80f97cfd5d23e852f6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef36081fe7b0b449c990db80f97cfd… Author: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> Date: Tue May 28 01:13:21 2024 +0200 win32u: Prefer Vulkan UUIDs over empty ones. Signed-off-by: Krzysztof Bogacki <krzysztof.bogacki(a)leancode.pl> --- dlls/win32u/sysparams.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 890ca8129de..49bf26214e7 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1218,6 +1218,8 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * HKEY hkey, subkey; DWORD len; + static const GUID empty_uuid; + TRACE( "%s %04X %04X %08X %02X %s\n", debugstr_a( name ), pci_id->vendor, pci_id->device, pci_id->subsystem, pci_id->revision, debugstr_guid( vulkan_uuid ) ); @@ -1249,7 +1251,7 @@ static void add_gpu( const char *name, const struct pci_id *pci_id, const GUID * debugstr_guid(&vulkan_gpu->uuid), debugstr_a(vulkan_gpu->name)); } - if (vulkan_uuid) ctx->gpu.vulkan_uuid = *vulkan_uuid; + if (vulkan_uuid && !IsEqualGUID( vulkan_uuid, &empty_uuid )) ctx->gpu.vulkan_uuid = *vulkan_uuid; else if (vulkan_gpu) ctx->gpu.vulkan_uuid = vulkan_gpu->uuid; if (!pci_id->vendor && !pci_id->device && vulkan_gpu) pci_id = &vulkan_gpu->pci_id;

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context_gl.untracked_material_count field.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: c85ae9eba2785f10ae72a73d92d3b6eb8cd55832 URL: https://gitlab.winehq.org/wine/wine/-/commit/c85ae9eba2785f10ae72a73d92d3b6… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:08:20 2024 -0500 wined3d: Remove the no longer used wined3d_context_gl.untracked_material_count field. --- dlls/wined3d/context_gl.c | 55 +++++------------------------------------------ dlls/wined3d/wined3d_gl.h | 3 +-- 2 files changed, 6 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 9a85e0a4c86..310473138a4 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4704,28 +4704,6 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ checkGLcall("draw indirect"); } -static void remove_vbos(struct wined3d_context *context, - const struct wined3d_state *state, struct wined3d_stream_info *s) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(s->elements); ++i) - { - struct wined3d_stream_info_element *e; - - if (!(s->use_map & (1u << i))) - continue; - - e = &s->elements[i]; - if (e->data.buffer_object) - { - struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; - e->data.buffer_object = 0; - e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context); - } - } -} - static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) { GLenum gl_primitive_type = gl_primitive_type_from_d3d(primitive_type); @@ -4756,14 +4734,13 @@ static GLenum gl_tfb_primitive_type_from_d3d(enum wined3d_primitive_type primiti void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, const struct wined3d_draw_parameters *parameters) { - BOOL emulation = FALSE, rasterizer_discard = FALSE; const struct wined3d_fb_state *fb = &state->fb; const struct wined3d_stream_info *stream_info; struct wined3d_rendertarget_view *dsv, *rtv; - struct wined3d_stream_info si_emulated; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; + bool rasterizer_discard = false; unsigned int i, idx_size = 0; const void *idx_data = NULL; @@ -4870,28 +4847,6 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s idx_size = 4; } - if (!use_vs(state)) - { - if (!stream_info->position_transformed && context_gl->untracked_material_count - && state->render_states[WINED3D_RS_LIGHTING]) - { - static BOOL warned; - - if (!warned++) - FIXME("Using software emulation because not all material properties could be tracked.\n"); - else - WARN_(d3d_perf)("Using software emulation because not all material properties could be tracked.\n"); - emulation = TRUE; - } - - if (emulation) - { - si_emulated = context->stream_info; - remove_vbos(context, state, &si_emulated); - stream_info = &si_emulated; - } - } - if (use_transform_feedback(state)) { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; @@ -4900,7 +4855,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s { glEnable(GL_RASTERIZER_DISCARD); checkGLcall("enable rasterizer discard"); - rasterizer_discard = TRUE; + rasterizer_discard = true; } if (context->transform_feedback_paused) @@ -4952,16 +4907,16 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indirect) { - if (!context->use_immediate_mode_draw && !emulation) + if (!context->use_immediate_mode_draw) wined3d_context_gl_draw_indirect(context_gl, state, &parameters->u.indirect, idx_size); else - FIXME("Indirect draws with immediate mode/emulation are not supported.\n"); + FIXME("Indirect draws with immediate mode are not supported.\n"); } else { unsigned int instance_count = parameters->u.direct.instance_count; - if (context->use_immediate_mode_draw || emulation) + if (context->use_immediate_mode_draw) draw_primitive_immediate_mode(wined3d_context_gl(context), state, stream_info, idx_data, idx_size, parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, parameters->u.direct.index_count, instance_count); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 9a27bb5b2bf..2da6add961d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -615,11 +615,10 @@ struct wined3d_context_gl uint32_t fog_enabled : 1; uint32_t diffuse_attrib_to_1 : 1; uint32_t rebind_fbo : 1; - uint32_t untracked_material_count : 2; /* Max value 2 */ uint32_t needs_set : 1; uint32_t internal_format_set : 1; uint32_t valid : 1; - uint32_t padding : 22; + uint32_t padding : 24; uint32_t default_attrib_value_set;

1 0

Elizabeth Figura : wined3d: Remove the no longer used wined3d_context.use_immediate_mode_draw field.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: a7d33cb73b7b5b582be2092b7db8d59b1dda019d URL: https://gitlab.winehq.org/wine/wine/-/commit/a7d33cb73b7b5b582be2092b7db8d5… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:14:54 2024 -0500 wined3d: Remove the no longer used wined3d_context.use_immediate_mode_draw field. --- dlls/wined3d/adapter_gl.c | 108 ----------------------------------------- dlls/wined3d/context.c | 2 - dlls/wined3d/context_gl.c | 82 ++----------------------------- dlls/wined3d/wined3d_gl.h | 7 --- dlls/wined3d/wined3d_private.h | 3 +- 5 files changed, 6 insertions(+), 196 deletions(-)

1 0

Elizabeth Figura : wined3d: Remove the no longer used WINED3D_SHADER_CAP_VS_CLIPPING flag.
by Alexandre Julliard May 29, 2024

May 29, 2024

Module: wine Branch: master Commit: f31849ba8b4cb168f19b824dfff22a58b306640d URL: https://gitlab.winehq.org/wine/wine/-/commit/f31849ba8b4cb168f19b824dfff22a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Mar 20 18:24:31 2024 -0500 wined3d: Remove the no longer used WINED3D_SHADER_CAP_VS_CLIPPING flag. --- dlls/wined3d/adapter_gl.c | 1 - dlls/wined3d/adapter_vk.c | 1 - dlls/wined3d/ffp_gl.c | 15 --------------- dlls/wined3d/glsl_shader.c | 8 +------- dlls/wined3d/shader_spirv.c | 3 +-- dlls/wined3d/utils.c | 11 ----------- dlls/wined3d/wined3d_private.h | 5 +---- 7 files changed, 3 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 823304600f6..56aa9b73269 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4909,7 +4909,6 @@ static void wined3d_adapter_gl_init_d3d_info(struct wined3d_adapter_gl *adapter_ d3d_info->wined3d_creation_flags = wined3d_creation_flags; d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; 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_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 = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 8e004339525..aa02d03b7a4 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2327,7 +2327,6 @@ static void wined3d_adapter_vk_init_d3d_info(struct wined3d_adapter_vk *adapter_ d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; d3d_info->ffp_alpha_test = false; - d3d_info->vs_clipping = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING); 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/ffp_gl.c b/dlls/wined3d/ffp_gl.c index e2b9be647d0..b1a3c56a097 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -537,21 +537,6 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state struct wined3d_context_gl *context_gl = wined3d_context_gl(context); uint32_t enable_mask; - if (use_vs(state) && !context->d3d_info->vs_clipping) - { - static BOOL warned; - - /* The OpenGL spec says that clipping planes are disabled when using - * shaders. Direct3D planes aren't, so that is an issue. The MacOS ATI - * driver keeps clipping planes activated with shaders in some - * conditions I got sick of tracking down. The shader state handler - * disables all clip planes because of that - don't do anything here - * and keep them disabled. */ - if (state->render_states[WINED3D_RS_CLIPPLANEENABLE] && !warned++) - FIXME("Clipping not supported with vertex shaders.\n"); - return; - } - /* glEnable(GL_CLIP_PLANEx) doesn't apply to (ARB backend) vertex shaders. * The enabled / disabled planes are hardcoded into the shader. Update the * shader to update the enabled clipplanes. In case of fixed function, we diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c114734e013..13ba1d65d13 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9594,7 +9594,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * const struct wined3d_gl_info *gl_info = context_gl->gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); BOOL tempreg_used = FALSE, tfactor_used = FALSE; - UINT lowest_disabled_stage; GLuint shader_id; DWORD arg0, arg1, arg2; unsigned int stage; @@ -9660,7 +9659,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (arg0 == WINED3DTA_CONSTANT || arg1 == WINED3DTA_CONSTANT || arg2 == WINED3DTA_CONSTANT) tss_const_map |= 1u << stage; } - lowest_disabled_stage = stage; shader_glsl_add_version_declaration(buffer, gl_info); @@ -9799,9 +9797,6 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (legacy_syntax && settings->fog != WINED3D_FFP_PS_FOG_OFF) shader_addline(buffer, "ffp_varying_fogcoord = gl_FogFragCoord;\n"); - if (lowest_disabled_stage < 7 && settings->emul_clipplanes) - shader_addline(buffer, "if (any(lessThan(ffp_texcoord[7], vec4(0.0)))) discard;\n"); - /* Generate texture sampling instructions */ for (stage = 0; stage < WINED3D_MAX_FFP_TEXTURES && settings->op[stage].cop != WINED3D_TOP_DISABLE; ++stage) { @@ -11373,8 +11368,7 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s /* Ideally we'd only set caps like sRGB writes here if supported by both * the shader backend and the fragment pipe, but we can get called before * shader_glsl_alloc(). */ - caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING - | WINED3D_SHADER_CAP_SRGB_WRITE; + caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE; if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; if (shader_glsl_full_ffp_varyings(gl_info)) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1079c19b99b..37fc1cb22d1 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1076,8 +1076,7 @@ static void shader_spirv_get_caps(const struct wined3d_adapter *adapter, struct caps->ps_uniform_count = WINED3D_MAX_PS_CONSTS_F; caps->ps_1x_max_value = FLT_MAX; caps->varying_count = 0; - caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING - | WINED3D_SHADER_CAP_SRGB_WRITE + caps->wined3d_caps = WINED3D_SHADER_CAP_SRGB_WRITE | WINED3D_SHADER_CAP_FULL_FFP_VARYINGS; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7e4fe21e727..ef95c40135a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6491,17 +6491,6 @@ void wined3d_ffp_get_fs_settings(const struct wined3d_context *context, const st } } settings->sRGB_write = !d3d_info->srgb_write_control && needs_srgb_write(d3d_info, state, &state->fb); - if (d3d_info->vs_clipping || !use_vs(state) || !state->render_states[WINED3D_RS_CLIPPING] - || !state->render_states[WINED3D_RS_CLIPPLANEENABLE]) - { - /* No need to emulate clipplanes if GL supports native vertex shader clipping or if - * the fixed function vertex pipeline is used(which always supports clipplanes), or - * if no clipplane is enabled - */ - settings->emul_clipplanes = 0; - } else { - settings->emul_clipplanes = 1; - } texture = wined3d_state_get_ffp_texture(state, 0); if (state->render_states[WINED3D_RS_COLORKEYENABLE] diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 34c820497ad..c762de4b5bf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -222,7 +222,6 @@ struct wined3d_d3d_info uint32_t wined3d_creation_flags; uint32_t emulated_flatshading : 1; uint32_t ffp_alpha_test : 1; - uint32_t vs_clipping : 1; uint32_t shader_double_precision : 1; uint32_t shader_output_interpolation : 1; uint32_t viewport_array_index_any_shader : 1; @@ -1402,7 +1401,6 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001u #define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u #define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u #define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u @@ -2669,9 +2667,8 @@ struct texture_stage_op struct ffp_frag_settings { struct texture_stage_op op[WINED3D_MAX_FFP_TEXTURES]; - enum wined3d_ffp_ps_fog_mode fog; + unsigned char fog; /* enum wined3d_ffp_ps_fog_mode */ unsigned char sRGB_write; - unsigned char emul_clipplanes; unsigned char texcoords_initialized; unsigned char color_key_enabled : 1; unsigned char pointsprite : 1;

1 0