January 2014 - Wine-commits

Stefan Dösinger : wined3d: Use the map binding to reload surfaces on palette changes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 5479ccea20ef8d03f7d1b29482cf2f63bd6e94fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5479ccea20ef8d03f7d1b2948… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:41 2014 +0100 wined3d: Use the map binding to reload surfaces on palette changes. --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b6dcb95..9cc8a71 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -755,12 +755,12 @@ static void surface_realize_palette(struct wined3d_surface *surface) } else { - if (!(surface->flags & SFLAG_INSYSMEM)) + if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - surface_load_location(surface, SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); } - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~surface->map_binding); } }

1 0

Stefan Dösinger : wined3d: Use the map binding to reload surfaces on color key changes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 5c1df19b16151dc9f0d3454c0a002c55652b1400 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1df19b16151dc9f0d3454c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 10 12:40:42 2014 +0100 wined3d: Use the map binding to reload surfaces on color key changes. --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9cc8a71..45c3663 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2308,8 +2308,8 @@ void surface_load(struct wined3d_surface *surface, BOOL srgb) /* To perform the color key conversion we need a sysmem copy of * the surface. Make sure we have it. */ - surface_load_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); + surface_load_location(surface, surface->map_binding); + surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ if (ck_changed) surface_force_reload(surface);

1 0

