September 2019 - Wine-devel

[PATCH v4 1/3] msscript/tests: Initialize custom engine for global.
by Jactry Zeng 23 Sep '19

23 Sep '19

Superseded patch 169916 to 169917. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/msscript.ocx/tests/msscript.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/msscript.ocx/tests/msscript.c b/dlls/msscript.ocx/tests/msscript.c index 2d500d8308..7a1a0f31f8 100644 --- a/dlls/msscript.ocx/tests/msscript.c +++ b/dlls/msscript.ocx/tests/msscript.c @@ -501,6 +501,8 @@ static BOOL register_script_engine(void) return TRUE; } +static BOOL have_custom_engine; + static HRESULT WINAPI OleClientSite_QueryInterface(IOleClientSite *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IOleClientSite) || IsEqualIID(riid, &IID_IUnknown)) @@ -754,7 +756,7 @@ static void test_Language(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -786,16 +788,12 @@ static void test_Language(void) IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); } static void test_connectionpoints(void) @@ -1055,7 +1053,7 @@ static void test_Reset(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -1086,16 +1084,12 @@ static void test_Reset(void) CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); } static HRESULT WINAPI disp_QI(IDispatch *iface, REFIID riid, void **obj) @@ -1193,7 +1187,7 @@ static void test_AddObject(void) IScriptControl_Release(sc); /* custom script engine */ - if (register_script_engine()) { + if (have_custom_engine) { static const WCHAR testscriptW[] = {'t','e','s','t','s','c','r','i','p','t',0}; hr = CoCreateInstance(&CLSID_ScriptControl, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -1225,16 +1219,12 @@ static void test_AddObject(void) CHECK_CALLED(SetScriptSite); IActiveScriptSite_Release(site); - init_registry(FALSE); - SET_EXPECT(Close); IScriptControl_Release(sc); CHECK_CALLED(Close); } - else - skip("Could not register TestScript engine\n"); SysFreeString(objname); } @@ -1502,6 +1492,10 @@ START_TEST(msscript) } IUnknown_Release(unk); + have_custom_engine = register_script_engine(); + if (!have_custom_engine) + skip("Could not register TestScript engine.\n"); + test_oleobject(); test_persiststreaminit(); test_olecontrol(); @@ -1518,5 +1512,7 @@ START_TEST(msscript) test_State(); test_IScriptControl_Eval(); + init_registry(FALSE); + CoUninitialize(); } -- 2.23.0

2 1

[PATCH v2 4/4] winex11.drv: Handle XRandR display device changes.
by Zhiyi Zhang 23 Sep '19

23 Sep '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 70387e0cbf..b3eaee52f2 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -68,6 +68,7 @@ static int primary_crtc; #endif #ifdef HAVE_XRRGETPROVIDERREDOURCES +MAKE_FUNCPTR(XRRSelectInput) MAKE_FUNCPTR(XRRGetOutputPrimary) MAKE_FUNCPTR(XRRGetProviderResources) MAKE_FUNCPTR(XRRFreeProviderResources) @@ -119,6 +120,7 @@ static int load_xrandr(void) #endif #ifdef HAVE_XRRGETPROVIDERREDOURCES + LOAD_FUNCPTR(XRRSelectInput) LOAD_FUNCPTR(XRRGetOutputPrimary) LOAD_FUNCPTR(XRRGetProviderResources) LOAD_FUNCPTR(XRRFreeProviderResources) @@ -1030,6 +1032,12 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } +static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +{ + X11DRV_DisplayDevices_Init( TRUE ); + return TRUE; +} + #endif void X11DRV_XRandR_Init(void) @@ -1077,6 +1085,15 @@ void X11DRV_XRandR_Init(void) handler.pGetMonitors = xrandr14_get_monitors; handler.pFreeMonitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); + + pXRRSelectInput( thread_init_display(), root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, + "XRandR ProviderChange" ); } #endif } -- 2.23.0

2 1

[PATCH v2 3/4] winex11.drv: Support XRandR display device handler.
by Zhiyi Zhang 23 Sep '19

23 Sep '19

