wine-commits January 2014

wine-commits@winehq.org

3 participants
814 discussions

Ken Thomases : winemac: Consolidate code paths for clearing the OpenGL context.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 2cc53379404bfb499461add373ddb42c77d224b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc53379404bfb499461add37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:03 2014 -0600 winemac: Consolidate code paths for clearing the OpenGL context. We clear it if the context or the view is NULL. If the context is non-NULL, we want to disassociate the views of both the current and passed-in contexts, if they differ. --- dlls/winemac.drv/cocoa_opengl.m | 44 ++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 752fb77..196da46 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -154,36 +154,28 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) WineOpenGLContext *context = (WineOpenGLContext*)c; NSView* view = (NSView*)v; - if (context) + if (context && view) { [context removeFromViews:NO]; - if (view) - { - macdrv_add_view_opengl_context(v, c); - - if (context.needsUpdate) - { - context.needsUpdate = FALSE; - [context setView:view]; - [context setLatentView:nil]; - } - else - { - if ([context view]) - [context clearDrawableLeavingSurfaceOnScreen]; - [context setLatentView:view]; - } + macdrv_add_view_opengl_context(v, c); - [context makeCurrentContext]; - - if ([context view]) - [context clearToBlackIfNeeded]; + if (context.needsUpdate) + { + context.needsUpdate = FALSE; + [context setView:view]; + [context setLatentView:nil]; } else { - [WineOpenGLContext clearCurrentContext]; - [context removeFromViews:YES]; + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; + [context setLatentView:view]; } + + [context makeCurrentContext]; + + if ([context view]) + [context clearToBlackIfNeeded]; } else { @@ -192,8 +184,12 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if ([currentContext isKindOfClass:[WineOpenGLContext class]]) { [WineOpenGLContext clearCurrentContext]; - [currentContext removeFromViews:YES]; + if (currentContext != context) + [currentContext removeFromViews:YES]; } + + if (context) + [context removeFromViews:YES]; } [pool release];

1 0

Ken Thomases : winemac: When setting a view for an OpenGL context and it is latent, clear any existing view.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: d57a99b48274e2020382465bccc69df5aa24630e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d57a99b48274e2020382465bc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:25:01 2014 -0600 winemac: When setting a view for an OpenGL context and it is latent, clear any existing view. --- dlls/winemac.drv/cocoa_opengl.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index 0b67ed1..752fb77 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -168,7 +168,11 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) [context setLatentView:nil]; } else + { + if ([context view]) + [context clearDrawableLeavingSurfaceOnScreen]; [context setLatentView:view]; + } [context makeCurrentContext];

1 0

Ken Thomases : winemac: When clearing the OpenGL context, disassociate it from its view.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 18963963306cbb75d409189da8ec2df219850d25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18963963306cbb75d409189da… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jan 14 01:24:57 2014 -0600 winemac: When clearing the OpenGL context, disassociate it from its view. --- dlls/winemac.drv/cocoa_opengl.m | 41 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/winemac.drv/cocoa_opengl.m b/dlls/winemac.drv/cocoa_opengl.m index f546be5..0b67ed1 100644 --- a/dlls/winemac.drv/cocoa_opengl.m +++ b/dlls/winemac.drv/cocoa_opengl.m @@ -90,6 +90,23 @@ } } + - (void) removeFromViews:(BOOL)removeViews + { + if ([self view]) + { + macdrv_remove_view_opengl_context((macdrv_view)[self view], (macdrv_opengl_context)self); + if (removeViews) + [self clearDrawableLeavingSurfaceOnScreen]; + } + if ([self latentView]) + { + macdrv_remove_view_opengl_context((macdrv_view)[self latentView], (macdrv_opengl_context)self); + if (removeViews) + [self setLatentView:nil]; + } + needsUpdate = FALSE; + } + @end @@ -122,11 +139,7 @@ void macdrv_dispose_opengl_context(macdrv_opengl_context c) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; WineOpenGLContext *context = (WineOpenGLContext*)c; - if ([context view]) - macdrv_remove_view_opengl_context((macdrv_view)[context view], c); - if ([context latentView]) - macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - [context clearDrawableLeavingSurfaceOnScreen]; + [context removeFromViews:YES]; [context release]; [pool release]; @@ -143,11 +156,7 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) if (context) { - if ([context view]) - macdrv_remove_view_opengl_context((macdrv_view)[context view], c); - if ([context latentView]) - macdrv_remove_view_opengl_context((macdrv_view)[context latentView], c); - context.needsUpdate = FALSE; + [context removeFromViews:NO]; if (view) { macdrv_add_view_opengl_context(v, c); @@ -169,11 +178,19 @@ void macdrv_make_context_current(macdrv_opengl_context c, macdrv_view v) else { [WineOpenGLContext clearCurrentContext]; - [context clearDrawableLeavingSurfaceOnScreen]; + [context removeFromViews:YES]; } } else - [WineOpenGLContext clearCurrentContext]; + { + WineOpenGLContext* currentContext = (WineOpenGLContext*)[WineOpenGLContext currentContext]; + + if ([currentContext isKindOfClass:[WineOpenGLContext class]]) + { + [WineOpenGLContext clearCurrentContext]; + [currentContext removeFromViews:YES]; + } + } [pool release]; }

