May 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : makefiles: Remove the check for msvcr* imports.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: c959a18cad150e674852e6b29bd1928dc5656a33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c959a18cad150e674852e6b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:57:24 2019 +0200 makefiles: Remove the check for msvcr* imports. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 97017d7..24def39 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2202,7 +2202,7 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (make->use_msvcrt) strarray_add( &ret, "msvcrt" ); strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); @@ -4119,10 +4119,6 @@ static void load_sources( struct makefile *make ) make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || strarray_exists( &make->extradllflags, "-mwindows" ); - for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) - make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || - !strcmp( make->imports.str[i], "ucrtbase" ); - if (make->module && !make->install_lib.count && !make->install_dev.count) { if (make->importlib) strarray_add( &make->install_dev, make->importlib ); @@ -4171,18 +4167,13 @@ static void load_sources( struct makefile *make ) LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) get_dependencies( file, file ); if (crosstarget && !make->is_win16 && !strarray_exists( &make->imports, "kernel" )) - { - make->is_cross = (make->testdll || - strarray_exists( &make->extradllflags, "-mno-cygwin" ) || - !has_object_file( make )); - } + make->is_cross = (make->testdll || make->use_msvcrt || !has_object_file( make )); if (make->is_cross) { for (i = 0; i < make->imports.count; i++) strarray_add_uniq( &cross_import_libs, make->imports.str[i] ); - if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) - strarray_add_uniq( &cross_import_libs, "msvcrt" ); + if (make->use_msvcrt) strarray_add_uniq( &cross_import_libs, "msvcrt" ); strarray_add_uniq( &cross_import_libs, "winecrt0" ); strarray_add_uniq( &cross_import_libs, "kernel32" ); strarray_add_uniq( &cross_import_libs, "ntdll" );

1 0