XRandR supports multiple GPUs and runtime device change compared to Xinerama. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 7 +- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 2 +- dlls/winex11.drv/xrandr.c | 488 ++++++++++++++++++++++++++++++++++++ 4 files changed, 496 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1c912a30a2..413aafbca1 100644 --- a/configure.ac +++ b/configure.ac @@ -1223,7 +1223,12 @@ then [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1, - [Define if Xrandr has the XRRGetScreenResources function])])],,[$X_LIBS $X_EXTRA_LIBS])]) + [Define if Xrandr has the XRRGetScreenResources function])]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> +#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetProviderResources) *f; if (f) return 0;]])], + [AC_DEFINE(HAVE_XRRGETPROVIDERREDOURCES, 1, + [Define if Xrandr has the XRRGetProviderResources function])], + [WINE_NOTICE([libxrandr ${notice_platform}development files too old, XRandR display device handler won't be supported.])])],,[$X_LIBS $X_EXTRA_LIBS])]) fi WINE_NOTICE_WITH(xrandr,[test "x$ac_cv_lib_soname_Xrandr" = "x"], [libxrandr ${notice_platform}development files not found, XRandr won't be supported.]) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e71156cbb0..135faa8989 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -641,6 +641,7 @@ extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; +extern void query_work_area( RECT *rc_work ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; struct x11drv_mode_info diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 8e08221343..61c422e835 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -55,7 +55,7 @@ static inline MONITORINFOEXW *get_primary(void) return &monitors[idx]; } -static void query_work_area( RECT *rc_work ) +void query_work_area( RECT *rc_work ) { Atom type; int format; diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 288b83fde5..70387e0cbf 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -3,6 +3,7 @@ * * Copyright 2003 Alexander James Pasadyn * Copyright 2012 Henri Verbeet for CodeWeavers + * Copyright 2019 Zhiyi Zhang for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -34,7 +35,9 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include <X11/extensions/Xrandr.h> #include "x11drv.h" +#include "wine/heap.h" #include "wine/library.h" +#include "wine/unicode.h" static void *xrandr_handle; @@ -64,6 +67,14 @@ static RRMode *xrandr12_modes; static int primary_crtc; #endif +#ifdef HAVE_XRRGETPROVIDERREDOURCES +MAKE_FUNCPTR(XRRGetOutputPrimary) +MAKE_FUNCPTR(XRRGetProviderResources) +MAKE_FUNCPTR(XRRFreeProviderResources) +MAKE_FUNCPTR(XRRGetProviderInfo) +MAKE_FUNCPTR(XRRFreeProviderInfo) +#endif + #undef MAKE_FUNCPTR static struct x11drv_mode_info *dd_modes; @@ -106,6 +117,16 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRSetScreenSize) r = 2; #endif + +#ifdef HAVE_XRRGETPROVIDERREDOURCES + LOAD_FUNCPTR(XRRGetOutputPrimary) + LOAD_FUNCPTR(XRRGetProviderResources) + LOAD_FUNCPTR(XRRFreeProviderResources) + LOAD_FUNCPTR(XRRGetProviderInfo) + LOAD_FUNCPTR(XRRFreeProviderInfo) + r = 4; +#endif + #undef LOAD_FUNCPTR sym_not_found: @@ -560,8 +581,460 @@ done: #endif /* HAVE_XRRGETSCREENRESOURCES */ +#ifdef HAVE_XRRGETPROVIDERREDOURCES + +static RECT get_primary_rect( XRRScreenResources *resources ) +{ + XRROutputInfo *output_info = NULL; + XRRCrtcInfo *crtc_info = NULL; + RROutput primary_output; + RECT primary_rect = {0}; + RECT first_rect = {0}; + INT i; + + primary_output = pXRRGetOutputPrimary( gdi_display, root_window ); + if (!primary_output) + goto fallback; + + output_info = pXRRGetOutputInfo( gdi_display, resources, primary_output ); + if (!output_info || output_info->connection != RR_Connected || !output_info->crtc) + goto fallback; + + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, output_info->crtc ); + if (!crtc_info || !crtc_info->mode) + goto fallback; + + SetRect( &primary_rect, crtc_info->x, crtc_info->y, crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); + pXRRFreeCrtcInfo( crtc_info ); + pXRRFreeOutputInfo( output_info ); + return primary_rect; + +/* Fallback when XRandR primary output is a disconnected output. + * Try to find a crtc with (x, y) being (0, 0). If it's found then get the primary rect from that crtc, + * otherwise use the first active crtc to get the primary rect */ +fallback: + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); + if (output_info) + pXRRFreeOutputInfo( output_info ); + + WARN("Primary is set to a disconneted XRandR output.\n"); + for (i = 0; i < resources->ncrtc; ++i) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ); + if (!crtc_info) + continue; + + if (!crtc_info->mode) + { + pXRRFreeCrtcInfo( crtc_info ); + continue; + } + + if (!crtc_info->x && !crtc_info->y) + { + SetRect( &primary_rect, 0, 0, crtc_info->width, crtc_info->height ); + pXRRFreeCrtcInfo( crtc_info ); + break; + } + + if (IsRectEmpty( &first_rect )) + SetRect( &first_rect, crtc_info->x, crtc_info->y, + crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); + + pXRRFreeCrtcInfo( crtc_info ); + } + + return IsRectEmpty( &primary_rect ) ? first_rect : primary_rect; +} + +static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) +{ + return crtc && + crtc->mode && + crtc->x == primary.left && + crtc->y == primary.top && + crtc->x + crtc->width == primary.right && + crtc->y + crtc->height == primary.bottom; +} + +static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) +{ + struct x11drv_gpu *gpus = NULL; + XRRScreenResources *screen_resources = NULL; + XRRProviderResources *provider_resources = NULL; + XRRProviderInfo *provider_info = NULL; + XRRCrtcInfo *crtc_info = NULL; + INT primary_provider = -1; + RECT primary_rect; + BOOL ret = FALSE; + INT i, j; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + provider_resources = pXRRGetProviderResources( gdi_display, root_window ); + if (!provider_resources) + goto done; + + gpus = heap_calloc( provider_resources->nproviders, sizeof(*gpus) ); + if (!gpus) + goto done; + + primary_rect = get_primary_rect( screen_resources ); + for (i = 0; i < provider_resources->nproviders; ++i) + { + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, provider_resources->providers[i] ); + if (!provider_info) + goto done; + + /* Find primary provider */ + for (j = 0; primary_provider == -1 && j < provider_info->ncrtcs; ++j) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, provider_info->crtcs[j] ); + if (!crtc_info) + continue; + + if (is_crtc_primary( primary_rect, crtc_info )) + { + primary_provider = i; + pXRRFreeCrtcInfo( crtc_info ); + break; + } + + pXRRFreeCrtcInfo( crtc_info ); + } + + gpus[i].id = provider_resources->providers[i]; + MultiByteToWideChar( CP_UTF8, 0, provider_info->name, -1, gpus[i].name, ARRAY_SIZE(gpus[i].name) ); + /* PCI IDs are all zero because there is currently no portable way to get it via XRandR. Some AMD drivers report + * their PCI address in the name but many others don't */ + pXRRFreeProviderInfo( provider_info ); + } + + /* Make primary GPU the first */ + if (primary_provider > 0) + { + struct x11drv_gpu tmp = gpus[0]; + gpus[0] = gpus[primary_provider]; + gpus[primary_provider] = tmp; + } + + *new_gpus = gpus; + *count = provider_resources->nproviders; + ret = TRUE; +done: + if (provider_resources) + pXRRFreeProviderResources( provider_resources ); + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + if (!ret) + { + heap_free( gpus ); + ERR("Failed to get gpus\n"); + } + return ret; +} + +static void xrandr14_free_gpus( struct x11drv_gpu *gpus ) +{ + heap_free( gpus ); +} + +static BOOL xrandr14_get_adapters( ULONG_PTR gpu_id, struct x11drv_adapter **new_adapters, int *count ) +{ + struct x11drv_adapter *adapters = NULL; + XRRScreenResources *screen_resources = NULL; + XRRProviderInfo *provider_info = NULL; + XRRCrtcInfo *enum_crtc_info, *crtc_info = NULL; + XRROutputInfo *output_info = NULL; + INT primary_adapter = 0; + INT adapter_count = 0; + BOOL mirrored, detached; + RECT primary_rect; + BOOL ret = FALSE; + INT i, j; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, gpu_id ); + if (!provider_info) + goto done; + + /* Actual adapter count could be less */ + adapters = heap_calloc( provider_info->ncrtcs, sizeof(*adapters) ); + if (!adapters) + goto done; + + primary_rect = get_primary_rect( screen_resources ); + for (i = 0; i < provider_info->noutputs; ++i) + { + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, provider_info->outputs[i] ); + if (!output_info) + goto done; + + /* Only connected output are considered as monitors */ + if (output_info->connection != RR_Connected) + { + pXRRFreeOutputInfo( output_info ); + output_info = NULL; + continue; + } + + /* Connected output doesn't mean the output is attached to a crtc */ + detached = FALSE; + if (output_info->crtc) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtc ); + if (!crtc_info) + goto done; + } + + if (!output_info->crtc || !crtc_info->mode) + detached = TRUE; + + /* Ignore crtc mirroring slaves because mirrored monitors are under the same adapter */ + mirrored = FALSE; + if (!detached) + { + for (j = 0; j < screen_resources->ncrtc; ++j) + { + enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, screen_resources->crtcs[j] ); + if (!enum_crtc_info) + goto done; + + /* Some crtcs on different providers may have the same coordinates, aka mirrored. + * Choose the crtc with the lowest value as primary and the rest will then be slaves + * in a mirroring set */ + if (crtc_info->x == enum_crtc_info->x && + crtc_info->y == enum_crtc_info->y && + crtc_info->width == enum_crtc_info->width && + crtc_info->height == enum_crtc_info->height && + output_info->crtc > screen_resources->crtcs[j]) + { + mirrored = TRUE; + pXRRFreeCrtcInfo( enum_crtc_info ); + break; + } + + pXRRFreeCrtcInfo( enum_crtc_info ); + } + } + + if (!mirrored || detached) + { + /* Use RROutput as adapter id. The reason of not using RRCrtc is that we need to detect inactive but + * attached monitors */ + adapters[adapter_count].id = provider_info->outputs[i]; + if (!detached) + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_ATTACHED_TO_DESKTOP; + if (is_crtc_primary( primary_rect, crtc_info )) + { + adapters[adapter_count].state_flags |= DISPLAY_DEVICE_PRIMARY_DEVICE; + primary_adapter = adapter_count; + } + + ++adapter_count; + } + + pXRRFreeOutputInfo( output_info ); + output_info = NULL; + if (crtc_info) + { + pXRRFreeCrtcInfo( crtc_info ); + crtc_info = NULL; + } + } + + /* Make primary adapter the first */ + if (primary_adapter) + { + struct x11drv_adapter tmp = adapters[0]; + adapters[0] = adapters[primary_adapter]; + adapters[primary_adapter] = tmp; + } + + *new_adapters = adapters; + *count = adapter_count; + ret = TRUE; +done: + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + if (provider_info) + pXRRFreeProviderInfo( provider_info ); + if (output_info) + pXRRFreeOutputInfo( output_info ); + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); + if (!ret) + { + heap_free( adapters ); + ERR("Failed to get adapters\n"); + } + return ret; +} + +static void xrandr14_free_adapters( struct x11drv_adapter *adapters ) +{ + heap_free( adapters ); +} + +static BOOL xrandr14_get_monitors( ULONG_PTR adapter_id, struct x11drv_monitor **new_monitors, int *count ) +{ + static const WCHAR generic_nonpnp_monitorW[] = { + 'G','e','n','e','r','i','c',' ', + 'N','o','n','-','P','n','P',' ','M','o','n','i','t','o','r',0}; + struct x11drv_monitor *realloc_monitors, *monitors = NULL; + XRRScreenResources *screen_resources = NULL; + XRROutputInfo *output_info = NULL, *enum_output_info = NULL; + XRRCrtcInfo *crtc_info = NULL, *enum_crtc_info; + INT primary_index = 0, monitor_count = 0, capacity; + RECT work_rect, primary_rect; + BOOL ret = FALSE; + INT i; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + /* First start with a 2 monitors, should be enough for most cases */ + capacity = 2; + monitors = heap_calloc( capacity, sizeof(*monitors) ); + if (!monitors) + goto done; + + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, adapter_id ); + if (!output_info) + goto done; + + if (output_info->crtc) + { + crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, output_info->crtc ); + if (!crtc_info) + goto done; + } + + /* Inactive but attached monitor, no need to check for mirrored/slave monitors */ + if (!output_info->crtc || !crtc_info->mode) + { + lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + monitor_count = 1; + } + /* Active monitors, need to find other monitors with the same coordinates as mirrored */ + else + { + query_work_area( &work_rect ); + primary_rect = get_primary_rect( screen_resources ); + + for (i = 0; i < screen_resources->noutput; ++i) + { + enum_output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[i] ); + if (!enum_output_info) + goto done; + + /* Detached outputs don't count */ + if (enum_output_info->connection != RR_Connected) + { + pXRRFreeOutputInfo( enum_output_info ); + enum_output_info = NULL; + continue; + } + + /* Allocate more space if needed */ + if (monitor_count >= capacity) + { + capacity *= 2; + realloc_monitors = heap_realloc( monitors, capacity * sizeof(*monitors) ); + if (!realloc_monitors) + goto done; + monitors = realloc_monitors; + } + + if (enum_output_info->crtc) + { + enum_crtc_info = pXRRGetCrtcInfo( gdi_display, screen_resources, enum_output_info->crtc ); + if (!enum_crtc_info) + goto done; + + if (enum_crtc_info->x == crtc_info->x && + enum_crtc_info->y == crtc_info->y && + enum_crtc_info->width == crtc_info->width && + enum_crtc_info->height == crtc_info->height) + { + /* FIXME: Read output EDID property and parse the data to get the correct name */ + lstrcpyW( monitors[monitor_count].name, generic_nonpnp_monitorW ); + + SetRect( &monitors[monitor_count].rc_monitor, crtc_info->x, crtc_info->y, + crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height ); + if (!IntersectRect( &monitors[monitor_count].rc_work, &work_rect, &monitors[monitor_count].rc_monitor )) + monitors[monitor_count].rc_work = monitors[monitor_count].rc_monitor; + + monitors[monitor_count].state_flags = DISPLAY_DEVICE_ATTACHED; + if (!IsRectEmpty( &monitors[monitor_count].rc_monitor )) + monitors[monitor_count].state_flags |= DISPLAY_DEVICE_ACTIVE; + + if (is_crtc_primary( primary_rect, crtc_info )) + primary_index = monitor_count; + monitor_count++; + } + + pXRRFreeCrtcInfo( enum_crtc_info ); + } + + pXRRFreeOutputInfo( enum_output_info ); + enum_output_info = NULL; + } + + /* Make sure the first monitor is the primary */ + if (primary_index) + { + struct x11drv_monitor tmp = monitors[0]; + monitors[0] = monitors[primary_index]; + monitors[primary_index] = tmp; + } + + /* Make sure the primary monitor origin is at (0, 0) */ + for (i = 0; i < monitor_count; i++) + { + OffsetRect( &monitors[i].rc_monitor, -primary_rect.left, -primary_rect.top ); + OffsetRect( &monitors[i].rc_work, -primary_rect.left, -primary_rect.top ); + } + } + + *new_monitors = monitors; + *count = monitor_count; + ret = TRUE; +done: + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + if (output_info) + pXRRFreeOutputInfo( output_info); + if (crtc_info) + pXRRFreeCrtcInfo( crtc_info ); + if (enum_output_info) + pXRRFreeOutputInfo( enum_output_info ); + if (!ret) + { + heap_free( monitors ); + ERR("Failed to get monitors\n"); + } + return ret; +} + +static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) +{ + heap_free( monitors ); +} + +#endif + void X11DRV_XRandR_Init(void) { + struct x11drv_display_device_handler handler; int event_base, error_base, minor, ret; static int major; Bool ok; @@ -591,6 +1064,21 @@ void X11DRV_XRandR_Init(void) if (!pXRRGetScreenResourcesCurrent || xrandr12_init_modes() < 0) #endif xrandr10_init_modes(); + +#ifdef HAVE_XRRGETPROVIDERREDOURCES + if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) + { + handler.name = "XRandR 1.4"; + handler.priority = 200; + handler.pGetGpus = xrandr14_get_gpus; + handler.pFreeGpus = xrandr14_free_gpus; + handler.pGetAdapters = xrandr14_get_adapters; + handler.pFreeAdapters = xrandr14_free_adapters; + handler.pGetMonitors = xrandr14_get_monitors; + handler.pFreeMonitors = xrandr14_free_monitors; + X11DRV_DisplayDevices_SetHandler( &handler ); + } +#endif } #else /* SONAME_LIBXRANDR */ -- 2.23.0

