- Wine-Commits - list.winehq.org

Alexandre Julliard : d3d9/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 43d4956c27a0546f014dfd7c907a39006dc52bfa URL: https://gitlab.winehq.org/wine/wine/-/commit/43d4956c27a0546f014dfd7c907a39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:45:17 2023 +0200 d3d9/tests: Use nameless unions/structs. --- dlls/d3d9/tests/d3d9ex.c | 8 ++++---- dlls/d3d9/tests/stateblock.c | 16 ++++++++-------- dlls/d3d9/tests/visual.c | 14 +++++++------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2056117f4d7..bde3dc62ef6 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -562,7 +562,7 @@ static void test_get_adapter_displaymode_ex(void) devmode = startmode; devmode.dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT; - S2(U1(devmode)).dmDisplayOrientation = DMDO_180; + devmode.dmDisplayOrientation = DMDO_180; retval = ChangeDisplaySettingsExW(NULL, &devmode, NULL, 0, NULL); if (retval == DISP_CHANGE_BADMODE) { @@ -573,7 +573,7 @@ static void test_get_adapter_displaymode_ex(void) ok(retval == DISP_CHANGE_SUCCESSFUL, "ChangeDisplaySettingsEx failed with %ld.\n", retval); /* try retrieve orientation info with EnumDisplaySettingsEx*/ devmode.dmFields = 0; - S2(U1(devmode)).dmDisplayOrientation = 0; + devmode.dmDisplayOrientation = 0; ok(EnumDisplaySettingsExW(NULL, ENUM_CURRENT_SETTINGS, &devmode, EDS_ROTATEDMODE), "EnumDisplaySettingsEx failed.\n"); @@ -605,8 +605,8 @@ static void test_get_adapter_displaymode_ex(void) ok(mode_ex.ScanLineOrdering != 0, "ScanLineOrdering returned 0\n"); /* Check that orientation is returned correctly by GetAdapterDisplayModeEx * and EnumDisplaySettingsEx(). */ - ok(S2(U1(devmode)).dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, - "rotation is %d instead of %ld\n", rotation, S2(U1(devmode)).dmDisplayOrientation); + ok(devmode.dmDisplayOrientation == DMDO_180 && rotation == D3DDISPLAYROTATION_180, + "rotation is %d instead of %ld\n", rotation, devmode.dmDisplayOrientation); trace("GetAdapterDisplayModeEx returned Width = %d, Height = %d, RefreshRate = %d, Format = %x, ScanLineOrdering = %x, rotation = %d\n", mode_ex.Width, mode_ex.Height, mode_ex.RefreshRate, mode_ex.Format, mode_ex.ScanLineOrdering, rotation); diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c index f42c880c372..def69105f14 100644 --- a/dlls/d3d9/tests/stateblock.c +++ b/dlls/d3d9/tests/stateblock.c @@ -1017,14 +1017,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage, "\t\t%.8e, %.8e, %.8e, %.8e,\n" "\t} received\n", chain_stage, name, - U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0], - U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1], - U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2], - U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3], - U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0], - U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1], - U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2], - U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]); + expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0], + expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1], + expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2], + expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3], + received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0], + received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1], + received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2], + received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]); } static void transform_check_data(IDirect3DDevice9 *device, const struct state_test *test, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 29b95419bed..a7d88adbc00 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5560,8 +5560,8 @@ static void texture_transform_flags_test(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); /* What happens if 4 coords are used, but only 2 given ?*/ - U(mat).m[2][0] = 1.0f; - U(mat).m[3][1] = 1.0f; + mat.m[2][0] = 1.0f; + mat.m[3][1] = 1.0f; hr = IDirect3DDevice9_SetTransform(device, D3DTS_TEXTURE0, &mat); ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_TEXTURETRANSFORMFLAGS, D3DTTFF_COUNT4); @@ -12122,8 +12122,8 @@ static void test_pointsize(void) ok(color == 0x00ffff00, "pSprite: Pixel (64+4),(64-4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - U(matrix).m[0][0] = 1.0f / 64.0f; - U(matrix).m[1][1] = -1.0f / 64.0f; + matrix.m[0][0] = 1.0f / 64.0f; + matrix.m[1][1] = -1.0f / 64.0f; hr = IDirect3DDevice9_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(SUCCEEDED(hr), "SetTransform failed, hr %#lx.\n", hr); @@ -12142,7 +12142,7 @@ static void test_pointsize(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); if (caps.VertexShaderVersion >= D3DVS_VERSION(1, 1)) { - hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &S(U(matrix))._11, 4); + hr = IDirect3DDevice9_SetVertexShaderConstantF(device, 0, &matrix._11, 4); ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr); } @@ -28062,8 +28062,8 @@ START_TEST(visual) trace("Device name string: \"%s\"\n", identifier.DeviceName); ok(identifier.DeviceName[0], "Empty device name.\n"); trace("Driver version %d.%d.%d.%d\n", - HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), - HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); IDirect3D9_Release(d3d);