1 0

Michael Stefaniuc : dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 1643038eca27f31c4c10487268107946483550cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1643038eca27f31c4c1048726… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jan 13 21:53:11 2014 +0100 dmscript: Return CLASS_E_CLASSNOTAVAILABLE for classes not implemented. --- dlls/dmscript/dmscript_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index e3dc8b7..6caf158 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -37,7 +37,7 @@ static HRESULT WINAPI create_unimpl_instance(REFIID riid, void **ppv, IUnknown * { FIXME("(%p, %s, %p) stub\n", pUnkOuter, debugstr_dmguid(riid), ppv); - return E_NOINTERFACE; + return CLASS_E_CLASSNOTAVAILABLE; } /******************************************************************

1 0

Frédéric Delanoy : winedump: Use BOOL type where appropriate.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 1bd7405193ca841a940cbf80386cd4fbe74f0b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd7405193ca841a940cbf803… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jan 13 21:44:00 2014 +0100 winedump: Use BOOL type where appropriate. --- tools/winedump/dump.c | 2 +- tools/winedump/main.c | 9 +++------ tools/winedump/msmangle.c | 34 +++++++++++++++++----------------- tools/winedump/winedump.h | 2 +- 4 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f263390..7ca4dc0 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -154,7 +154,7 @@ const char* get_symbol_str(const char* symname) parsed_symbol symbol; symbol_init(&symbol, symname); - if (symbol_demangle(&symbol) == -1) + if (!symbol_demangle(&symbol)) ret = symname; else if (symbol.flags & SYM_DATA) { diff --git a/tools/winedump/main.c b/tools/winedump/main.c index ca2047b..dfd15b0 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -444,17 +444,14 @@ int main (int argc, char *argv[]) if (globals.do_code && symbol_searched(count, symbol.symbol)) { /* Attempt to get information about the symbol */ - int result = symbol_demangle (&symbol); + BOOL result = symbol_demangle (&symbol) || symbol_search(&symbol); - if (result) - result = !symbol_search (&symbol); - - if (!result && symbol.function_name) + if (result && symbol.function_name) /* Clean up the prototype */ symbol_clean_string (symbol.function_name); if (NORMAL) - puts (result ? "[Not Found]" : "[OK]"); + puts (result ? "[OK]" : "[Not Found]"); } else if (NORMAL) puts ("[Ignoring]"); diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index a0d9f92..39e4f3a 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -63,7 +63,7 @@ static char *get_pointer_type_string (compound_type *ct, * * Demangle a C++ linker symbol into a C prototype */ -int symbol_demangle (parsed_symbol *sym) +BOOL symbol_demangle (parsed_symbol *sym) { compound_type ct; BOOL is_static = FALSE; @@ -83,7 +83,7 @@ int symbol_demangle (parsed_symbol *sym) /* MS mangled names always begin with '?' */ name = sym->symbol; if (*name++ != '?') - return -1; + return FALSE; if (VERBOSE) puts ("Attempting to demangle symbol"); @@ -162,12 +162,12 @@ int symbol_demangle (parsed_symbol *sym) case 'X': function_name = strdup ("placement_new_closure"); break; case 'Y': function_name = strdup ("placement_delete_closure"); break; default: - return -1; + return FALSE; } break; default: /* FIXME: Other operators */ - return -1; + return FALSE; } name++; } @@ -177,7 +177,7 @@ int symbol_demangle (parsed_symbol *sym) function_name = name; while (*name && *name++ != '@') ; if (!*name) - return -1; + return FALSE; function_name = str_substring (function_name, name - 1); } @@ -194,7 +194,7 @@ int symbol_demangle (parsed_symbol *sym) while (*name && *name++ != '@') ; if (*name++ != '@') { free (function_name); - return -1; + return FALSE; } class_name = str_substring (class_name, name - 2); /* Allocates a new string */ } @@ -220,7 +220,7 @@ int symbol_demangle (parsed_symbol *sym) printf ("/*FIXME: %s: unknown data*/\n", sym->symbol); free (function_name); free (class_name); - return -1; + return FALSE; } sym->flags |= SYM_DATA; sym->argc = 1; @@ -230,7 +230,7 @@ int symbol_demangle (parsed_symbol *sym) FREE_CT (ct); free (function_name); free (class_name); - return 0; + return TRUE; case '6' : /* compiler generated static */ case '7' : /* compiler generated static */ @@ -246,11 +246,11 @@ int symbol_demangle (parsed_symbol *sym) puts ("Demangled symbol OK [vtable]"); free (function_name); free (class_name); - return 0; + return TRUE; } free (function_name); free (class_name); - return -1; + return FALSE; /* Functions */ @@ -295,7 +295,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* If there is an implicit this pointer, const status follows */ @@ -310,7 +310,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } } @@ -342,7 +342,7 @@ int symbol_demangle (parsed_symbol *sym) default: free (function_name); free (class_name); - return -1; + return FALSE; } /* Return type, or @ if 'void' */ @@ -358,7 +358,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype (&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } sym->return_text = ct.expression; sym->return_type = get_type_constant(ct.dest_type, ct.flags); @@ -376,7 +376,7 @@ int symbol_demangle (parsed_symbol *sym) if (!demangle_datatype(&name, &ct, sym)) { free (function_name); free (class_name); - return -1; + return FALSE; } if (strcmp (ct.expression, "void")) @@ -405,7 +405,7 @@ int symbol_demangle (parsed_symbol *sym) if (*name != 'Z') { free (function_name); free (class_name); - return -1; + return FALSE; } /* Note: '()' after 'Z' means 'throws', but we don't care here */ @@ -433,7 +433,7 @@ int symbol_demangle (parsed_symbol *sym) if (VERBOSE) puts ("Demangled symbol OK"); - return 0; + return TRUE; } diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 754a7d2..88fa0e7 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -164,7 +164,7 @@ BOOL dll_next_symbol (parsed_symbol * sym); /* Symbol functions */ void symbol_init(parsed_symbol* symbol, const char* name); -int symbol_demangle (parsed_symbol *symbol); +BOOL symbol_demangle (parsed_symbol *symbol); BOOL symbol_search (parsed_symbol *symbol);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 Jan '14