2 1

[PATCH v2 2/4] winex11.drv: Add virtual desktop display device handler.
by Zhiyi Zhang 23 Sep '19

23 Sep '19

The virtual desktop display device handler is actually the Xinerama handler, but with a much higher priority. So that it will be preferred in virtual desktop mode when other display device handlers are introduced, e.g., the XRandR handler. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xinerama.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 370d34e9cd..8e08221343 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -304,6 +304,7 @@ void xinerama_init( unsigned int width, unsigned int height ) { struct x11drv_display_device_handler handler; MONITORINFOEXW *primary; + BOOL desktop_mode = FALSE; int i; RECT rect; @@ -318,6 +319,7 @@ void xinerama_init( unsigned int width, unsigned int height ) query_desktop_work_area( &default_monitor.rcWork ); nb_monitors = 1; monitors = &default_monitor; + desktop_mode = TRUE; } primary = get_primary(); @@ -334,8 +336,8 @@ void xinerama_init( unsigned int width, unsigned int height ) (monitors[i].dwFlags & MONITORINFOF_PRIMARY) ? " (primary)" : "" ); } - handler.name = "Xinerama"; - handler.priority = 100; + handler.name = desktop_mode ? "Desktop" : "Xinerama"; + handler.priority = desktop_mode ? 1000 : 100; handler.pGetGpus = xinerama_get_gpus; handler.pGetAdapters = xinerama_get_adapters; handler.pGetMonitors = xinerama_get_monitors; -- 2.23.0

