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

Alexandre Julliard : mmdevapi: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 29191436b4e3d822c87df80f3dfe4ae7805ac47d URL: https://gitlab.winehq.org/wine/wine/-/commit/29191436b4e3d822c87df80f3dfe4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 17:27:45 2023 +0200 mmdevapi: Use nameless unions/structs. --- dlls/mmdevapi/devenum.c | 7 +++---- dlls/mmdevapi/spatialaudio.c | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 6344ec66d34..b87b082e6ef 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -18,7 +18,6 @@ #include <stdarg.h> -#define NONAMELESSUNION #define COBJMACROS #include "windef.h" #include "winbase.h" @@ -1546,13 +1545,13 @@ static ULONG WINAPI PB_Release(IPropertyBag *iface) static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) { IPropertyBagImpl *This = impl_from_IPropertyBag(iface); - TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->n1.n2.vt); + TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->vt); if (!lstrcmpW(name, L"DSGuid")) { WCHAR guidstr[39]; StringFromGUID2(&This->devguid, guidstr,ARRAY_SIZE(guidstr)); - var->n1.n2.vt = VT_BSTR; - var->n1.n2.n3.bstrVal = SysAllocString(guidstr); + var->vt = VT_BSTR; + var->bstrVal = SysAllocString(guidstr); return S_OK; } ERR("Unknown property '%s' queried\n", debugstr_w(name)); diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 8feb8e66ed2..9bd14038e1d 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -17,7 +17,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include <stdarg.h>

1 0

Alexandre Julliard : secur32: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 359229289ba1d309a730ab24b04b8b0d083bab31 URL: https://gitlab.winehq.org/wine/wine/-/commit/359229289ba1d309a730ab24b04b8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 17:28:43 2023 +0200 secur32: Use nameless unions/structs. --- dlls/secur32/schannel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 5dc7d38a51b..d16692a4c3c 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -23,7 +23,6 @@ #include <stdlib.h> #include <errno.h> -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winternl.h" @@ -1229,7 +1228,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( /* RFC 5929 */ info = CryptFindOIDInfo(CRYPT_OID_INFO_OID_KEY, ctx->cert->pCertInfo->SignatureAlgorithm.pszObjId, 0); - if (info && info->u.Algid != CALG_SHA1 && info->u.Algid != CALG_MD5) hash_alg = info->u.Algid; + if (info && info->Algid != CALG_SHA1 && info->Algid != CALG_MD5) hash_alg = info->Algid; hash_size = sizeof(hash); ret = CryptHashCertificate(0, hash_alg, 0, ctx->cert->pbCertEncoded, ctx->cert->cbCertEncoded, hash, &hash_size);

1 0

