August 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Use unlink and destructor in the vtbl for CSSStyle.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: ae9aa7ec231ce62337286715de5a2efd65418e0b URL: https://gitlab.winehq.org/wine/wine/-/commit/ae9aa7ec231ce62337286715de5a2e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:25 2023 +0300 mshtml: Use unlink and destructor in the vtbl for CSSStyle. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstyle.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 766a9306b05..b696a155fc2 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -4772,12 +4772,8 @@ static ULONG WINAPI HTMLCSSStyleDeclaration_Release(IHTMLCSSStyleDeclaration *if TRACE("(%p) ref=%ld\n", This, ref); - if(!ref) { - if(This->nsstyle) - nsIDOMCSSStyleDeclaration_Release(This->nsstyle); + if(!ref) release_dispex(&This->dispex); - free(This); - } return ref; } @@ -9969,6 +9965,18 @@ static inline CSSStyle *impl_from_DispatchEx(DispatchEx *dispex) return CONTAINING_RECORD(dispex, CSSStyle, dispex); } +static void CSSStyle_unlink(DispatchEx *dispex) +{ + CSSStyle *This = impl_from_DispatchEx(dispex); + unlink_ref(&This->nsstyle); +} + +static void CSSStyle_destructor(DispatchEx *dispex) +{ + CSSStyle *This = impl_from_DispatchEx(dispex); + free(This); +} + static HRESULT CSSStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID *dispid) { CSSStyle *This = impl_from_DispatchEx(dispex); @@ -9997,8 +10005,8 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { - NULL, - NULL, + CSSStyle_destructor, + CSSStyle_unlink, NULL, CSSStyle_get_dispid, NULL,

1 0

Gabriel Ivăncescu : mshtml: Introduce unlink_ref helper.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 3c92edfdf2fd9d47fd5e9fd2aa65eb8a55787a01 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c92edfdf2fd9d47fd5e9fd2aa65eb… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:24 2023 +0300 mshtml: Introduce unlink_ref helper. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 8 +----- dlls/mshtml/htmlarea.c | 8 +----- dlls/mshtml/htmlbody.c | 7 +---- dlls/mshtml/htmldoc.c | 18 +++--------- dlls/mshtml/htmlform.c | 8 +----- dlls/mshtml/htmlframe.c | 16 ++--------- dlls/mshtml/htmlimg.c | 8 +----- dlls/mshtml/htmlinput.c | 16 ++--------- dlls/mshtml/htmllink.c | 8 +----- dlls/mshtml/htmlnode.c | 7 +---- dlls/mshtml/htmlobject.c | 8 +----- dlls/mshtml/htmlscript.c | 8 +----- dlls/mshtml/htmlselect.c | 16 ++--------- dlls/mshtml/htmlstyleelem.c | 14 ++-------- dlls/mshtml/htmltable.c | 24 ++-------------- dlls/mshtml/htmltextarea.c | 8 +----- dlls/mshtml/mshtml_private.h | 10 +++++++ dlls/mshtml/navigate.c | 16 ++--------- dlls/mshtml/nsembed.c | 11 ++------ dlls/mshtml/nsevents.c | 5 +--- dlls/mshtml/nsio.c | 65 ++++++++------------------------------------ dlls/mshtml/oleobj.c | 48 +++++++------------------------- dlls/mshtml/persist.c | 12 ++------ dlls/mshtml/pluginhost.c | 17 ++---------- dlls/mshtml/script.c | 11 ++------ dlls/mshtml/view.c | 5 +--- 26 files changed, 70 insertions(+), 312 deletions(-)

1 0