2 1

[PATCH v2 1/4] winex11.drv: Initialize display devices before getting primary desktop rectangle.
by Zhiyi Zhang 23 Sep '19

23 Sep '19

Otherwise, the retrieved primary desktop might be from the last explorer instance if we launch new explorer instances before wine server fully shuts down. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 169756,169762~169764. Fix a issue where primary is set to a disconnected XRandR output. dlls/winex11.drv/desktop.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index ecbcd6b381..fed8dd32e9 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -147,15 +147,18 @@ static LONG X11DRV_desktop_SetCurrentMode(int mode) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect = get_primary_monitor_rect(); + RECT primary_rect; root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; + xinerama_init( width, height ); X11DRV_DisplayDevices_Init( TRUE ); + primary_rect = get_primary_monitor_rect(); + max_width = primary_rect.right - primary_rect.left; + max_height = primary_rect.bottom - primary_rect.top; + /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, -- 2.23.0

2 1

[PATCH v2 1/2] wined3d: Fully clean up the device state in wined3d_device_uninit_3d().
by Zebediah Figura 23 Sep '19

23 Sep '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92259e3ea5b..c8fae1275c3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -537,8 +537,6 @@ void wined3d_device_cleanup(struct wined3d_device *device) ERR("Something's still holding the recording stateblock.\n"); device->recording = NULL; - state_cleanup(&device->state); - for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) { heap_free(device->multistate_funcs[i]); @@ -1142,7 +1140,7 @@ void wined3d_device_uninit_3d(struct wined3d_device *device) wined3d_texture_decref(texture); } - state_unbind_resources(&device->state); + state_cleanup(&device->state); for (i = 0; i < device->adapter->d3d_info.limits.max_rt_count; ++i) { wined3d_device_set_rendertarget_view(device, i, NULL, FALSE); -- 2.23.0