Alexandre Julliard : msvcrt: Update arguments for some forwarded functions.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 7b8d104d6682785fe395d7651f33fb9941f64314 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8d104d6682785fe395d765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 20:54:02 2019 +0200 msvcrt: Update arguments for some forwarded functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 8 ++++---- dlls/msvcr120_app/msvcr120_app.spec | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 4ba1825..1535456 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -36,8 +36,8 @@ @ cdecl -arch=win64 ??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ(ptr) msvcp120.??0_Runtime_object(a)details@Concurrency@@QEAA(a)XZ @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ stub -arch=i386 ??0_SpinLock(a)details@Concurrency@@QAE(a)ACJ@Z @@ -521,8 +521,8 @@ @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z @ stub -arch=win32 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PAV12(a)I@Z @ stub -arch=win64 ?wait(a)agent@Concurrency@@SA?AW4agent_status(a)2@PEAV12(a)I@Z -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z @ stub -arch=win32 ?wait_for_all(a)agent@Concurrency@@SAXIPAPAV12(a)PAW4agent_status@2(a)I@Z diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index a9c21cb..af6b0fe 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -48,9 +48,9 @@ @ cdecl -arch=arm ??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAA(a)PAVScheduler@2@@Z @ thiscall -arch=i386 ??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QAE(a)PAVScheduler@2@@Z @ cdecl -arch=win64 ??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z(ptr ptr) msvcr120.??0_Scheduler(a)details@Concurrency@@QEAA(a)PEAVScheduler@2@@Z -@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z -@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z -@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z +@ cdecl -arch=arm ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z +@ thiscall -arch=i386 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z +@ cdecl -arch=win64 ??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_NonReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @ cdecl -arch=arm ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAA(a)AAV123@@Z @ thiscall -arch=i386 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QAE(a)AAV123@@Z @ cdecl -arch=win64 ??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z(ptr ptr) msvcr120.??0_Scoped_lock(a)_ReentrantPPLLock@details(a)Concurrency@@QEAA(a)AEAV123@@Z @@ -790,9 +790,9 @@ @ cdecl -arch=arm ?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAAXAAVcritical_section(a)3@@Z @ thiscall -arch=i386 ?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QAEXAAVcritical_section(a)3@@Z @ cdecl -arch=win64 ?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z(ptr ptr) msvcr120.?wait(a)_Condition_variable@details(a)Concurrency@@QEAAXAEAVcritical_section(a)3@@Z -@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAAII(a)Z -@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z -@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z +@ cdecl -arch=arm ?wait(a)event@Concurrency@@QAAII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAAII(a)Z +@ thiscall -arch=win32 ?wait(a)event@Concurrency@@QAEII(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QAEII(a)Z +@ cdecl -arch=win64 ?wait(a)event@Concurrency@@QEAA_KI(a)Z(ptr long) msvcr120.?wait(a)event@Concurrency@@QEAA_KI(a)Z @ cdecl -arch=arm ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAA_NAAVcritical_section(a)3@I(a)Z @ thiscall -arch=i386 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QAE_NAAVcritical_section(a)3@I(a)Z @ cdecl -arch=win64 ?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z(ptr ptr long) msvcr120.?wait_for(a)_Condition_variable@details(a)Concurrency@@QEAA_NAEAVcritical_section(a)3@I(a)Z

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 9729f15acc1a0c841596c02a5faa9d2a80901d4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9729f15acc1a0c841596c02a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:56 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e6d94f2..db3c4ee 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -99,10 +99,9 @@ static void context_clean_fbo_attachments(const struct wined3d_gl_info *gl_info, } /* Context activation is done by the caller. */ -static void context_destroy_fbo(struct wined3d_context *context, GLuint fbo) +static void wined3d_context_gl_destroy_fbo(struct wined3d_context_gl *context_gl, GLuint fbo) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, fbo); context_clean_fbo_attachments(gl_info, GL_FRAMEBUFFER); @@ -568,7 +567,7 @@ static void context_destroy_fbo_entry(struct wined3d_context *context, struct fb if (entry->id) { TRACE("Destroy FBO %u.\n", entry->id); - context_destroy_fbo(context, entry->id); + wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id); } --context->fbo_entry_count; list_remove(&entry->entry);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_reuse_fbo_entry().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 66156781eebaecae43af4855246a1204405fcea2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66156781eebaecae43af4855… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:57 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_reuse_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index db3c4ee..2670b41 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -540,17 +540,16 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * } /* Context activation is done by the caller. */ -static void context_reuse_fbo_entry(struct wined3d_context *context, GLenum target, +static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; wined3d_context_gl_bind_fbo(context_gl, target, entry->id); context_clean_fbo_attachments(gl_info, target); - context_generate_fbo_key(context, &entry->key, render_targets, depth_stencil, color_location, ds_location); + context_generate_fbo_key(&context_gl->c, &entry->key, render_targets, depth_stencil, color_location, ds_location); entry->flags = 0; if (depth_stencil->resource) { @@ -579,6 +578,7 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const struct wined3d_rendertarget_info ds_null = {{0}}; const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *rt_texture, *ds_texture; @@ -695,7 +695,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, else { entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); - context_reuse_fbo_entry(context, target, render_targets, depth_stencil, color_location, ds_location, entry); + wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, + depth_stencil, color_location, ds_location, entry); list_remove(&entry->entry); list_add_head(&context->fbo_list, &entry->entry); }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo_entry().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: d93689334fb6219b4eb2917371e4c9e249a75a0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d93689334fb6219b4eb29173… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:58 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_destroy_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2670b41..62927a3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -561,14 +561,14 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -static void context_destroy_fbo_entry(struct wined3d_context *context, struct fbo_entry *entry) +static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *context_gl, struct fbo_entry *entry) { if (entry->id) { TRACE("Destroy FBO %u.\n", entry->id); - wined3d_context_gl_destroy_fbo(wined3d_context_gl(context), entry->id); + wined3d_context_gl_destroy_fbo(context_gl, entry->id); } - --context->fbo_entry_count; + --context_gl->c.fbo_entry_count; list_remove(&entry->entry); heap_free(entry); } @@ -767,7 +767,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) { - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } if (context->rebind_fbo) @@ -1341,13 +1341,13 @@ void wined3d_context_cleanup(struct wined3d_context *context) LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(wined3d_context_gl(context), entry); } LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { if (!context->valid) entry->id = 0; - context_destroy_fbo_entry(context, entry); + wined3d_context_gl_destroy_fbo_entry(wined3d_context_gl(context), entry); } context_restore_pixel_format(context);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_find_fbo_entry().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0fdce94258c91b9eb85bb21de738f4380139fa23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fdce94258c91b9eb85bb21d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:52:59 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_find_fbo_entry(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 62927a3..38a4462 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -574,13 +574,12 @@ static void wined3d_context_gl_destroy_fbo_entry(struct wined3d_context_gl *cont } /* Context activation is done by the caller. */ -static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, GLenum target, +static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); static const struct wined3d_rendertarget_info ds_null = {{0}}; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_texture *rt_texture, *ds_texture; struct wined3d_fbo_entry_key fbo_key; unsigned int i, ds_level, rt_level; @@ -614,11 +613,11 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - context, ds_level, &render_targets[0]); + &context_gl->c, ds_level, &render_targets[0]); } } - context_generate_fbo_key(context, &fbo_key, render_targets, depth_stencil, color_location, ds_location); + context_generate_fbo_key(&context_gl->c, &fbo_key, render_targets, depth_stencil, color_location, ds_location); if (TRACE_ON(d3d)) { @@ -676,29 +675,29 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, } } - LIST_FOR_EACH_ENTRY(entry, &context->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY(entry, &context_gl->c.fbo_list, struct fbo_entry, entry) { if (memcmp(&fbo_key, &entry->key, sizeof(fbo_key))) continue; list_remove(&entry->entry); - list_add_head(&context->fbo_list, &entry->entry); + list_add_head(&context_gl->c.fbo_list, &entry->entry); return entry; } - if (context->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) + if (context_gl->c.fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) { - entry = context_create_fbo_entry(context, render_targets, depth_stencil, color_location, ds_location); - list_add_head(&context->fbo_list, &entry->entry); - ++context->fbo_entry_count; + entry = context_create_fbo_entry(&context_gl->c, render_targets, depth_stencil, color_location, ds_location); + list_add_head(&context_gl->c.fbo_list, &entry->entry); + ++context_gl->c.fbo_entry_count; } else { - entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); + entry = LIST_ENTRY(list_tail(&context_gl->c.fbo_list), struct fbo_entry, entry); wined3d_context_gl_reuse_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location, entry); list_remove(&entry->entry); - list_add_head(&context->fbo_list, &entry->entry); + list_add_head(&context_gl->c.fbo_list, &entry->entry); } return entry; @@ -783,7 +782,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ } else { - context->current_fbo = context_find_fbo_entry(context, target, + context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); context_apply_fbo_entry(context, target, context->current_fbo); }