Francois Gouget : webservices: Make alloc_float_text() static.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 5d377d8a5fe24052accc1f156c72b857fe415f6d URL: https://gitlab.winehq.org/wine/wine/-/commit/5d377d8a5fe24052accc1f156c72b8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 17 09:20:42 2017 +0200 webservices: Make alloc_float_text() static. --- dlls/webservices/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 41b2adc8724..0c8ddcea035 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -914,7 +914,7 @@ WS_XML_UINT64_TEXT *alloc_uint64_text( UINT64 value ) return ret; } -WS_XML_FLOAT_TEXT *alloc_float_text( float value ) +static WS_XML_FLOAT_TEXT *alloc_float_text( float value ) { WS_XML_FLOAT_TEXT *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index b754b36d02c..806d79ba4f2 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -83,7 +83,6 @@ WS_XML_BOOL_TEXT *alloc_bool_text( BOOL ); WS_XML_INT32_TEXT *alloc_int32_text( INT32 ); WS_XML_INT64_TEXT *alloc_int64_text( INT64 ); WS_XML_UINT64_TEXT *alloc_uint64_text( UINT64 ); -WS_XML_FLOAT_TEXT *alloc_float_text( float ); WS_XML_DOUBLE_TEXT *alloc_double_text( double ); WS_XML_GUID_TEXT *alloc_guid_text( const GUID * ); WS_XML_UNIQUE_ID_TEXT *alloc_unique_id_text( const GUID * );

1 0

Zebediah Figura : wined3d: Pass map flags to wined3d_context_copy_bo_address().
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 9373cd5e3e1c5d4fd5e26783781ba5ea626b2094 URL: https://gitlab.winehq.org/wine/wine/-/commit/9373cd5e3e1c5d4fd5e26783781ba5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 12:48:15 2023 -0500 wined3d: Pass map flags to wined3d_context_copy_bo_address(). This is a step towards implementing D3D11_COPY_FLAGS. --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/adapter_vk.c | 14 +++++--------- dlls/wined3d/buffer.c | 22 ++++++++++++++++++---- dlls/wined3d/context_gl.c | 6 +----- dlls/wined3d/directx.c | 2 +- dlls/wined3d/texture.c | 3 ++- dlls/wined3d/view.c | 5 +++-- dlls/wined3d/wined3d_private.h | 8 ++++---- dlls/wined3d/wined3d_vk.h | 2 +- 9 files changed, 37 insertions(+), 29 deletions(-)

1 0