2 3

[PATCH v3] winex11.drv: Don't set the foreground for focus events that are older than the last SetFocus sent without an event.
by Gabriel Ivăncescu 23 Sep '19

23 Sep '19

When creating a visible window, the focus and the respective messages are immediately sent to the created window to match Windows behavior. However, the X11 server also sends either FocusIn events or the WM sends ClientMessages with the WM_TAKE_FOCUS atom (by default) if the windows are managed, since it received focus. If the application didn't have a message loop up to process these events, they will remain in the queue. If only one window is created, this is not a problem because the focus set manually and the focus set when processing the events will be the same and no message is sent. However, if 2 or more windows are created before the message loop, when these events are later processed by the app's message loop, they will change the focus and send the messages again, even though we've already done so earlier, which confuses some apps at this point. One example is Heroes of Might and Magic 5. See comment #11 on https://bugs.winehq.org/show_bug.cgi?id=39742#c11 -- `When "Full screen" active game starts and then shows desktop but it is not exited and after a few times switching game/desktop it shows game screen and it is playable` Related Proton bug: https://github.com/ValveSoftware/Proton/issues/2401 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v3: Use XNoOp instead of XSync to make it asynchronous. I'm not entirely sure if this works in 100% of the cases, but it's asynchronous. It can't make things worse that without the patch though, because if it ever fails somehow, it will simply act like the patch wasn't applied in the first place. dlls/winex11.drv/event.c | 48 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f79f40c..67339cb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -594,14 +594,22 @@ static void set_input_focus( struct x11drv_win_data *data ) /********************************************************************** * set_focus */ -static void set_focus( Display *display, HWND hwnd, Time time ) +static void set_focus( Display *display, HWND hwnd, Time time, unsigned long serial ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); HWND focus; Window win; GUITHREADINFO threadinfo; - TRACE( "setting foreground window to %p\n", hwnd ); - SetForegroundWindow( hwnd ); + if ((long)(thread_data->setfocus_serial - serial) > 0) + { + TRACE( "ignoring old serial %lu/%lu\n", serial, thread_data->setfocus_serial ); + } + else + { + TRACE( "setting foreground window to %p\n", hwnd ); + SetForegroundWindow( hwnd ); + } threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); @@ -709,7 +717,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } } @@ -718,7 +726,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd = GetForegroundWindow(); if (!hwnd) hwnd = last_focus; if (!hwnd) hwnd = GetDesktopWindow(); - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } /* try to find some other window to give the focus to */ @@ -726,7 +734,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time, event->serial ); } else if (protocol == x11drv_atom(_NET_WM_PING)) { @@ -805,9 +813,17 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = x11drv_thread_data()->last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime, event->serial ); + } + else + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if ((long)(thread_data->setfocus_serial - event->serial) > 0) + TRACE("ignoring old serial %lu/%lu\n", event->serial, thread_data->setfocus_serial); + else + SetForegroundWindow( hwnd ); } - else SetForegroundWindow( hwnd ); return TRUE; } @@ -1424,6 +1440,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1439,6 +1456,21 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + hwnd = GetAncestor(hwnd, GA_ROOT); + if (hwnd != thread_data->setfocus_hwnd) + { + thread_data->setfocus_hwnd = hwnd; + + /* If we are not processing an event, store the current serial so that + we ignore all older focus-related events. This prevents the focus + from being reverted later when the app processes its messages. */ + if (!thread_data->current_event) + { + thread_data->setfocus_serial = NextRequest(thread_data->display); + XNoOp(thread_data->display); + } + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e71156c..481ccdb 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -330,6 +330,8 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HWND setfocus_hwnd; /* top-level window corresponding to the last SetFocus */ + unsigned long setfocus_serial; /* serial number when last SetFocus without an event happened */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ -- 2.21.0