14 Jan '14

Module: wine Branch: master Commit: 993fb8636c9d7ebb9369af5e1b2a36673e6d708a URL: http://source.winehq.org/git/wine.git/?a=commit;h=993fb8636c9d7ebb9369af5e1… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 13 18:01:47 2014 +0100 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index c48a8b8..e6e9286 100644 --- a/po/de.po +++ b/po/de.po @@ -10149,7 +10149,7 @@ msgstr "Wine Befehlsprozessor" #: cmd.rc:351 msgid "Microsoft Windows %1!S!\n" -msgstr "" +msgstr "Microsoft Windows %1!S!\n" #: cmd.rc:352 msgid "More? " @@ -10219,10 +10219,8 @@ msgid "Wine Explorer" msgstr "Wine Explorer" #: explorer.rc:33 -#, fuzzy -#| msgid "StartUp" msgid "Start" -msgstr "Autostart" +msgstr "Start" #: explorer.rc:34 winefile.rc:36 msgid "&Run..."

1 0

Stefan Dösinger : d3dx9_36: Make emsquare an unsigned int in create_outline.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 6bd6193cb13177bc012141458703fa5632ba5c29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd6193cb13177bc012141458… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:04 2014 +0100 d3dx9_36: Make emsquare an unsigned int in create_outline. --- dlls/d3dx9_36/mesh.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index b713079..118baf7 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -5128,7 +5128,7 @@ static HRESULT add_vertex_index(struct word_array *array, WORD vertex_index) C_ASSERT(sizeof(FIXED) == sizeof(float)); C_ASSERT(sizeof(POINTFX) == sizeof(D3DXVECTOR2)); -static inline D3DXVECTOR2 *convert_fixed_to_float(POINTFX *pt, int count, float emsquare) +static inline D3DXVECTOR2 *convert_fixed_to_float(POINTFX *pt, int count, unsigned int emsquare) { D3DXVECTOR2 *ret = (D3DXVECTOR2*)pt; while (count--) { @@ -5233,7 +5233,8 @@ static BOOL attempt_line_merge(struct outline *outline, } static HRESULT create_outline(struct glyphinfo *glyph, void *raw_outline, int datasize, - float max_deviation_sq, float emsquare, const struct cos_table *cos_table) + float max_deviation_sq, unsigned int emsquare, + const struct cos_table *cos_table) { TTPOLYGONHEADER *header = (TTPOLYGONHEADER *)raw_outline;

1 0

Stefan Dösinger : wined3d: Move map binding loading to wined3d_surface_map.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 4ca8f7104f429df245eab6373ad0e82eb61703d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ca8f7104f429df245eab6373… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:03 2014 +0100 wined3d: Move map binding loading to wined3d_surface_map. --- dlls/wined3d/surface.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a3c3ebf..0c83a0e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -820,23 +820,6 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - surface_prepare_map_memory(surface); - if (flags & WINED3D_MAP_DISCARD) - { - TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); - surface_validate_location(surface, surface->map_binding); - } - else - { - if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) - WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); - - surface_load_location(surface, surface->map_binding); - } - - if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) - surface_invalidate_location(surface, ~surface->map_binding); - switch (surface->map_binding) { case SFLAG_INUSERMEM: @@ -3205,6 +3188,24 @@ HRESULT CDECL wined3d_surface_map(struct wined3d_surface *surface, } } + surface_prepare_map_memory(surface); + if (flags & WINED3D_MAP_DISCARD) + { + TRACE("WINED3D_MAP_DISCARD flag passed, marking %s as up to date.\n", + debug_surflocation(surface->map_binding)); + surface_validate_location(surface, surface->map_binding); + } + else + { + if (surface->resource.usage & WINED3DUSAGE_DYNAMIC) + WARN_(d3d_perf)("Mapping a dynamic surface without WINED3D_MAP_DISCARD.\n"); + + surface_load_location(surface, surface->map_binding); + } + + if (!(flags & (WINED3D_MAP_NO_DIRTY_UPDATE | WINED3D_MAP_READONLY))) + surface_invalidate_location(surface, ~surface->map_binding); + base_memory = surface->surface_ops->surface_map(surface, rect, flags); if (format->flags & WINED3DFMT_FLAG_BROKEN_PITCH)