1 0

Henri Verbeet : wined3d: Use context_acquire() in wined3d_swapchain_cs_init().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: db201072655946662c041a66ee434c30c245e5b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db201072655946662c041a66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 16 17:53:00 2019 +0430 wined3d: Use context_acquire() in wined3d_swapchain_cs_init(). Instead of calling context_create() directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 7 ++++--- dlls/wined3d/swapchain.c | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 38a4462..7cd16d5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4264,7 +4264,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(texture->swapchain); + if (!(context = swapchain_get_context(texture->swapchain))) + return NULL; } else { @@ -4274,8 +4275,8 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, * context for the primary swapchain. */ if (current_context && current_context->device == device) context = current_context; - else - context = swapchain_get_context(device->swapchains[0]); + else if (!(context = swapchain_get_context(device->swapchains[0]))) + return NULL; } context_activate(context, texture, sub_resource_idx); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f47c1a4..fbedd74 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -720,20 +720,20 @@ static void wined3d_swapchain_apply_sample_count_override(const struct wined3d_s static void wined3d_swapchain_cs_init(void *object) { struct wined3d_swapchain *swapchain = object; + struct wined3d_context *context; - if (!(swapchain->context[0] = context_create(swapchain))) + if (!(context = context_acquire(swapchain->device, swapchain->front_buffer, 0))) { - WARN("Failed to create context.\n"); + WARN("Failed to acquire context.\n"); return; } - swapchain->num_contexts = 1; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO && (!swapchain->desc.enable_auto_depth_stencil || swapchain->desc.auto_depth_stencil_format != swapchain->ds_format->id)) FIXME("Add OpenGL context recreation support.\n"); - context_release(swapchain->context[0]); + context_release(context); } void swapchain_set_max_frame_latency(struct wined3d_swapchain *swapchain, const struct wined3d_device *device)

1 0