1 0

[PATCH] winegcc: Use -print-libgcc-file-name to find libgcc.
by Jacek Caban 23 Sep '19

23 Sep '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/winegcc.c | 54 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-)

1 0

[PATCH 5/5] wined3d: Use wined3d_context_map_bo_address() in wined3d_buffer_gl_map().
by Henri Verbeet 23 Sep '19

23 Sep '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 64 ++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index f483c523406..b8c5117f89e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -772,8 +772,9 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) /* The caller provides a context and binds the buffer */ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, - DWORD flags, const struct wined3d_gl_info *gl_info) + uint32_t flags, struct wined3d_context_gl *context_gl) { + const struct wined3d_gl_info *gl_info = context_gl->gl_info; enum wined3d_fence_result ret; HRESULT hr; @@ -784,6 +785,8 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, if (flags & WINED3D_MAP_DISCARD) { + wined3d_buffer_gl_bind(buffer_gl, context_gl); + GL_EXTCALL(glBufferData(buffer_gl->buffer_type_hint, buffer_gl->b.resource.size, NULL, buffer_gl->buffer_object_usage)); checkGLcall("glBufferData"); @@ -834,6 +837,7 @@ drop_fence: } gl_info->gl_ops.gl.p_glFinish(); + wined3d_buffer_gl_bind(buffer_gl, context_gl); GL_EXTCALL(glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)); checkGLcall("glBufferParameteriAPPLE(buffer_gl->buffer_type_hint, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_TRUE)"); buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; @@ -964,7 +968,6 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, unsigned int offset, unsigned int size, BYTE **data, DWORD flags) { struct wined3d_device *device = buffer_gl->b.resource.device; - struct wined3d_context_gl *context_gl; struct wined3d_context *context; LONG count; BYTE *base; @@ -976,6 +979,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; + struct wined3d_bo_address addr; /* DISCARD invalidates the entire buffer, regardless of the specified * offset and size. Some applications also depend on the entire buffer @@ -1003,11 +1007,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, } else { - const struct wined3d_gl_info *gl_info; - context = context_acquire(device, NULL, 0); - context_gl = wined3d_context_gl(context); - gl_info = context_gl->gl_info; if (flags & WINED3D_MAP_DISCARD) wined3d_buffer_validate_location(&buffer_gl->b, WINED3D_LOCATION_BUFFER); @@ -1025,8 +1025,6 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (count == 1) { - wined3d_buffer_gl_bind(buffer_gl, context_gl); - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 * multitexture fill rate test seems to depend on this. When * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the @@ -1037,28 +1035,19 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, if (buffer_gl->b.flags & WINED3D_BUFFER_DISCARD) flags &= ~WINED3D_MAP_DISCARD; - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GLbitfield mapflags = wined3d_resource_gl_map_flags(flags); - buffer_gl->b.map_ptr = GL_EXTCALL(glMapBufferRange(buffer_gl->buffer_type_hint, - 0, buffer_gl->b.resource.size, mapflags)); - checkGLcall("glMapBufferRange"); - } - else - { - if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - wined3d_buffer_gl_sync_apple(buffer_gl, flags, gl_info); - buffer_gl->b.map_ptr = GL_EXTCALL(glMapBuffer(buffer_gl->buffer_type_hint, - wined3d_resource_gl_legacy_map_flags(flags))); - checkGLcall("glMapBuffer"); - } + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) + wined3d_buffer_gl_sync_apple(buffer_gl, flags, wined3d_context_gl(context)); + + addr.buffer_object = buffer_gl->b.buffer_object; + addr.addr = 0; + buffer_gl->b.map_ptr = wined3d_context_map_bo_address(context, &addr, + buffer_gl->b.resource.size, buffer_gl->b.resource.bind_flags, flags); if (((DWORD_PTR)buffer_gl->b.map_ptr) & (RESOURCE_ALIGNMENT - 1)) { WARN("Pointer %p is not %u byte aligned.\n", buffer_gl->b.map_ptr, RESOURCE_ALIGNMENT); - GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); - checkGLcall("glUnmapBuffer"); + wined3d_context_unmap_bo_address(context, &addr, buffer_gl->b.resource.bind_flags, 0, NULL); buffer_gl->b.map_ptr = NULL; if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) @@ -1122,36 +1111,33 @@ static void wined3d_buffer_gl_unmap(struct wined3d_buffer_gl *buffer_gl) if (buffer_gl->b.map_ptr) { struct wined3d_device *device = buffer_gl->b.resource.device; + unsigned int range_count = buffer_gl->b.modified_areas; const struct wined3d_gl_info *gl_info; struct wined3d_context_gl *context_gl; struct wined3d_context *context; + struct wined3d_bo_address addr; context = context_acquire(device, NULL, 0); context_gl = wined3d_context_gl(context); gl_info = context_gl->gl_info; - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) { - for (i = 0; i < buffer_gl->b.modified_areas; ++i) - { - GL_EXTCALL(glFlushMappedBufferRange(buffer_gl->buffer_type_hint, - buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); - checkGLcall("glFlushMappedBufferRange"); - } - } - else if (buffer_gl->b.flags & WINED3D_BUFFER_APPLESYNC) - { - for (i = 0; i < buffer_gl->b.modified_areas; ++i) + wined3d_buffer_gl_bind(buffer_gl, context_gl); + for (i = 0; i < range_count; ++i) { GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->buffer_type_hint, buffer_gl->b.maps[i].offset, buffer_gl->b.maps[i].size)); checkGLcall("glFlushMappedBufferRangeAPPLE"); } + range_count = 0; } - GL_EXTCALL(glUnmapBuffer(buffer_gl->buffer_type_hint)); + addr.buffer_object = buffer_gl->b.buffer_object; + addr.addr = 0; + wined3d_context_unmap_bo_address(context, &addr, + buffer_gl->b.resource.bind_flags, range_count, buffer_gl->b.maps); + context_release(context); buffer_clear_dirty_areas(&buffer_gl->b); -- 2.11.0