Alexandre Julliard : d3d10_1/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: aa73def84efe315ebb90269fe7860c58e0ff1d57 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa73def84efe315ebb90269fe7860c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:43:28 2023 +0200 d3d10_1/tests: Use nameless unions/structs. --- dlls/d3d10_1/tests/d3d10_1.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 3218b21b2f0..e7c55a6d324 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -374,8 +374,8 @@ static void test_create_shader_resource_view(void) srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D10_1_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.ElementOffset = 0; - U(srv_desc).Buffer.ElementWidth = 64; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = 64; hr = ID3D10Device1_CreateShaderResourceView1(device, NULL, &srv_desc, &srview); ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); @@ -437,9 +437,9 @@ static void test_create_shader_resource_view(void) ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); ok(srv_desc.ViewDimension == D3D10_1_SRV_DIMENSION_TEXTURE2D, "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); - ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", - U(srv_desc).Texture2D.MostDetailedMip); - ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + ok(srv_desc.Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + srv_desc.Texture2D.MostDetailedMip); + ok(srv_desc.Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", srv_desc.Texture2D.MipLevels); check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE); /* Not available on all Windows versions. */

1 0

Alexandre Julliard : d3d10core/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: e441577a596dd39bc99bf30fb909841f33627fb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/e441577a596dd39bc99bf30fb90984… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:01 2023 +0200 d3d10core/tests: Use nameless unions/structs. --- dlls/d3d10core/tests/d3d10core.c | 274 +++++++++++++++++++-------------------- 1 file changed, 137 insertions(+), 137 deletions(-)

1 0

Bartosz Kosiorek : gdiplus: Add new test cases to GdipCreateCustomLineCap.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: c4248e97c23a21a54e3f41311c728f199ed492fc URL: https://gitlab.winehq.org/wine/wine/-/commit/c4248e97c23a21a54e3f41311c728f… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Fri Aug 11 18:27:00 2023 +0200 gdiplus: Add new test cases to GdipCreateCustomLineCap. --- dlls/gdiplus/customlinecap.c | 5 +++-- dlls/gdiplus/tests/customlinecap.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index f35fea90eba..e767f20e4b3 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -105,8 +105,9 @@ static GpStatus init_custom_linecap(GpCustomLineCap *cap, GpPathData *pathdata, return Ok; } -/* FIXME: Sometimes when fillPath is non-null and stroke path is null, the native - * version of this function returns NotImplemented. I cannot figure out why. */ +/* Custom line cap position (0, 0) is a place corresponding to the end of line. +* If Custom Line Cap is too big and too far from position (0, 0), +* then NotImplemented will be returned, due to floating point precision limitation. */ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath, GpLineCap baseCap, REAL baseInset, GpCustomLineCap **customCap) { diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index a8bb5cf371b..8c3ecef886f 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -49,17 +49,22 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static void test_constructor_destructor(void) { GpCustomLineCap *custom; - GpPath *path, *path2; + GpPath *path, *path2, *pathFarAway; GpStatus stat; stat = GdipCreatePath(FillModeAlternate, &path); expect(Ok, stat); - stat = GdipAddPathRectangle(path, 5.0, 5.0, 10.0, 10.0); + stat = GdipAddPathRectangle(path, -5.0, -4.0, 10.0, 8.0); expect(Ok, stat); stat = GdipCreatePath(FillModeAlternate, &path2); expect(Ok, stat); - stat = GdipAddPathRectangle(path2, 5.0, 5.0, 10.0, 10.0); + stat = GdipAddPathRectangle(path2, -5.0, -5.0, 10.0, 10.0); + expect(Ok, stat); + + stat = GdipCreatePath(FillModeAlternate, &pathFarAway); + expect(Ok, stat); + stat = GdipAddPathRectangle(pathFarAway, 5.0, 5.0, 10.0, 10.0); expect(Ok, stat); /* NULL args */ @@ -74,18 +79,39 @@ static void test_constructor_destructor(void) stat = GdipDeleteCustomLineCap(NULL); expect(InvalidParameter, stat); + /* If both parameters are provided, then fillPath will be ignored. */ + custom = NULL; + stat = GdipCreateCustomLineCap(path, path2, LineCapFlat, 0.0, &custom); + expect(Ok, stat); + ok(custom != NULL, "Custom line cap was not created\n"); + stat = GdipDeleteCustomLineCap(custom); + expect(Ok, stat); + /* valid args */ + custom = NULL; stat = GdipCreateCustomLineCap(NULL, path2, LineCapFlat, 0.0, &custom); expect(Ok, stat); + ok(custom != NULL, "Custom line cap was not created\n"); + stat = GdipDeleteCustomLineCap(custom); + expect(Ok, stat); + + custom = NULL; + stat = GdipCreateCustomLineCap(path, NULL, LineCapFlat, 0.0, &custom); + expect(Ok, stat); + ok(custom != NULL, "Custom line cap was not created\n"); stat = GdipDeleteCustomLineCap(custom); expect(Ok, stat); - /* it's strange but native returns NotImplemented on stroke == NULL */ + + /* Custom line cap position (0, 0) is a place corresponding to the end of line. + * If Custom Line Cap is too big and too far from position (0, 0), + * then NotImplemented will be returned, due to floating point precision limitation. */ custom = NULL; - stat = GdipCreateCustomLineCap(path, NULL, LineCapFlat, 10.0, &custom); + stat = GdipCreateCustomLineCap(pathFarAway, NULL, LineCapFlat, 10.0, &custom); todo_wine expect(NotImplemented, stat); todo_wine ok(custom == NULL, "Expected a failure on creation\n"); if(stat == Ok) GdipDeleteCustomLineCap(custom); + GdipDeletePath(pathFarAway); GdipDeletePath(path2); GdipDeletePath(path); }

1 0

Zebediah Figura : wined3d: Move struct wined3d_context_gl to wined3d_gl.h.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 35b8bcf7d548f89e02e81d2e0a2e1845602e7cbc URL: https://gitlab.winehq.org/wine/wine/-/commit/35b8bcf7d548f89e02e81d2e0a2e18… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:00:08 2023 -0600 wined3d: Move struct wined3d_context_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 189 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 196 +---------------------------------------- 2 files changed, 190 insertions(+), 195 deletions(-)

1 0

Zebediah Figura : wined3d: Pass a wined3d_adapter instead of wined3d_gl_info to FFP pipe emulation mask methods.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 965023386a11cf06b0389ad8cc4949242972b939 URL: https://gitlab.winehq.org/wine/wine/-/commit/965023386a11cf06b0389ad8cc4949… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:09:29 2023 -0600 wined3d: Pass a wined3d_adapter instead of wined3d_gl_info to FFP pipe emulation mask methods. --- dlls/wined3d/adapter_gl.c | 4 ++-- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 8 ++++---- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index f327c21b030..9b7a266e01f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3880,8 +3880,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter_gl *adapter_gl, } } - gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) - | adapter->fragment_pipe->get_emul_mask(gl_info); + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(adapter) + | adapter->fragment_pipe->get_emul_mask(adapter); if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) install_gl_compat_wrapper(gl_info, ARB_MULTITEXTURE); if (gl_ext_emul_mask & GL_EXT_EMUL_EXT_FOG_COORD) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 34743d44918..14703e9c66c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5802,7 +5802,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES); } -static unsigned int arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int arbfp_get_emul_mask(const struct wined3d_adapter *adapter) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 46fa5d4d64f..ec5c2ac6b6f 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1315,7 +1315,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen caps->MaxSimultaneousTextures = 6; } -static unsigned int atifs_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int atifs_get_emul_mask(const struct wined3d_adapter *adapter) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8b3a25e276b..6bbb432dc1d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11570,9 +11570,9 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, caps->raster_caps = WINED3DPRASTERCAPS_FOGRANGE; } -static unsigned int glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_adapter *adapter) { - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (wined3d_adapter_gl_const(adapter)->gl_info.supported[WINED3D_GL_LEGACY_CONTEXT]) return GL_EXT_EMUL_ARB_MULTITEXTURE; return 0; } @@ -12083,9 +12083,9 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES); } -static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_adapter *adapter) { - if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (wined3d_adapter_gl_const(adapter)->gl_info.supported[WINED3D_GL_LEGACY_CONTEXT]) return GL_EXT_EMUL_ARB_MULTITEXTURE; return 0; } diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index e3d9f4fbf30..3d86e16c864 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -750,7 +750,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } -static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_adapter *adapter) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 966721905a4..355eac1ef7b 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1104,7 +1104,7 @@ static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapt caps->ffp_generic_attributes = TRUE; } -static unsigned int spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_adapter *adapter) { return 0; } @@ -1178,7 +1178,7 @@ static void spirv_fragment_pipe_vk_fp_get_caps(const struct wined3d_adapter *ada memset(caps, 0, sizeof(*caps)); } -static unsigned int spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_adapter *adapter) { return 0; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 502c59c1c52..eb631fa1cb8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5130,7 +5130,7 @@ static void vp_ffp_get_caps(const struct wined3d_adapter *adapter, struct wined3 caps->raster_caps |= WINED3DPRASTERCAPS_FOGRANGE; } -static unsigned int vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int vp_ffp_get_emul_mask(const struct wined3d_adapter *adapter) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } @@ -5188,7 +5188,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } -static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_adapter *adapter) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } @@ -5235,7 +5235,7 @@ static void vp_none_get_caps(const struct wined3d_adapter *adapter, struct wined memset(caps, 0, sizeof(*caps)); } -static unsigned int vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int vp_none_get_emul_mask(const struct wined3d_adapter *adapter) { return 0; } @@ -5255,7 +5255,7 @@ static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragm memset(caps, 0, sizeof(*caps)); } -static unsigned int fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int fp_none_get_emul_mask(const struct wined3d_adapter *adapter) { return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6f7b7cd7c24..fd018880307 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2013,7 +2013,7 @@ struct wined3d_fragment_pipe_ops { void (*fp_enable)(const struct wined3d_context *context, BOOL enable); void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); - unsigned int (*get_emul_mask)(const struct wined3d_gl_info *gl_info); + unsigned int (*get_emul_mask)(const struct wined3d_adapter *adapter); void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device, struct wined3d_context *context); BOOL (*allocate_context_data)(struct wined3d_context *context); @@ -2040,7 +2040,7 @@ struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_context *context, BOOL enable); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); - unsigned int (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); + unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device, struct wined3d_context *context); const struct wined3d_state_entry_template *vp_states;

1 0

Zebediah Figura : wined3d: Move GL-specific blitter create function declarations to wined3d_gl.h.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: f48fe6851f15b29128282aeb7ac4d7b5c23fa4a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f48fe6851f15b29128282aeb7ac4d7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:13:47 2023 -0600 wined3d: Move GL-specific blitter create function declarations to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 6 ++++++ dlls/wined3d/wined3d_private.h | 14 ++------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 09f5dd71708..79326c92bfd 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -753,4 +753,10 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, const struct wined3d_state *state); void wined3d_context_gl_wait_command_fence(struct wined3d_context_gl *context_gl, uint64_t id); +void wined3d_arbfp_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device); +void wined3d_fbo_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info); +void wined3d_ffp_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info); +struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device); +void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fd018880307..f63a4afdd7d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1976,8 +1976,6 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi HRESULT wined3d_context_no3d_init(struct wined3d_context *context_no3d, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); struct wined3d_state_entry @@ -2097,17 +2095,9 @@ struct wined3d_blitter_ops enum wined3d_texture_filter_type filter, const struct wined3d_format *resolve_format); }; -void wined3d_arbfp_blitter_create(struct wined3d_blitter **next, - const struct wined3d_device *device) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" + struct wined3d_blitter *wined3d_cpu_blitter_create(void) DECLSPEC_HIDDEN; -void wined3d_fbo_blitter_create(struct wined3d_blitter **next, - const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -void wined3d_ffp_blitter_create(struct wined3d_blitter **next, - const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; -struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, - const struct wined3d_device *device) DECLSPEC_HIDDEN; -void wined3d_raw_blitter_create(struct wined3d_blitter **next, - const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void wined3d_vk_blitter_create(struct wined3d_blitter **next) DECLSPEC_HIDDEN; BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Move struct wined3d_adapter_gl to wined3d_gl.h.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: f8eebdf468b1d9605e28ae5dba51644940d1bd40 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8eebdf468b1d9605e28ae5dba5164… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:17:12 2023 -0600 wined3d: Move struct wined3d_adapter_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 43 +----------------------------------------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 79326c92bfd..c53e64fb203 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -759,4 +759,45 @@ void wined3d_ffp_blitter_create(struct wined3d_blitter **next, const struct wine struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **next, const struct wined3d_device *device); void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info); +struct wined3d_caps_gl_ctx +{ + HDC dc; + HWND wnd; + HGLRC gl_ctx; + HDC restore_dc; + HGLRC restore_gl_ctx; + + const struct wined3d_gl_info *gl_info; + GLuint test_vbo; + GLuint test_program_id; + + const struct wined3d_gpu_description *gpu_description; + UINT64 vram_bytes; +}; + +BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx); +bool wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx, float offset); + +struct wined3d_adapter_gl +{ + struct wined3d_adapter a; + + struct wined3d_gl_info gl_info; + + struct wined3d_pixel_format *pixel_formats; + unsigned int pixel_format_count; +}; + +static inline struct wined3d_adapter_gl *wined3d_adapter_gl(struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_gl, a); +} + +static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const struct wined3d_adapter *adapter) +{ + return CONTAINING_RECORD(adapter, struct wined3d_adapter_gl, a); +} + +BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f63a4afdd7d..3bfb6c5dfcd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,8 +2095,6 @@ struct wined3d_blitter_ops enum wined3d_texture_filter_type filter, const struct wined3d_format *resolve_format); }; -#include "wined3d_gl.h" - struct wined3d_blitter *wined3d_cpu_blitter_create(void) DECLSPEC_HIDDEN; void wined3d_vk_blitter_create(struct wined3d_blitter **next) DECLSPEC_HIDDEN; @@ -2661,54 +2659,15 @@ BOOL wined3d_get_primary_adapter_luid(LUID *luid) DECLSPEC_HIDDEN; struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -struct wined3d_adapter_gl -{ - struct wined3d_adapter a; - - struct wined3d_gl_info gl_info; - - struct wined3d_pixel_format *pixel_formats; - unsigned int pixel_format_count; -}; - -static inline struct wined3d_adapter_gl *wined3d_adapter_gl(struct wined3d_adapter *adapter) -{ - return CONTAINING_RECORD(adapter, struct wined3d_adapter_gl, a); -} - -static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const struct wined3d_adapter *adapter) -{ - return CONTAINING_RECORD(adapter, struct wined3d_adapter_gl, a); -} +#include "wined3d_gl.h" struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -struct wined3d_caps_gl_ctx -{ - HDC dc; - HWND wnd; - HGLRC gl_ctx; - HDC restore_dc; - HGLRC restore_gl_ctx; - - const struct wined3d_gl_info *gl_info; - GLuint test_vbo; - GLuint test_program_id; - - const struct wined3d_gpu_description *gpu_description; - UINT64 vram_bytes; -}; - -BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, - struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; BOOL wined3d_adapter_no3d_init_format_info(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; ssize_t adapter_adjust_mapped_memory(struct wined3d_adapter *adapter, ssize_t size) DECLSPEC_HIDDEN; UINT64 adapter_adjust_memory(struct wined3d_adapter *adapter, INT64 amount) DECLSPEC_HIDDEN; -BOOL wined3d_caps_gl_ctx_test_viewport_subpixel_bits(struct wined3d_caps_gl_ctx *ctx) DECLSPEC_HIDDEN; -bool wined3d_caps_gl_ctx_test_filling_convention(struct wined3d_caps_gl_ctx *ctx, float offset) DECLSPEC_HIDDEN; - enum wined3d_projection_type { WINED3D_PROJECTION_NONE = 0,