Paul Gofman : ddraw: Fix setting current viewport for ddraw1.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 8bc7139b6fe27ba8fe80ae3414dee436d5b92f6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bc7139b6fe27ba8fe80ae34… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:48 2019 +0300 ddraw: Fix setting current viewport for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 6 +++++- dlls/ddraw/executebuffer.c | 13 +------------ 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 19f21a8..7137f78 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -555,7 +555,7 @@ struct d3d_execute_buffer *unsafe_impl_from_IDirect3DExecuteBuffer(IDirect3DExec /* The execute function */ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *execute_buffer, - struct d3d_device *device, struct d3d_viewport *viewport) DECLSPEC_HIDDEN; + struct d3d_device *device) DECLSPEC_HIDDEN; /***************************************************************************** * IDirect3DVertexBuffer diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 18e5854..ade56bb 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -712,9 +712,13 @@ static HRESULT WINAPI d3d_device1_Execute(IDirect3DDevice *iface, if(!buffer) return DDERR_INVALIDPARAMS; + if (FAILED(hr = IDirect3DDevice3_SetCurrentViewport + (&device->IDirect3DDevice3_iface, &viewport_impl->IDirect3DViewport3_iface))) + return hr; + /* Execute... */ wined3d_mutex_lock(); - hr = d3d_execute_buffer_execute(buffer, device, viewport_impl); + hr = d3d_execute_buffer_execute(buffer, device); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index f9082dc..637c2bd 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -48,8 +48,7 @@ static void _dump_D3DEXECUTEBUFFERDESC(const D3DEXECUTEBUFFERDESC *lpDesc) { TRACE("lpData : %p\n", lpDesc->lpData); } -HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, - struct d3d_device *device, struct d3d_viewport *viewport) +HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d_device *device) { DWORD is = buffer->data.dwInstructionOffset; char *instr = (char *)buffer->desc.lpData + is; @@ -58,16 +57,6 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct wined3d_box box = {0}; HRESULT hr; - if (viewport->active_device != device) - { - WARN("Viewport %p active device is %p.\n", - viewport, viewport->active_device); - return DDERR_INVALIDPARAMS; - } - - /* Activate the viewport */ - viewport_activate(viewport, FALSE); - TRACE("ExecuteData :\n"); if (TRACE_ON(ddraw)) _dump_executedata(&(buffer->data));

1 0

Paul Gofman : ddraw: Enable lighting only if material is set in d3d_execute_buffer_execute().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: ae2696c992a0bf0971b8b2e6df847bea51f8d3c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae2696c992a0bf0971b8b2e6… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:49 2019 +0300 ddraw: Enable lighting only if material is set in d3d_execute_buffer_execute(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/executebuffer.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 637c2bd..d5de513 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -306,21 +306,11 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d case D3DPROCESSVERTICES_TRANSFORM: wined3d_device_set_stream_source(device->wined3d_device, 0, buffer->src_vertex_buffer, buffer->src_vertex_pos, sizeof(D3DVERTEX)); - if (op == D3DPROCESSVERTICES_TRANSFORMLIGHT) - { - wined3d_device_set_vertex_declaration(device->wined3d_device, - ddraw_find_decl(device->ddraw, D3DFVF_VERTEX)); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_LIGHTING, TRUE); - } - else - { - wined3d_device_set_vertex_declaration(device->wined3d_device, - ddraw_find_decl(device->ddraw, D3DFVF_LVERTEX)); - wined3d_device_set_render_state(device->wined3d_device, - WINED3D_RS_LIGHTING, FALSE); - } - + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_LIGHTING, + op == D3DPROCESSVERTICES_TRANSFORMLIGHT && !!device->material); + wined3d_device_set_vertex_declaration(device->wined3d_device, + ddraw_find_decl(device->ddraw, op == D3DPROCESSVERTICES_TRANSFORMLIGHT + ? D3DFVF_VERTEX : D3DFVF_LVERTEX)); wined3d_device_process_vertices(device->wined3d_device, ci->wStart, ci->wDest, ci->dwCount, buffer->dst_vertex_buffer, NULL, 0, D3DFVF_TLVERTEX); break;

1 0

Paul Gofman : wined3d: Move validate_material_colour_source() to wined3d_private.h.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0d79d3625ed31df62294c6ae78e63c47991d6c89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d79d3625ed31df62294c6ae… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed May 15 18:06:50 2019 +0300 wined3d: Move validate_material_colour_source() to wined3d_private.h. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 10 ---------- dlls/wined3d/wined3d_private.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 669c8cb..06ff97c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6378,16 +6378,6 @@ int wined3d_ffp_frag_program_key_compare(const void *key, const struct wine_rb_e return memcmp(ka, kb, sizeof(*ka)); } -static enum wined3d_material_color_source validate_material_colour_source(WORD use_map, - enum wined3d_material_color_source source) -{ - if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) - return source; - if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) - return source; - return WINED3D_MCS_MATERIAL; -} - void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_ffp_vs_settings *settings) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2525fca..0a629dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4840,6 +4840,16 @@ static inline void wined3d_not_from_cs(struct wined3d_cs *cs) assert(cs->thread_id != GetCurrentThreadId()); } +static inline enum wined3d_material_color_source validate_material_colour_source(WORD use_map, + enum wined3d_material_color_source source) +{ + if (source == WINED3D_MCS_COLOR1 && use_map & (1u << WINED3D_FFP_DIFFUSE)) + return source; + if (source == WINED3D_MCS_COLOR2 && use_map & (1u << WINED3D_FFP_SPECULAR)) + return source; + return WINED3D_MCS_MATERIAL; +} + /* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ #define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL"

1 0