1 0

[PATCH 4/5] wined3d: Move the "buffer_object" field from struct wined3d_buffer_gl to struct wined3d_buffer.
by Henri Verbeet 23 Sep '19

23 Sep '19

We'll want to use this for Vulkan buffers as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/buffer.c | 24 ++++++++++++++---------- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/state.c | 14 ++++---------- dlls/wined3d/view.c | 7 +++---- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 26 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 736190a2730..03799b6aa84 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4675,7 +4675,7 @@ static void wined3d_buffer_gl_destroy_object(void *object) struct wined3d_buffer_gl *buffer_gl = object; struct wined3d_context *context; - if (buffer_gl->buffer_object) + if (buffer_gl->b.buffer_object) { context = context_acquire(buffer_gl->b.resource.device, NULL, 0); wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c7be6510993..f483c523406 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -135,7 +135,7 @@ void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD loc /* Context activation is done by the caller. */ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context_gl *context_gl) { - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); } /* Context activation is done by the caller. */ @@ -144,8 +144,9 @@ void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl { const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; + GLuint bo; - if (!buffer_gl->buffer_object) + if (!buffer_gl->b.buffer_object) return; /* The stream source state handler might have read the memory of the @@ -182,9 +183,10 @@ void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl } } - GL_EXTCALL(glDeleteBuffers(1, &buffer_gl->buffer_object)); + bo = buffer_gl->b.buffer_object; + GL_EXTCALL(glDeleteBuffers(1, &bo)); checkGLcall("glDeleteBuffers"); - buffer_gl->buffer_object = 0; + buffer_gl->b.buffer_object = 0; if (buffer_gl->b.fence) { @@ -201,6 +203,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLenum gl_usage = GL_STATIC_DRAW; GLenum error; + GLuint bo; TRACE("Creating an OpenGL buffer object for wined3d buffer %p with usage %s.\n", buffer_gl, debug_d3dusage(buffer_gl->b.resource.usage)); @@ -218,9 +221,10 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf * to be verified to check if the rhw and color values are in the correct * format. */ - GL_EXTCALL(glGenBuffers(1, &buffer_gl->buffer_object)); + GL_EXTCALL(glGenBuffers(1, &bo)); + buffer_gl->b.buffer_object = bo; error = gl_info->gl_ops.gl.p_glGetError(); - if (!buffer_gl->buffer_object || error != GL_NO_ERROR) + if (!buffer_gl->b.buffer_object || error != GL_NO_ERROR) { ERR("Failed to create a BO with error %s (%#x).\n", debug_glerror(error), error); goto fail; @@ -678,7 +682,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, if (locations & WINED3D_LOCATION_BUFFER) { - data->buffer_object = wined3d_buffer_gl(buffer)->buffer_object; + data->buffer_object = buffer->buffer_object; data->addr = NULL; return WINED3D_LOCATION_BUFFER; } @@ -701,7 +705,7 @@ static void buffer_unload(struct wined3d_resource *resource) TRACE("buffer %p.\n", buffer); - if (wined3d_buffer_gl(buffer)->buffer_object) + if (buffer->buffer_object) { struct wined3d_context *context; @@ -969,7 +973,7 @@ static HRESULT wined3d_buffer_gl_map(struct wined3d_buffer_gl *buffer_gl, count = ++buffer_gl->b.resource.map_count; - if (buffer_gl->buffer_object) + if (buffer_gl->b.buffer_object) { unsigned int dirty_offset = offset, dirty_size = size; @@ -1466,7 +1470,7 @@ static BOOL wined3d_buffer_gl_prepare_location(struct wined3d_buffer *buffer, return wined3d_resource_prepare_sysmem(&buffer->resource); case WINED3D_LOCATION_BUFFER: - if (buffer_gl->buffer_object) + if (buffer->buffer_object) return TRUE; if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 75734e23a0d..9cd6a6e3de6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4339,7 +4339,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; struct wined3d_buffer *buffer = indirect->buffer; - GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->buffer_object)); + GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, buffer->buffer_object)); GL_EXTCALL(glDispatchComputeIndirect((GLintptr)indirect->offset)); GL_EXTCALL(glBindBuffer(GL_DISPATCH_INDIRECT_BUFFER, 0)); } @@ -4732,7 +4732,7 @@ static void wined3d_context_gl_draw_indirect(struct wined3d_context_gl *context_ return; } - GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, wined3d_buffer_gl(buffer)->buffer_object)); + GL_EXTCALL(glBindBuffer(GL_DRAW_INDIRECT_BUFFER, buffer->buffer_object)); offset = (void *)(GLintptr)parameters->offset; if (idx_size) @@ -4898,7 +4898,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indexed) { struct wined3d_buffer *index_buffer = state->index_buffer; - if (!wined3d_buffer_gl(index_buffer)->buffer_object || !stream_info->all_vbo) + if (!index_buffer->buffer_object || !stream_info->all_vbo) { idx_data = index_buffer->resource.heap_memory; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 54c0c67fbad..4bc371b8e7a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4292,16 +4292,12 @@ static void indexbuffer(struct wined3d_context *context, const struct wined3d_st { const struct wined3d_gl_info *gl_info = wined3d_context_gl(context)->gl_info; const struct wined3d_stream_info *stream_info = &context->stream_info; + const struct wined3d_buffer *ib = state->index_buffer; - if (!state->index_buffer || !stream_info->all_vbo) - { + if (!ib || !stream_info->all_vbo) GL_EXTCALL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0)); - } else - { - struct wined3d_buffer_gl *ib = wined3d_buffer_gl(state->index_buffer); GL_EXTCALL(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ib->buffer_object)); - } } static void depth_clip(const struct wined3d_rasterizer_state *r, const struct wined3d_gl_info *gl_info) @@ -4400,8 +4396,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state for (i = 0; i < count; ++i) { buffer = state->cb[shader_type][i]; - GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, - buffer ? wined3d_buffer_gl(buffer)->buffer_object : 0)); + GL_EXTCALL(glBindBufferBase(GL_UNIFORM_BUFFER, base + i, buffer ? buffer->buffer_object : 0)); } checkGLcall("bind constant buffers"); } @@ -4473,8 +4468,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state offset = 0; } size = buffer->resource.size - offset; - GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, - wined3d_buffer_gl(buffer)->buffer_object, offset, size)); + GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, buffer->buffer_object, offset, size)); } checkGLcall("bind transform feedback buffers"); } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 45ec39fbd21..0b4c296f170 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -275,14 +275,13 @@ static void create_buffer_texture(struct wined3d_gl_view *view, struct wined3d_c if (gl_info->supported[ARB_TEXTURE_BUFFER_RANGE]) { GL_EXTCALL(glTexBufferRange(GL_TEXTURE_BUFFER, view_format_gl->internal, - wined3d_buffer_gl(buffer)->buffer_object, offset, size)); + buffer->buffer_object, offset, size)); } else { if (offset || size != buffer->resource.size) FIXME("OpenGL implementation does not support ARB_texture_buffer_range.\n"); - GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format_gl->internal, - wined3d_buffer_gl(buffer)->buffer_object)); + GL_EXTCALL(glTexBuffer(GL_TEXTURE_BUFFER, view_format_gl->internal, buffer->buffer_object)); } checkGLcall("Create buffer texture"); @@ -1033,7 +1032,7 @@ void wined3d_unordered_access_view_clear_uint(struct wined3d_unordered_access_vi wined3d_unordered_access_view_invalidate_location(view, ~WINED3D_LOCATION_BUFFER); get_buffer_view_range(&buffer_gl->b, &view->desc, &format->f, &offset, &size); - wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->buffer_object); + wined3d_context_gl_bind_bo(context_gl, buffer_gl->buffer_type_hint, buffer_gl->b.buffer_object); GL_EXTCALL(glClearBufferSubData(buffer_gl->buffer_type_hint, format->internal, offset, size, format->format, format->type, clear_value)); checkGLcall("clear unordered access view"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 866f9af87b0..15a272db17d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4176,6 +4176,7 @@ struct wined3d_buffer DWORD flags; DWORD locations; void *map_ptr; + uintptr_t buffer_object; struct wined3d_map_range *maps; SIZE_T maps_size, modified_areas; @@ -4216,7 +4217,6 @@ struct wined3d_buffer_gl { struct wined3d_buffer b; - GLuint buffer_object; GLenum buffer_object_usage; GLenum buffer_type_hint; }; -- 2.11.0

1 0