1 0

Stefan Dösinger : wined3d: Start to split up surface_prepare_system_memory.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: e2c0bc63cb95b83386b192e6e130abbc9a0c8a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2c0bc63cb95b83386b192e6e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:02 2014 +0100 wined3d: Start to split up surface_prepare_system_memory. --- dlls/wined3d/surface.c | 35 ++++++++++++++++++++++++++--------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5ac2241..a3c3ebf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,7 +589,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win context_release(context); } -void surface_prepare_system_memory(struct wined3d_surface *surface) +static void surface_prepare_system_memory(struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; @@ -597,8 +597,7 @@ void surface_prepare_system_memory(struct wined3d_surface *surface) if (!(surface->flags & SFLAG_PBO) && surface_need_pbo(surface, gl_info)) surface_create_pbo(surface, gl_info); - else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO - || surface->user_memory)) + else if (!(surface->resource.allocatedMemory || surface->flags & SFLAG_PBO)) { /* Whatever surface we have, make sure that there is memory allocated * for the downloaded copy, or a PBO to map. */ @@ -611,6 +610,24 @@ void surface_prepare_system_memory(struct wined3d_surface *surface) } } +void surface_prepare_map_memory(struct wined3d_surface *surface) +{ + switch (surface->map_binding) + { + case SFLAG_INUSERMEM: + if (!surface->user_memory) + ERR("Map binding is set to SFLAG_INUSERMEM but surface->user_memory is NULL.\n"); + break; + + case SFLAG_INSYSMEM: + surface_prepare_system_memory(surface); + break; + + default: + ERR("Unexpected map binding %s.\n", debug_surflocation(surface->map_binding)); + } +} + static void surface_evict_sysmem(struct wined3d_surface *surface) { if (surface->resource.map_count || (surface->flags & SFLAG_DONOTFREE) @@ -767,7 +784,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -803,7 +820,7 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); @@ -1392,7 +1409,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -2323,7 +2340,7 @@ 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_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ @@ -5024,7 +5041,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5034,7 +5051,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 090290f..897af19 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,7 +735,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); - surface_prepare_system_memory(surface); + surface_prepare_map_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce1711b..985f86f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,7 +2273,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; -void surface_prepare_system_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; +void surface_prepare_map_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Make the callers of load_location responsible for allocating sysmem.
by Alexandre Julliard 13 Jan '14