1 0

Zebediah Figura : wined3d: Move struct wined3d_device_gl to wined3d_gl.h.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 5c3159052c8e07019c3a08d862080128c514ce57 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c3159052c8e07019c3a08d8620801… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jan 6 16:18:59 2023 -0600 wined3d: Move struct wined3d_device_gl to wined3d_gl.h. --- dlls/wined3d/wined3d_gl.h | 90 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 92 +----------------------------------------- 2 files changed, 91 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index c53e64fb203..6f0996fe39f 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -800,4 +800,94 @@ static inline const struct wined3d_adapter_gl *wined3d_adapter_gl_const(const st BOOL wined3d_adapter_gl_init_format_info(struct wined3d_adapter *adapter, struct wined3d_caps_gl_ctx *ctx); +struct wined3d_allocator_chunk_gl +{ + struct wined3d_allocator_chunk c; + unsigned int memory_type; + GLuint gl_buffer; +}; + +static inline struct wined3d_allocator_chunk_gl *wined3d_allocator_chunk_gl(struct wined3d_allocator_chunk *chunk) +{ + return CONTAINING_RECORD(chunk, struct wined3d_allocator_chunk_gl, c); +} + +struct wined3d_dummy_textures +{ + GLuint tex_1d; + GLuint tex_2d; + GLuint tex_rect; + GLuint tex_3d; + GLuint tex_cube; + GLuint tex_cube_array; + GLuint tex_1d_array; + GLuint tex_2d_array; + GLuint tex_buffer; + GLuint tex_2d_ms; + GLuint tex_2d_ms_array; +}; + +struct wined3d_device_gl +{ + struct wined3d_device d; + + /* Textures for when no other textures are bound. */ + struct wined3d_dummy_textures dummy_textures; + + CRITICAL_SECTION allocator_cs; + struct wined3d_allocator allocator; + uint64_t completed_fence_id; + uint64_t current_fence_id; + uint64_t retired_bo_size; + + struct wined3d_retired_block_gl + { + struct wined3d_allocator_block *block; + uint64_t fence_id; + } *retired_blocks; + SIZE_T retired_blocks_size; + SIZE_T retired_block_count; + + HWND backup_wnd; + HDC backup_dc; +}; + +static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_gl, d); +} + +static inline struct wined3d_device_gl *wined3d_device_gl_from_allocator(struct wined3d_allocator *allocator) +{ + return CONTAINING_RECORD(allocator, struct wined3d_device_gl, allocator); +} + +static inline void wined3d_device_gl_allocator_lock(struct wined3d_device_gl *device_gl) +{ + EnterCriticalSection(&device_gl->allocator_cs); +} + +static inline void wined3d_device_gl_allocator_unlock(struct wined3d_device_gl *device_gl) +{ + LeaveCriticalSection(&device_gl->allocator_cs); +} + +static inline void wined3d_allocator_chunk_gl_lock(struct wined3d_allocator_chunk_gl *chunk_gl) +{ + wined3d_device_gl_allocator_lock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); +} + +static inline void wined3d_allocator_chunk_gl_unlock(struct wined3d_allocator_chunk_gl *chunk_gl) +{ + wined3d_device_gl_allocator_unlock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); +} + +bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, + struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, + GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo); +void wined3d_device_gl_create_primary_opengl_context_cs(void *object); +void wined3d_device_gl_delete_opengl_contexts_cs(void *object); +HDC wined3d_device_gl_get_backup_dc(struct wined3d_device_gl *device_gl); +GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx); + #endif /* __WINE_WINED3D_GL */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3bfb6c5dfcd..d23886dec2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2659,8 +2659,6 @@ BOOL wined3d_get_primary_adapter_luid(LUID *luid) DECLSPEC_HIDDEN; struct wined3d_adapter *wined3d_adapter_vk_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; -#include "wined3d_gl.h" - struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned int wined3d_creation_flags) DECLSPEC_HIDDEN; @@ -2939,21 +2937,6 @@ static inline bool wined3d_state_uses_depth_buffer(const struct wined3d_state *s || state->depth_stencil_state->desc.stencil; } -struct wined3d_dummy_textures -{ - GLuint tex_1d; - GLuint tex_2d; - GLuint tex_rect; - GLuint tex_3d; - GLuint tex_cube; - GLuint tex_cube_array; - GLuint tex_1d_array; - GLuint tex_2d_array; - GLuint tex_buffer; - GLuint tex_2d_ms; - GLuint tex_2d_ms_array; -}; - #define WINED3D_UNMAPPED_STAGE ~0u /* Multithreaded flag. Removed from the public header to signal that @@ -3101,18 +3084,6 @@ void wined3d_allocator_chunk_cleanup(struct wined3d_allocator_chunk *chunk) DECL bool wined3d_allocator_chunk_init(struct wined3d_allocator_chunk *chunk, struct wined3d_allocator *allocator) DECLSPEC_HIDDEN; -struct wined3d_allocator_chunk_gl -{ - struct wined3d_allocator_chunk c; - unsigned int memory_type; - GLuint gl_buffer; -}; - -static inline struct wined3d_allocator_chunk_gl *wined3d_allocator_chunk_gl(struct wined3d_allocator_chunk *chunk) -{ - return CONTAINING_RECORD(chunk, struct wined3d_allocator_chunk_gl, c); -} - struct wined3d_allocator_block { struct list entry; @@ -3151,68 +3122,7 @@ void wined3d_allocator_cleanup(struct wined3d_allocator *allocator) DECLSPEC_HID bool wined3d_allocator_init(struct wined3d_allocator *allocator, size_t pool_count, const struct wined3d_allocator_ops *allocator_ops) DECLSPEC_HIDDEN; -struct wined3d_device_gl -{ - struct wined3d_device d; - - /* Textures for when no other textures are bound. */ - struct wined3d_dummy_textures dummy_textures; - - CRITICAL_SECTION allocator_cs; - struct wined3d_allocator allocator; - uint64_t completed_fence_id; - uint64_t current_fence_id; - uint64_t retired_bo_size; - - struct wined3d_retired_block_gl - { - struct wined3d_allocator_block *block; - uint64_t fence_id; - } *retired_blocks; - SIZE_T retired_blocks_size; - SIZE_T retired_block_count; - - HWND backup_wnd; - HDC backup_dc; -}; - -static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) -{ - return CONTAINING_RECORD(device, struct wined3d_device_gl, d); -} - -static inline struct wined3d_device_gl *wined3d_device_gl_from_allocator(struct wined3d_allocator *allocator) -{ - return CONTAINING_RECORD(allocator, struct wined3d_device_gl, allocator); -} - -static inline void wined3d_device_gl_allocator_lock(struct wined3d_device_gl *device_gl) -{ - EnterCriticalSection(&device_gl->allocator_cs); -} - -static inline void wined3d_device_gl_allocator_unlock(struct wined3d_device_gl *device_gl) -{ - LeaveCriticalSection(&device_gl->allocator_cs); -} - -static inline void wined3d_allocator_chunk_gl_lock(struct wined3d_allocator_chunk_gl *chunk_gl) -{ - wined3d_device_gl_allocator_lock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); -} - -static inline void wined3d_allocator_chunk_gl_unlock(struct wined3d_allocator_chunk_gl *chunk_gl) -{ - wined3d_device_gl_allocator_unlock(wined3d_device_gl_from_allocator(chunk_gl->c.allocator)); -} - -bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, - struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, - GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; -void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; -void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; -HDC wined3d_device_gl_get_backup_dc(struct wined3d_device_gl *device_gl) DECLSPEC_HIDDEN; -GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) DECLSPEC_HIDDEN; +#include "wined3d_gl.h" static inline float wined3d_alpha_ref(const struct wined3d_state *state) {

1 0