Ken Thomases : winemac: Clear the latentDisplayModes instance variable before realizing the latent modes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: d4d92a759e78355fbf2301fa6a3c903c9d59996e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d92a759e78355fbf2301fa6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:31 2014 -0600 winemac: Clear the latentDisplayModes instance variable before realizing the latent modes. --- dlls/winemac.drv/cocoa_app.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 3e622b7..13d9c87 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -2080,13 +2080,14 @@ int macdrv_err_on; - (void)applicationDidBecomeActive:(NSNotification *)notification { NSNumber* displayID; + NSDictionary* modesToRealize = [latentDisplayModes autorelease]; - for (displayID in latentDisplayModes) + latentDisplayModes = [[NSMutableDictionary alloc] init]; + for (displayID in modesToRealize) { - CGDisplayModeRef mode = (CGDisplayModeRef)[latentDisplayModes objectForKey:displayID]; + CGDisplayModeRef mode = (CGDisplayModeRef)[modesToRealize objectForKey:displayID]; [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [latentDisplayModes removeAllObjects]; [self updateCursorClippingState];

1 0

Ken Thomases : winemac: Simplify display mode code.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: ce5a87b1efeab009b32f4ccdfcdec46118723f29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce5a87b1efeab009b32f4ccdf… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:33 2014 -0600 winemac: Simplify display mode code. When originalDisplayModes has entries, the app is active. When the app is active, latentDisplayModes is empty. --- dlls/winemac.drv/cocoa_app.m | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 13d9c87..d499fd1 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -709,7 +709,6 @@ int macdrv_err_on; - (BOOL) setMode:(CGDisplayModeRef)mode forDisplay:(CGDirectDisplayID)displayID { BOOL ret = FALSE; - BOOL active = [NSApp isActive]; NSNumber* displayIDKey = [NSNumber numberWithUnsignedInt:displayID]; CGDisplayModeRef originalMode; @@ -719,39 +718,28 @@ int macdrv_err_on; { if ([originalDisplayModes count] == 1) // If this is the last changed display, do a blanket reset { - if (active) - { - CGRestorePermanentDisplayConfiguration(); - if (!displaysCapturedForFullscreen) - CGReleaseAllDisplays(); - } + CGRestorePermanentDisplayConfiguration(); + if (!displaysCapturedForFullscreen) + CGReleaseAllDisplays(); [originalDisplayModes removeAllObjects]; - [latentDisplayModes removeAllObjects]; ret = TRUE; } else // ... otherwise, try to restore just the one display { - if (active) + mode = [self modeMatchingMode:mode forDisplay:displayID]; + if (mode && CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr) { - mode = [self modeMatchingMode:mode forDisplay:displayID]; - if (mode) - ret = (CGDisplaySetDisplayMode(displayID, mode, NULL) == CGDisplayNoErr); - } - else - { - [latentDisplayModes removeObjectForKey:displayIDKey]; + [originalDisplayModes removeObjectForKey:displayIDKey]; ret = TRUE; } - if (ret) - [originalDisplayModes removeObjectForKey:displayIDKey]; } } else { - CGDisplayModeRef currentMode = NULL; + BOOL active = [NSApp isActive]; + CGDisplayModeRef currentMode; - if (!active) - currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); + currentMode = CGDisplayModeRetain((CGDisplayModeRef)[latentDisplayModes objectForKey:displayIDKey]); if (!currentMode) currentMode = CGDisplayCopyDisplayMode(displayID); if (!currentMode) // Invalid display ID @@ -790,7 +778,6 @@ int macdrv_err_on; else if (![originalDisplayModes count]) { CGRestorePermanentDisplayConfiguration(); - [latentDisplayModes removeAllObjects]; if (!displaysCapturedForFullscreen) CGReleaseAllDisplays(); }

1 0

Ken Thomases : winemac: For ChangeDisplaySettingsEx(), if caller didn' t specify, prefer non-interlaced and unstretched modes.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: c072a4564e55d38b3279e598a0b4a276639ab5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c072a4564e55d38b3279e598a… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Jan 10 03:11:36 2014 -0600 winemac: For ChangeDisplaySettingsEx(), if caller didn't specify, prefer non-interlaced and unstretched modes. --- dlls/winemac.drv/display.c | 72 +++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index e44415d..2f801f0 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -235,7 +235,9 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, struct macdrv_display *displays; int num_displays; CFArrayRef display_modes; - CFIndex count, i, safe; + CFIndex count, i, safe, best; + CGDisplayModeRef best_display_mode; + uint32_t best_io_flags; TRACE("%s %p %p 0x%08x %p\n", debugstr_w(devname), devmode, hwnd, flags, lpvoid); @@ -299,6 +301,7 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, TRACE("\n"); safe = -1; + best_display_mode = NULL; count = CFArrayGetCount(display_modes); for (i = 0; i < count; i++) { @@ -334,57 +337,78 @@ LONG CDECL macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmDisplayFrequency != (DWORD)refresh_rate) continue; } + if (devmode->dmFields & DM_DISPLAYFLAGS) + { + if (!(devmode->dmDisplayFlags & DM_INTERLACED) != !(io_flags & kDisplayModeInterlacedFlag)) + continue; + } + else if (best_display_mode) + { + if (io_flags & kDisplayModeInterlacedFlag && !(best_io_flags & kDisplayModeInterlacedFlag)) + continue; + else if (!(io_flags & kDisplayModeInterlacedFlag) && best_io_flags & kDisplayModeInterlacedFlag) + goto better; + } if (devmode->dmFields & DM_DISPLAYFIXEDOUTPUT) { if (!(devmode->dmDisplayFixedOutput == DMDFO_STRETCH) != !(io_flags & kDisplayModeStretchedFlag)) continue; } - if (devmode->dmFields & DM_DISPLAYFLAGS) + else if (best_display_mode) { - if (!(devmode->dmDisplayFlags & DM_INTERLACED) != !(io_flags & kDisplayModeInterlacedFlag)) + if (io_flags & kDisplayModeStretchedFlag && !(best_io_flags & kDisplayModeStretchedFlag)) continue; + else if (!(io_flags & kDisplayModeStretchedFlag) && best_io_flags & kDisplayModeStretchedFlag) + goto better; } + if (best_display_mode) + continue; + +better: + best_display_mode = display_mode; + best = safe; + best_io_flags = io_flags; + } + + if (best_display_mode) + { /* we have a valid mode */ - TRACE("Requested display settings match mode %ld\n", safe); + TRACE("Requested display settings match mode %ld\n", best); if ((flags & CDS_UPDATEREGISTRY) && !write_registry_settings(devmode)) { WARN("Failed to update registry\n"); ret = DISP_CHANGE_NOTUPDATED; - break; } + else if (flags & (CDS_TEST | CDS_NORESET)) + ret = DISP_CHANGE_SUCCESSFUL; + else if (macdrv_set_display_mode(&displays[0], best_display_mode)) + { + int mode_bpp = display_mode_bits_per_pixel(best_display_mode); + size_t width = CGDisplayModeGetWidth(best_display_mode); + size_t height = CGDisplayModeGetHeight(best_display_mode); - if (flags & (CDS_TEST | CDS_NORESET)) + SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; + } else { - if (macdrv_set_display_mode(&displays[0], display_mode)) - { - SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, - MAKELPARAM(width, height)); - ret = DISP_CHANGE_SUCCESSFUL; - } - else - { - WARN("Failed to set display mode\n"); - ret = DISP_CHANGE_FAILED; - } + WARN("Failed to set display mode\n"); + ret = DISP_CHANGE_FAILED; } - - break; } - - CFRelease(display_modes); - macdrv_free_displays(displays); - - if (i >= count) + else { /* no valid modes found */ ERR("No matching mode found %ux%ux%d @%u!\n", devmode->dmPelsWidth, devmode->dmPelsHeight, bpp, devmode->dmDisplayFrequency); } + CFRelease(display_modes); + macdrv_free_displays(displays); + return ret; }

1 0

Henri Verbeet : wined3d: Place the cursor texture in the default pool.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: f8e62bc5962bc71ed584fd35329aba180f5e9df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e62bc5962bc71ed584fd353… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:02 2014 +0100 wined3d: Place the cursor texture in the default pool. --- dlls/wined3d/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 925f879..40790c1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3809,8 +3809,8 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined desc.format = WINED3DFMT_B8G8R8A8_UNORM; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; - desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; desc.width = cursor_image->resource.width; desc.height = cursor_image->resource.height; desc.depth = 1; @@ -3825,7 +3825,7 @@ static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined } surface = surface_from_resource(wined3d_texture_get_sub_resource(texture, 0)); - if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, 0))) + if (FAILED(wined3d_surface_map(surface, &map_desc, NULL, WINED3D_MAP_DISCARD))) { ERR("Failed to map destination surface.\n"); wined3d_texture_decref(texture);

1 0

Henri Verbeet : wined3d: Place the logo texture in the default pool.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 06d6bdae4ae23ca47bf64c5252af1e393bb60eff URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d6bdae4ae23ca47bf64c525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:03 2014 +0100 wined3d: Place the logo texture in the default pool. --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 40790c1..ecad608 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -580,8 +580,8 @@ static void device_load_logo(struct wined3d_device *device, const char *filename desc.format = WINED3DFMT_B5G6R5_UNORM; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = 0; - desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage = WINED3DUSAGE_DYNAMIC; + desc.pool = WINED3D_POOL_DEFAULT; desc.width = bm.bmWidth; desc.height = bm.bmHeight; desc.depth = 1;

1 0

Henri Verbeet : wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 51cdeeacd4b4b8d48bcf938b5763ad1a5036812f URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cdeeacd4b4b8d48bcf938b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:04 2014 +0100 wined3d: Explicitly request alpha testing for blitting the cursor and logo textures to screen. --- dlls/wined3d/surface.c | 9 +++++---- dlls/wined3d/swapchain.c | 4 ++-- include/wine/wined3d.h | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35e3783..832caa5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4321,7 +4321,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } static void surface_blt_to_drawable(const struct wined3d_device *device, - enum wined3d_texture_filter_type filter, BOOL color_key, + enum wined3d_texture_filter_type filter, BOOL alpha_test, struct wined3d_surface *src_surface, const RECT *src_rect_in, struct wined3d_surface *dst_surface, const RECT *dst_rect_in) { @@ -4348,7 +4348,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, device->blitter->set_shader(device->blit_priv, context, src_surface); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); checkGLcall("glEnable(GL_ALPHA_TEST)"); @@ -4372,7 +4372,7 @@ static void surface_blt_to_drawable(const struct wined3d_device *device, draw_textured_quad(src_surface, context, &src_rect, &dst_rect, filter); - if (color_key) + if (alpha_test) { gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); checkGLcall("glDisable(GL_ALPHA_TEST)"); @@ -4571,7 +4571,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE src_surface->container->color_key_flags &= ~WINEDDSD_CKSRCBLT; } - surface_blt_to_drawable(device, filter, flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE), + surface_blt_to_drawable(device, filter, + flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE | WINEDDBLT_ALPHATEST), src_surface, src_rect, dst_surface, dst_rect); /* Restore the color key parameters */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 40fabc6..0e7d79f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -432,7 +432,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT RECT rect = {0, 0, src_surface->resource.width, src_surface->resource.height}; /* Blit the logo into the upper left corner of the drawable. */ - wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &rect, src_surface, &rect, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } @@ -453,7 +453,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->desc.windowed) MapWindowPoints(NULL, swapchain->win_handle, (POINT *)&destRect, 2); - wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_KEYSRC, + wined3d_surface_blt(back_buffer, &destRect, cursor, NULL, WINEDDBLT_ALPHATEST, NULL, WINED3D_TEXF_POINT); } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0f23fa2..7ddd466 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1268,6 +1268,7 @@ enum wined3d_display_rotation #define WINEDDBLT_WAIT 0x01000000 #define WINEDDBLT_DEPTHFILL 0x02000000 #define WINEDDBLT_DONOTWAIT 0x08000000 +#define WINEDDBLT_ALPHATEST 0x80000000 /* DDSURFACEDESC.dwFlags */ #define WINEDDSD_CAPS 0x00000001