13 Jan '14

Module: wine Branch: master Commit: 676a7f2140aaefa50358001dbec89cc9a8d591e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=676a7f2140aaefa50358001db… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 13 15:21:01 2014 +0100 wined3d: Make the callers of load_location responsible for allocating sysmem. --- dlls/wined3d/surface.c | 12 ++++++++---- dlls/wined3d/texture.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7023bd7..5ac2241 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -589,7 +589,7 @@ static void surface_create_pbo(struct wined3d_surface *surface, const struct win context_release(context); } -static void surface_prepare_system_memory(struct wined3d_surface *surface) +void surface_prepare_system_memory(struct wined3d_surface *surface) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; @@ -767,6 +767,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) if (!(surface->flags & surface->map_binding)) { TRACE("Palette changed with surface that does not have an up to date system memory copy.\n"); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -802,10 +803,10 @@ static BYTE *surface_map(struct wined3d_surface *surface, const RECT *rect, DWOR TRACE("surface %p, rect %s, flags %#x.\n", surface, wine_dbgstr_rect(rect), flags); + surface_prepare_system_memory(surface); if (flags & WINED3D_MAP_DISCARD) { TRACE("WINED3D_MAP_DISCARD flag passed, marking SYSMEM as up to date.\n"); - surface_prepare_system_memory(surface); surface_validate_location(surface, surface->map_binding); } else @@ -1391,6 +1392,7 @@ static void surface_unload(struct wined3d_resource *resource) } else { + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } surface_invalidate_location(surface, ~surface->map_binding); @@ -2321,6 +2323,7 @@ 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_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); /* Switching color keying on / off may change the internal format. */ @@ -4907,8 +4910,6 @@ static DWORD resource_access_from_location(DWORD location) static void surface_load_sysmem(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, DWORD dst_location) { - surface_prepare_system_memory(surface); - if (surface->flags & (SFLAG_INRB_MULTISAMPLE | SFLAG_INRB_RESOLVED)) surface_load_location(surface, SFLAG_INTEXTURE); @@ -5023,6 +5024,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading RGB surface %p to reload it as sRGB.\n", surface); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5032,6 +5034,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* Performance warning... */ FIXME("Downloading sRGB surface %p to reload it as RGB.\n", surface); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); } } @@ -5040,6 +5043,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { WARN("Trying to load a texture from sysmem, but SFLAG_INSYSMEM is not set.\n"); /* Lets hope we get it from somewhere... */ + surface_prepare_system_memory(surface); surface_load_location(surface, SFLAG_INSYSMEM); } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f06db6d..090290f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -735,6 +735,7 @@ static void texture2d_sub_resource_add_dirty_region(struct wined3d_resource *sub { struct wined3d_surface *surface = surface_from_resource(sub_resource); + surface_prepare_system_memory(surface); surface_load_location(surface, surface->map_binding); surface_invalidate_location(surface, ~surface->map_binding); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a57e11b..ce1711b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2273,6 +2273,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P void surface_validate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; HRESULT CDECL wined3d_surface_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, DWORD flags, struct wined3d_surface **surface) DECLSPEC_HIDDEN; +void surface_prepare_system_memory(struct wined3d_surface *surface) DECLSPEC_HIDDEN; void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2014