Zebediah Figura : wined3d: Do not load UAV locations when clearing if not necessary.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: d163ef089e8f68deef4b10a63b72003aaba0ec0b URL: https://gitlab.winehq.org/wine/wine/-/commit/d163ef089e8f68deef4b10a63b7200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 17 13:18:07 2023 -0500 wined3d: Do not load UAV locations when clearing if not necessary. Don't load the buffer location if we are clearing the whole buffer, and never load the texture location (for Vulkan; GL already did this). Only prepare them instead. --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/view.c | 57 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 47 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2c99e5872ca..efbd3233428 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -103,7 +103,7 @@ static BOOL buffer_is_fully_dirty(const struct wined3d_buffer *buffer) && !buffer->maps->offset && buffer->maps->size == buffer->resource.size; } -static void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, DWORD location) +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, uint32_t location) { TRACE("buffer %p, location %s.\n", buffer, wined3d_debug_location(location)); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e862f54bc10..fb6f5d545ba 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1657,11 +1657,15 @@ void wined3d_unordered_access_view_gl_clear(struct wined3d_unordered_access_view } buffer = buffer_from_resource(resource); - wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); + get_buffer_view_range(buffer, &view_gl->v.desc, &format_gl->f, &offset, &size); + + if (!offset && size == buffer->resource.size) + wined3d_buffer_prepare_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); + else + wined3d_buffer_load_location(buffer, &context_gl->c, WINED3D_LOCATION_BUFFER); wined3d_unordered_access_view_invalidate_location(&view_gl->v, ~WINED3D_LOCATION_BUFFER); bo_gl = wined3d_bo_gl(buffer->buffer_object); - get_buffer_view_range(buffer, &view_gl->v.desc, &format_gl->f, &offset, &size); wined3d_context_gl_bind_bo(context_gl, bo_gl->binding, bo_gl->id); GL_EXTCALL(glClearBufferSubData(bo_gl->binding, format_gl->internal, bo_gl->b.buffer_offset + offset, size, format_gl->format, format_gl->type, clear_value)); @@ -1979,8 +1983,6 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view struct wined3d_range range; VkMemoryBarrier vk_barrier; VkPipeline vk_pipeline; - DWORD uav_location; - unsigned int level; bool is_array; device_vk = wined3d_device_vk(device); @@ -2048,8 +2050,8 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view if (resource->type == WINED3D_RTYPE_BUFFER) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int offset, size; - uav_location = WINED3D_LOCATION_BUFFER; layout = state->buffer_layout; vk_writes[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; @@ -2058,19 +2060,53 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view else constants.extent.width = view_desc->u.buffer.count; constants.extent.height = 1; + + get_buffer_view_range(buffer, view_desc, view_format, &offset, &size); + if (!offset && size == buffer->resource.size) + wined3d_buffer_prepare_location(buffer, &context_vk->c, WINED3D_LOCATION_BUFFER); + else + wined3d_buffer_load_location(buffer, &context_vk->c, WINED3D_LOCATION_BUFFER); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); } else { + unsigned int layer_count, level_count, base_level, base_layer, i, j; + texture_vk = wined3d_texture_vk(wined3d_texture_from_resource(resource)); - uav_location = WINED3D_LOCATION_TEXTURE_RGB; layout = state->image_layout; vk_writes[0].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; - level = view_desc->u.texture.level_idx; - constants.extent.width = wined3d_texture_get_level_width(&texture_vk->t, level); - constants.extent.height = wined3d_texture_get_level_height(&texture_vk->t, level); + level_count = view_desc->u.texture.level_count; + base_level = view_desc->u.texture.level_idx; + if (resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + layer_count = 1; + base_layer = 0; + } + else + { + layer_count = view_desc->u.texture.layer_count; + base_layer = view_desc->u.texture.layer_idx; + } + + constants.extent.width = wined3d_texture_get_level_width(&texture_vk->t, base_level); + constants.extent.height = wined3d_texture_get_level_height(&texture_vk->t, base_level); group_count.z = (view_desc->u.texture.layer_count + group_count.z - 1) / group_count.z; + + for (i = 0; i < layer_count; ++i) + { + for (j = 0; j < level_count; ++j) + { + unsigned int sub_resource_idx = (base_layer + i) * texture_vk->t.level_count + base_level + j; + + wined3d_texture_prepare_location(&texture_vk->t, sub_resource_idx, + &context_vk->c, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(&texture_vk->t, sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + } + } } group_count.x = (constants.extent.width + group_count.x - 1) / group_count.x; @@ -2108,9 +2144,6 @@ void wined3d_unordered_access_view_vk_clear(struct wined3d_unordered_access_view return; } - wined3d_view_load_location(resource, view_desc, &context_vk->c, uav_location); - wined3d_unordered_access_view_invalidate_location(&view_vk->v, ~uav_location); - if (resource->type == WINED3D_RTYPE_BUFFER) { if (format_id == view_format->id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15a32529e84..c2c8f4035bd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4566,6 +4566,7 @@ BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, struct wined3d_context *context, unsigned int location) DECLSPEC_HIDDEN; void wined3d_buffer_update_sub_resource(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct upload_bo *upload_bo, unsigned int offset, unsigned int size) DECLSPEC_HIDDEN; +void wined3d_buffer_validate_location(struct wined3d_buffer *buffer, uint32_t location) DECLSPEC_HIDDEN; HRESULT wined3d_buffer_no3d_init(struct wined3d_buffer *buffer_no3d, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data,

1 0

Gabriel Ivăncescu : mshtml: Use the common HTMLElement dispex vtbl in the dispex definitions.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 7b30e3d34e069708f9c9322d244d50dc9f23d187 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b30e3d34e069708f9c9322d244d50… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Aug 1 19:45:24 2023 +0300 mshtml: Use the common HTMLElement dispex vtbl in the dispex definitions. Rather than filling it during initialization, which was a bit confusing, even more later on when dispex will handle Cycle Collection. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 2 +- dlls/mshtml/htmlarea.c | 2 +- dlls/mshtml/htmlbody.c | 2 +- dlls/mshtml/htmlcomment.c | 3 ++- dlls/mshtml/htmlelem.c | 5 +---- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlform.c | 2 +- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 3 ++- dlls/mshtml/htmlhead.c | 9 +++++---- dlls/mshtml/htmlimg.c | 2 +- dlls/mshtml/htmlinput.c | 6 +++--- dlls/mshtml/htmllink.c | 2 +- dlls/mshtml/htmlobject.c | 5 +++-- dlls/mshtml/htmlscript.c | 2 +- dlls/mshtml/htmlselect.c | 4 ++-- dlls/mshtml/htmlstyleelem.c | 3 ++- dlls/mshtml/htmltable.c | 7 ++++--- dlls/mshtml/htmltextarea.c | 3 ++- 19 files changed, 36 insertions(+), 31 deletions(-)