1 0

Henri Verbeet : wined3d: Make rebind_fbo in struct wined3d_context a bitfield.
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: 5dd286d05a6dcd3c58922b77a29ba21ddeeb4f38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dd286d05a6dcd3c58922b77a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:05 2014 +0100 wined3d: Make rebind_fbo in struct wined3d_context a bitfield. --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c10f120..b985745 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1083,7 +1083,8 @@ struct wined3d_context DWORD lastWasPow2Texture : 8; /* MAX_TEXTURES, 8 */ DWORD fixed_function_usage_map : 8; /* MAX_TEXTURES, 8 */ DWORD lowest_disabled_stage : 4; /* Max MAX_TEXTURES, 8 */ - DWORD padding : 20; + DWORD rebind_fbo : 1; + DWORD padding : 19; DWORD shader_update_mask; DWORD constant_update_mask; DWORD numbered_array_mask; @@ -1116,7 +1117,6 @@ struct wined3d_context struct fbo_entry *current_fbo; GLuint fbo_read_binding; GLuint fbo_draw_binding; - BOOL rebind_fbo; struct wined3d_surface **blit_targets; GLenum *draw_buffers; DWORD draw_buffers_mask; /* Enabled draw buffers, 31 max. */

1 0

Henri Verbeet : ddraw: Pass the monitor to the callback in ddraw_enumerate_secondary_devices().
by Alexandre Julliard 10 Jan '14

10 Jan '14

Module: wine Branch: master Commit: c7d05d2d604064c96c5a6c8107c297b3bd9f488c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7d05d2d604064c96c5a6c810… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 10 10:43:06 2014 +0100 ddraw: Pass the monitor to the callback in ddraw_enumerate_secondary_devices(). --- dlls/ddraw/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 2dd0393..3bcd9b8 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -85,7 +85,7 @@ static void ddraw_enumerate_secondary_devices(struct wined3d *wined3d, LPDDENUMC { TRACE("Interface %d: %s\n", adapter, wine_dbgstr_guid(&adapter_id.device_identifier)); cont_enum = callback(&adapter_id.device_identifier, adapter_id.description, - adapter_id.device_name, context, 0); + adapter_id.device_name, context, wined3d_get_adapter_monitor(wined3d, adapter)); } } }

1 0