1 0

Alexandre Julliard : d3d10_1/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

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 Aug. 15, 2023

Aug. 15, 2023

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

Alexandre Julliard : secur32: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

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 : mmdevapi: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

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 : configure: Use AC_CHECK_HEADER for headers that don't need to be in config.h.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: b5edd148145b93fcc3e8c76323837cc59326c70b URL: https://gitlab.winehq.org/wine/wine/-/commit/b5edd148145b93fcc3e8c76323837c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 13:12:14 2023 +0200 configure: Use AC_CHECK_HEADER for headers that don't need to be in config.h. --- configure | 208 +++++++++++----------------------------------------- configure.ac | 58 +++++---------- include/config.h.in | 27 ------- 3 files changed, 63 insertions(+), 230 deletions(-)

1 0

David McFarland : configure: Don't require pcsclite header for winscard.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 4a4d35244120ce7d2abdd207a8a81a0b03c349c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a4d35244120ce7d2abdd207a8a81a… Author: David McFarland <corngood(a)gmail.com> Date: Tue Aug 15 10:13:50 2023 -0300 configure: Don't require pcsclite header for winscard. The header is unused, and the header check fails with: configure:7860: checking for PCSC/pcsclite.h configure:7860: gcc -m32 -c -g -O2 conftest.c >&5 In file included from conftest.c:50: [...]/include/PCSC/pcsclite.h:45:10: fatal error: wintypes.h: No such file or directory 45 | #include <wintypes.h> | ^~~~~~~~~~~~ Fixes: d405a688ba6b5042775d733f57d00ba6318e1d0f --- configure | 21 ++++++--------------- configure.ac | 15 +++++---------- include/config.h.in | 3 --- 3 files changed, 11 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 181835823f2..8359c78f65b 100755 --- a/configure +++ b/configure @@ -7857,12 +7857,6 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "PCSC/pcsclite.h" "ac_cv_header_PCSC_pcsclite_h" "$ac_includes_default" -if test "x$ac_cv_header_PCSC_pcsclite_h" = xyes -then : - printf "%s\n" "#define HAVE_PCSC_PCSCLITE_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" if test "x$ac_cv_header_arpa_inet_h" = xyes @@ -15849,18 +15843,15 @@ if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = xyes then : PCSCLITE_LIBS="-lpcsclite" +else $as_nop + case $host_os in + darwin*|macosx*) PCSCLITE_LIBS="-framework PCSC" + ;; + esac fi - if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" - then - case $host_os in - darwin*|macosx*) - PCSCLITE_LIBS="-framework PCSC" - ;; - esac - fi fi -if test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes" +if test "x$PCSCLITE_LIBS" = x then : case "x$with_pcsclite" in x) as_fn_append wine_notices "|libpcsclite not found, smart cards won't be supported." ;; diff --git a/configure.ac b/configure.ac index 4f7ba4c61bc..4e25e5d7306 100644 --- a/configure.ac +++ b/configure.ac @@ -403,7 +403,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ - PCSC/pcsclite.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ @@ -1395,16 +1394,12 @@ WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_init" != xyes], dnl **** Check for libpcsclite **** if test "x$with_pcsclite" != "xno" then - AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) - if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" - then - case $host_os in - darwin*|macosx*) - AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;; - esac - fi + AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])], + [case $host_os in + darwin*|macosx*) AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;; + esac]) fi -WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"], +WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x], [libpcsclite not found, smart cards won't be supported.], [enable_winscard]) diff --git a/include/config.h.in b/include/config.h.in index 41011c3b0b8..9836ec64cf9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,9 +297,6 @@ /* Define to 1 if you have the <pcap/pcap.h> header file. */ #undef HAVE_PCAP_PCAP_H -/* Define to 1 if you have the <PCSC/pcsclite.h> header file. */ -#undef HAVE_PCSC_PCSCLITE_H - /* Define to 1 if you have the `pipe2' function. */ #undef HAVE_PIPE2

1 0

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

Aug. 15, 2023

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

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

Aug. 15, 2023

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 GL-specific blitter create function declarations to wined3d_gl.h.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

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