1 0

Zebediah Figura : wined3d: Avoid uploading deferred context maps more than once.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 2f84616e02e876d71d3871dd17ef3d9db6c043bb URL: https://gitlab.winehq.org/wine/wine/-/commit/2f84616e02e876d71d3871dd17ef3d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 14 18:46:05 2023 -0500 wined3d: Avoid uploading deferred context maps more than once. --- dlls/wined3d/cs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 029ca5d884d..5fc2bf64074 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -4211,7 +4211,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte struct wined3d_resource *resource, unsigned int sub_resource_idx, struct wined3d_box *box, struct upload_bo *bo) { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - const struct wined3d_deferred_upload *upload; + struct wined3d_deferred_upload *upload; if ((upload = deferred_context_get_upload(deferred, resource, sub_resource_idx))) { @@ -4219,6 +4219,7 @@ static bool wined3d_deferred_context_unmap_upload_bo(struct wined3d_device_conte bo->addr.buffer_object = 0; bo->addr.addr = (uint8_t *)align((size_t)upload->sysmem, RESOURCE_ALIGNMENT); bo->flags = upload->upload_flags; + upload->upload_flags = 0; return true; }

1 0

Zebediah Figura : wined3d: Move more miscellaneous GL declarations to wined3d_gl.h.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 34245154e8879cbebbed892d72ff2728a8fe8684 URL: https://gitlab.winehq.org/wine/wine/-/commit/34245154e8879cbebbed892d72ff27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:38:09 2023 -0600 wined3d: Move more miscellaneous GL declarations to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 25 +++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 24 ------------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a4b8e378f67..f4130c72d30 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -366,6 +366,31 @@ GLenum wined3d_buffer_gl_binding_from_bind_flags(const struct wined3d_gl_info *g void wined3d_check_gl_call(const struct wined3d_gl_info *gl_info, const char *file, unsigned int line, const char *name); +struct min_lookup +{ + GLenum mip[WINED3D_TEXF_LINEAR + 1]; +}; + +extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1]; +extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1]; + +static inline GLenum wined3d_gl_mag_filter(enum wined3d_texture_filter_type mag_filter) +{ + return magLookup[mag_filter]; +} + +static inline GLenum wined3d_gl_min_mip_filter(enum wined3d_texture_filter_type min_filter, + enum wined3d_texture_filter_type mip_filter) +{ + return minMipLookup[min_filter].mip[mip_filter]; +} + +GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f); + +const char *debug_fboattachment(GLenum attachment); +const char *debug_fbostatus(GLenum status); +const char *debug_glerror(GLenum error); + static inline bool wined3d_fence_supported(const struct wined3d_gl_info *gl_info) { return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b568fa9d61..c2c3e4720b7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -297,19 +297,9 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define MAX_TGSM_REGISTERS 8192 #define MAX_VERTEX_BLENDS 4 -struct min_lookup -{ - GLenum mip[WINED3D_TEXF_LINEAR + 1]; -}; - -extern const struct min_lookup minMipLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; -extern const GLenum magLookup[WINED3D_TEXF_LINEAR + 1] DECLSPEC_HIDDEN; - static const uint32_t WINED3D_READ_ONLY_BIND_MASK = WINED3D_BIND_VERTEX_BUFFER | WINED3D_BIND_INDEX_BUFFER | WINED3D_BIND_CONSTANT_BUFFER | WINED3D_BIND_SHADER_RESOURCE | WINED3D_BIND_INDIRECT_BUFFER; -GLenum wined3d_gl_compare_func(enum wined3d_cmp_func f) DECLSPEC_HIDDEN; - static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_func func) { if (func < WINED3D_CMP_NEVER || func > WINED3D_CMP_ALWAYS) @@ -317,17 +307,6 @@ static inline enum wined3d_cmp_func wined3d_sanitize_cmp_func(enum wined3d_cmp_f return func; } -static inline GLenum wined3d_gl_mag_filter(enum wined3d_texture_filter_type mag_filter) -{ - return magLookup[mag_filter]; -} - -static inline GLenum wined3d_gl_min_mip_filter(enum wined3d_texture_filter_type min_filter, - enum wined3d_texture_filter_type mip_filter) -{ - return minMipLookup[min_filter].mip[mip_filter]; -} - /* float_16_to_32() and float_32_to_16() convert 16 bit floats in the * FLOAT16 data type to standard C floats and vice versa. They do not * depend on the encoding of the C float, so they are platform independent, @@ -4856,9 +4835,6 @@ const char *debug_d3dtexturefiltertype(enum wined3d_texture_filter_type filter_t const char *debug_d3dtexturestate(enum wined3d_texture_stage_state state) DECLSPEC_HIDDEN; const char *debug_d3dtop(enum wined3d_texture_op d3dtop) DECLSPEC_HIDDEN; const char *debug_d3dtstype(enum wined3d_transform_state tstype) DECLSPEC_HIDDEN; -const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; -const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; -const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; const char *debug_ivec4(const struct wined3d_ivec4 *v) DECLSPEC_HIDDEN; const char *debug_uvec4(const struct wined3d_uvec4 *v) DECLSPEC_HIDDEN; const char *debug_shader_type(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Move the ffp_attrib_ops to wined3d_gl_info.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: dcdba8d571bde0984623e3664f925612f3b8909a URL: https://gitlab.winehq.org/wine/wine/-/commit/dcdba8d571bde0984623e3664f9256… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:32:18 2023 -0600 wined3d: Move the ffp_attrib_ops to wined3d_gl_info. They are quite GL-specific. --- dlls/wined3d/adapter_gl.c | 6 +++--- dlls/wined3d/context_gl.c | 6 ++++-- dlls/wined3d/wined3d_gl.h | 15 +++++++++++++++ dlls/wined3d/wined3d_private.h | 18 ++---------------- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f1216ddd89b..5fda5391233 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4018,9 +4018,9 @@ static void WINE_GLAPI generic_float16_4(GLuint idx, const void *data) static void wined3d_adapter_init_ffp_attrib_ops(struct wined3d_adapter_gl *adapter_gl) { - const struct wined3d_gl_info *gl_info = &adapter_gl->gl_info; - struct wined3d_d3d_info *d3d_info = &adapter_gl->a.d3d_info; - struct wined3d_ffp_attrib_ops *ops = &d3d_info->ffp_attrib_ops; + const struct wined3d_d3d_info *d3d_info = &adapter_gl->a.d3d_info; + struct wined3d_gl_info *gl_info = &adapter_gl->gl_info; + struct wined3d_ffp_attrib_ops *ops = &gl_info->ffp_attrib_ops; unsigned int i; for (i = 0; i < WINED3D_FFP_EMIT_COUNT; ++i) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c2ebca8e99f..c1a6538d6ff 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4666,16 +4666,18 @@ static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl * const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, unsigned int count, unsigned int start_instance, unsigned int instance_count) { - const struct wined3d_ffp_attrib_ops *ops = &context_gl->c.d3d_info->ffp_attrib_ops; GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; const struct wined3d_stream_info *si = &context_gl->c.stream_info; GLenum mode = gl_primitive_type_from_d3d(state->primitive_type); const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; + const struct wined3d_ffp_attrib_ops *ops; unsigned int instanced_element_count = 0; const void *indices; unsigned int i, j; + ops = &gl_info->ffp_attrib_ops; + indices = (const char *)idx_data + idx_size * start_idx; if (!instance_count) @@ -4840,7 +4842,7 @@ static void draw_primitive_immediate_mode(struct wined3d_context_gl *context_gl, if (idx_size) idx_data = (uint8_t *)wined3d_buffer_load_sysmem(state->index_buffer, &context_gl->c) + state->index_offset; - ops = &d3d_info->ffp_attrib_ops; + ops = &gl_info->ffp_attrib_ops; gl_info->gl_ops.gl.p_glBegin(gl_primitive_type_from_d3d(state->primitive_type)); diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 33f51944977..a4b8e378f67 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -325,6 +325,20 @@ void wined3d_gl_limits_get_uniform_block_range(const struct wined3d_gl_limits *g #define WINED3D_QUIRK_BROKEN_ARB_FOG 0x00000200 #define WINED3D_QUIRK_NO_INDEPENDENT_BIT_DEPTHS 0x00000400 +typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); +typedef void (WINE_GLAPI *wined3d_ffp_texcoord_func)(GLenum unit, const void *data); +typedef void (WINE_GLAPI *wined3d_generic_attrib_func)(GLuint idx, const void *data); + +struct wined3d_ffp_attrib_ops +{ + wined3d_ffp_attrib_func position[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_attrib_func diffuse[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_attrib_func specular[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_attrib_func normal[WINED3D_FFP_EMIT_COUNT]; + wined3d_ffp_texcoord_func texcoord[WINED3D_FFP_EMIT_COUNT]; + wined3d_generic_attrib_func generic[WINED3D_FFP_EMIT_COUNT]; +}; + struct wined3d_gl_info { unsigned int selected_gl_version; @@ -337,6 +351,7 @@ struct wined3d_gl_info float filling_convention_offset; HGLRC (WINAPI *p_wglCreateContextAttribsARB)(HDC dc, HGLRC share, const GLint *attribs); + struct wined3d_ffp_attrib_ops ffp_attrib_ops; struct opengl_funcs gl_ops; struct wined3d_fbo_ops fbo_ops; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 656df92018f..2b568fa9d61 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -49,7 +49,6 @@ #include "objbase.h" #include "wine/wined3d.h" -#include "wined3d_gl.h" #include "wine/list.h" #include "wine/rbtree.h" @@ -145,6 +144,8 @@ enum wined3d_ffp_emit_idx WINED3D_FFP_EMIT_COUNT, }; +#include "wined3d_gl.h" + /* Texture format fixups */ enum fixup_channel_source @@ -202,24 +203,9 @@ struct wined3d_d3d_limits float pointsize_max; }; -typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); -typedef void (WINE_GLAPI *wined3d_ffp_texcoord_func)(GLenum unit, const void *data); -typedef void (WINE_GLAPI *wined3d_generic_attrib_func)(GLuint idx, const void *data); - -struct wined3d_ffp_attrib_ops -{ - wined3d_ffp_attrib_func position[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_attrib_func diffuse[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_attrib_func specular[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_attrib_func normal[WINED3D_FFP_EMIT_COUNT]; - wined3d_ffp_texcoord_func texcoord[WINED3D_FFP_EMIT_COUNT]; - wined3d_generic_attrib_func generic[WINED3D_FFP_EMIT_COUNT]; -}; - struct wined3d_d3d_info { struct wined3d_d3d_limits limits; - struct wined3d_ffp_attrib_ops ffp_attrib_ops; uint32_t wined3d_creation_flags; uint32_t xyzrhw : 1; uint32_t emulated_flatshading : 1;

1 0

Zebediah Figura : wined3d: Remove the no longer used "specular_func_3ubv" declaration.
by Alexandre Julliard Aug. 2, 2023

Aug. 2, 2023

Module: wine Branch: master Commit: 77e282d7a161b9d39df7b40d7e16e89f4c5ecfaa URL: https://gitlab.winehq.org/wine/wine/-/commit/77e282d7a161b9d39df7b40d7e16e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 15:21:22 2023 -0600 wined3d: Remove the no longer used "specular_func_3ubv" declaration. --- dlls/wined3d/wined3d_private.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b20bc77185..656df92018f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,7 +205,6 @@ struct wined3d_d3d_limits typedef void (WINE_GLAPI *wined3d_ffp_attrib_func)(const void *data); typedef void (WINE_GLAPI *wined3d_ffp_texcoord_func)(GLenum unit, const void *data); typedef void (WINE_GLAPI *wined3d_generic_attrib_func)(GLuint idx, const void *data); -extern wined3d_ffp_attrib_func specular_func_3ubv DECLSPEC_HIDDEN; struct wined3d_ffp_attrib_ops {

1 0