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

Dmitry Timoshkov : mshtml: Replace a useless trace with a slightly better one.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 2348215b82d1c0019a0cdcee79cb2a5aaa34e345 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2348215b82d1c0019a0cdcee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jun 18 14:09:59 2019 +0800 mshtml: Replace a useless trace with a slightly better one. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index f0daafa..dab4499 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -256,8 +256,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, HRESULT hres; hres = ITypeInfo_GetDocumentation(dti, desc->memid, &name, NULL, NULL, NULL); - if(FAILED(hres)) + if(FAILED(hres)) { + WARN("GetDocumentation failed: %08x\n", hres); return; + } for(info = data->funcs; info < data->funcs+data->func_cnt; info++) { if(info->id == desc->memid || !wcscmp(info->name, name)) { @@ -269,6 +271,8 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, } } + TRACE("adding %s...\n", debugstr_w(name)); + if(info == data->funcs+data->func_cnt) { if(data->func_cnt == data->func_size) data->funcs = heap_realloc_zero(data->funcs, (data->func_size <<= 1)*sizeof(func_info_t)); @@ -414,7 +418,6 @@ static HRESULT process_interface(dispex_data_t *data, tid_t tid, ITypeInfo *disp } if(!hook || hook->invoke) { - TRACE("adding...\n"); add_func_info(data, tid, funcdesc, disp_typeinfo ? disp_typeinfo : typeinfo, hook ? hook->invoke : NULL); }

1 0

Jarkko Korpi : wininet: Silence no support on this platform message.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: c9b2801c0d0974a40055e6e775d1e137f633b406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9b2801c0d0974a40055e6e7… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Tue Jun 18 04:29:28 2019 +0000 wininet: Silence no support on this platform message. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b9f9f91..6671950 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2324,7 +2324,8 @@ static WCHAR *get_proxy_autoconfig_url(void) CFRelease( settings ); return ret; #else - FIXME( "no support on this platform\n" ); + static int once; + if (!once++) FIXME( "no support on this platform\n" ); return NULL; #endif }

1 0

Alexandre Julliard : makefiles: Support mixing Unix and msvcrt headers in a single module.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 6bce2b13658468db73b96401b4369e21cd0fa5c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bce2b13658468db73b96401… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 19:17:06 2019 +0200 makefiles: Support mixing Unix and msvcrt headers in a single module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 94 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bce2b13658468db73b9…

1 0

Alexandre Julliard : winecrt0: Build with msvcrt.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: d401837994a31277103042fbe091e364c2fa55ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=d401837994a31277103042fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 17 19:18:01 2019 +0200 winecrt0: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/Makefile.in | 2 ++ dlls/winecrt0/debug.c | 2 +- dlls/winecrt0/delay_load.c | 6 +++--- dlls/winecrt0/dll_entry.c | 6 +++--- dlls/winecrt0/drv_entry.c | 6 +++--- dlls/winecrt0/exe_entry.c | 6 +++--- dlls/winecrt0/exe_main.c | 6 +++--- dlls/winecrt0/exe_wentry.c | 6 +++--- dlls/winecrt0/exe_wmain.c | 6 +++--- dlls/winecrt0/init.c | 6 +++--- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/winecrt0/Makefile.in b/dlls/winecrt0/Makefile.in index 79ba92f..6edbd04 100644 --- a/dlls/winecrt0/Makefile.in +++ b/dlls/winecrt0/Makefile.in @@ -1,5 +1,7 @@ MODULE = libwinecrt0.a +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ debug.c \ delay_load.c \ diff --git a/dlls/winecrt0/debug.c b/dlls/winecrt0/debug.c index f4b2573..01bfd4c 100644 --- a/dlls/winecrt0/debug.c +++ b/dlls/winecrt0/debug.c @@ -159,7 +159,7 @@ static const char * __cdecl fallback__wine_dbg_strdup( const char *str ) { static char *list[32]; static int pos; - char *ret = _strdup( str ); + char *ret = strdup( str ); int idx; idx = InterlockedIncrement( &pos ) % ARRAY_SIZE(list); diff --git a/dlls/winecrt0/delay_load.c b/dlls/winecrt0/delay_load.c index aab4079..0589b62 100644 --- a/dlls/winecrt0/delay_load.c +++ b/dlls/winecrt0/delay_load.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -63,5 +65,3 @@ static void free_delay_imports(void) if (*descr->phmod) FreeLibrary( *descr->phmod ); } #endif - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/dll_entry.c b/dlls/winecrt0/dll_entry.c index 591aa07..a002d87 100644 --- a/dlls/winecrt0/dll_entry.c +++ b/dlls/winecrt0/dll_entry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -45,5 +47,3 @@ BOOL WINAPI DECLSPEC_HIDDEN __wine_spec_dll_entry( HINSTANCE inst, DWORD reason, return ret; } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/drv_entry.c b/dlls/winecrt0/drv_entry.c index 4750168..ee9f3b1 100644 --- a/dlls/winecrt0/drv_entry.c +++ b/dlls/winecrt0/drv_entry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -37,5 +39,3 @@ NTSTATUS DECLSPEC_HIDDEN WINAPI __wine_spec_drv_entry( struct _DRIVER_OBJECT *ob return DriverEntry( obj, path ); /* there is no detach routine so we can't call destructors */ } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_entry.c b/dlls/winecrt0/exe_entry.c index 69ebb1b..13a1d89 100644 --- a/dlls/winecrt0/exe_entry.c +++ b/dlls/winecrt0/exe_entry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -39,5 +41,3 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_entry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_main.c b/dlls/winecrt0/exe_main.c index f51deba..d966faf 100644 --- a/dlls/winecrt0/exe_main.c +++ b/dlls/winecrt0/exe_main.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -50,5 +52,3 @@ int __cdecl main( int argc, char *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return WinMain( GetModuleHandleA(0), 0, cmdline, info.wShowWindow ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wentry.c b/dlls/winecrt0/exe_wentry.c index 83606f2..9db135e 100644 --- a/dlls/winecrt0/exe_wentry.c +++ b/dlls/winecrt0/exe_wentry.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -39,5 +41,3 @@ DWORD WINAPI DECLSPEC_HIDDEN __wine_spec_exe_wentry( PEB *peb ) if (needs_init) _fini(); ExitProcess( ret ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/exe_wmain.c b/dlls/winecrt0/exe_wmain.c index f817462..7ada198 100644 --- a/dlls/winecrt0/exe_wmain.c +++ b/dlls/winecrt0/exe_wmain.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -52,5 +54,3 @@ int __cdecl wmain( int argc, WCHAR *argv[] ) if (!(info.dwFlags & STARTF_USESHOWWINDOW)) info.wShowWindow = SW_SHOWNORMAL; return wWinMain( GetModuleHandleW(0), 0, cmdline, info.wShowWindow ); } - -#endif /* _WIN32 */ diff --git a/dlls/winecrt0/init.c b/dlls/winecrt0/init.c index bd9d9fc..2ffe8e5 100644 --- a/dlls/winecrt0/init.c +++ b/dlls/winecrt0/init.c @@ -18,7 +18,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _WIN32 +#if 0 +#pragma makedep unix +#endif #include <stdarg.h> #include "windef.h" @@ -42,5 +44,3 @@ void DECLSPEC_HIDDEN __wine_spec_init_ctor(void) if (__wine_spec_init_state == NO_INIT_DONE) __wine_spec_init(); __wine_spec_init_state = CONSTRUCTORS_DONE; } - -#endif /* _WIN32 */

1 0

Alexandre Julliard : winecrt0: Provide our own setjmp/ longjmp functions for exception handling.
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 61680b444960fb006f78e969f8bdb09d321363d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61680b444960fb006f78e969… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 18 10:17:43 2019 +0200 winecrt0: Provide our own setjmp/longjmp functions for exception handling. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcrt/except_arm.c | 62 +------------- dlls/msvcrt/except_arm64.c | 50 +---------- dlls/msvcrt/except_i386.c | 21 +---- dlls/msvcrt/except_x86_64.c | 60 +------------- dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/winecrt0/exception.c | 198 +++++++++++++++++++++++++++++++++++++++++++- include/wine/exception.h | 43 +++++----- tools/widl/typegen.c | 6 +- 13 files changed, 236 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61680b444960fb006f78…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_bind_unordered_access_views ().
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 9c746674e0cfc550cefc04abec4ded1f91f758ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c746674e0cfc550cefc04ab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:32 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_bind_unordered_access_views(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ea9f176..bc4e214 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3842,10 +3842,10 @@ static void context_load_unordered_access_resources(struct wined3d_context *cont } } -static void context_bind_unordered_access_views(struct wined3d_context *context, +static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_context_gl *context_gl, const struct wined3d_shader *shader, struct wined3d_unordered_access_view * const *views) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_unordered_access_view_gl *view_gl; const struct wined3d_format_gl *format_gl; GLuint texture_name; @@ -3874,7 +3874,7 @@ static void context_bind_unordered_access_views(struct wined3d_context *context, else if (view_gl->v.resource->type != WINED3D_RTYPE_BUFFER) { struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture_from_resource(view_gl->v.resource)); - texture_name = wined3d_texture_gl_get_texture_name(texture_gl, context, FALSE); + texture_name = wined3d_texture_gl_get_texture_name(texture_gl, &context_gl->c, FALSE); level = view_gl->v.desc.u.texture.level_idx; } else @@ -4002,7 +4002,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, if (context->update_unordered_access_view_bindings) { - context_bind_unordered_access_views(context, + wined3d_context_gl_bind_unordered_access_views(context_gl, state->shader[WINED3D_SHADER_TYPE_PIXEL], state->unordered_access_view[WINED3D_PIPELINE_GRAPHICS]); context->update_unordered_access_view_bindings = 0; @@ -4059,7 +4059,7 @@ static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *co if (context_gl->c.update_compute_unordered_access_view_bindings) { - context_bind_unordered_access_views(&context_gl->c, + wined3d_context_gl_bind_unordered_access_views(context_gl, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); context_gl->c.update_compute_unordered_access_view_bindings = 0;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_pause_transform_feedback() .
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 50d8290b25c237e0c914d0b9cf7cee39802d91f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d8290b25c237e0c914d0b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:33 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_pause_transform_feedback(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bc4e214..6bd6d43 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4101,19 +4101,18 @@ void wined3d_context_gl_end_transform_feedback(struct wined3d_context_gl *contex } } -static void context_pause_transform_feedback(struct wined3d_context *context, BOOL force) +static void wined3d_context_gl_pause_transform_feedback(struct wined3d_context_gl *context_gl, BOOL force) { - 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; - if (!context->transform_feedback_active || context->transform_feedback_paused) + if (!context_gl->c.transform_feedback_active || context_gl->c.transform_feedback_paused) return; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK2]) { GL_EXTCALL(glPauseTransformFeedback()); checkGLcall("glPauseTransformFeedback"); - context->transform_feedback_paused = 1; + context_gl->c.transform_feedback_paused = 1; return; } @@ -4833,7 +4832,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s gl_info = context->gl_info; if (!use_transform_feedback(state)) - context_pause_transform_feedback(context, TRUE); + wined3d_context_gl_pause_transform_feedback(context_gl, TRUE); for (i = 0; i < gl_info->limits.buffers; ++i) { @@ -5004,7 +5003,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s checkGLcall("glMemoryBarrier"); } - context_pause_transform_feedback(context, FALSE); + wined3d_context_gl_pause_transform_feedback(context_gl, FALSE); if (rasterizer_discard) {

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_setup_target().
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 3dce7bcffd3788e5404bbbc5dbd6532d48375b10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dce7bcffd3788e5404bbbc5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:34 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_setup_target(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6bd6d43..d7c9252 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4122,27 +4122,26 @@ static void wined3d_context_gl_pause_transform_feedback(struct wined3d_context_g wined3d_context_gl_end_transform_feedback(context_gl); } -static void context_setup_target(struct wined3d_context *context, +static void wined3d_context_gl_setup_target(struct wined3d_context_gl *context_gl, struct wined3d_texture *texture, unsigned int sub_resource_idx) { - BOOL old_render_offscreen = context->render_offscreen, render_offscreen; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + BOOL old_render_offscreen = context_gl->c.render_offscreen, render_offscreen; render_offscreen = wined3d_resource_is_offscreen(&texture->resource); - if (context->current_rt.texture == texture - && context->current_rt.sub_resource_idx == sub_resource_idx + if (context_gl->c.current_rt.texture == texture + && context_gl->c.current_rt.sub_resource_idx == sub_resource_idx && render_offscreen == old_render_offscreen) return; /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ - if (!context->current_rt.texture) + if (!context_gl->c.current_rt.texture) { - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); } else { - const struct wined3d_format *old = context->current_rt.texture->resource.format; + const struct wined3d_format *old = context_gl->c.current_rt.texture->resource.format; const struct wined3d_format *new = texture->resource.format; if (old->id != new->id) @@ -4150,12 +4149,12 @@ static void context_setup_target(struct wined3d_context *context, /* Disable blending when the alpha mask has changed and when a format doesn't support blending. */ if ((old->alpha_size && !new->alpha_size) || (!old->alpha_size && new->alpha_size) || !(texture->resource.format_flags & WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING)) - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); /* Update sRGB writing when switching between formats that do/do not support sRGB writing */ - if ((context->current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) + if ((context_gl->c.current_rt.texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE) != (texture->resource.format_flags & WINED3DFMT_FLAG_SRGB_WRITE)) - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + context_invalidate_state(&context_gl->c, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); } /* When switching away from an offscreen render target, and we're not @@ -4166,22 +4165,22 @@ static void context_setup_target(struct wined3d_context *context, * has to be called with the old rendertarget active, otherwise a * wrong drawable is read. */ if (wined3d_settings.offscreen_rendering_mode != ORM_FBO - && old_render_offscreen && (context->current_rt.texture != texture - || context->current_rt.sub_resource_idx != sub_resource_idx)) + && old_render_offscreen && (context_gl->c.current_rt.texture != texture + || context_gl->c.current_rt.sub_resource_idx != sub_resource_idx)) { - struct wined3d_texture_gl *prev_texture = wined3d_texture_gl(context->current_rt.texture); - unsigned int prev_sub_resource_idx = context->current_rt.sub_resource_idx; + struct wined3d_texture_gl *prev_texture = wined3d_texture_gl(context_gl->c.current_rt.texture); + unsigned int prev_sub_resource_idx = context_gl->c.current_rt.sub_resource_idx; /* Read the back buffer of the old drawable into the destination texture. */ if (prev_texture->texture_srgb.name) - wined3d_texture_load(&prev_texture->t, context, TRUE); - wined3d_texture_load(&prev_texture->t, context, FALSE); + wined3d_texture_load(&prev_texture->t, &context_gl->c, TRUE); + wined3d_texture_load(&prev_texture->t, &context_gl->c, FALSE); wined3d_texture_invalidate_location(&prev_texture->t, prev_sub_resource_idx, WINED3D_LOCATION_DRAWABLE); } } - context->current_rt.texture = texture; - context->current_rt.sub_resource_idx = sub_resource_idx; + context_gl->c.current_rt.texture = texture; + context_gl->c.current_rt.sub_resource_idx = sub_resource_idx; wined3d_context_gl_set_render_offscreen(context_gl, render_offscreen); } @@ -4190,7 +4189,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, { wined3d_context_gl_enter(context_gl); wined3d_context_gl_update_window(context_gl); - context_setup_target(&context_gl->c, texture, sub_resource_idx); + wined3d_context_gl_setup_target(context_gl, texture, sub_resource_idx); if (!context_gl->valid) return;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to draw_primitive_arrays().
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 578e7cd56620f9f1432f8dfdfeb4c6e06c9cad0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=578e7cd56620f9f1432f8dfd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:35 2019 +0430 wined3d: Pass a wined3d_context_gl structure to draw_primitive_arrays(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d7c9252..6a7aafc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4347,15 +4347,15 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state } /* Context activation is done by the caller. */ -static void draw_primitive_arrays(struct wined3d_context *context, const struct wined3d_state *state, - const void *idx_data, unsigned int idx_size, int base_vertex_idx, unsigned int start_idx, - unsigned int count, unsigned int start_instance, unsigned int instance_count) +static void wined3d_context_gl_draw_primitive_arrays(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, const void *idx_data, unsigned int idx_size, int base_vertex_idx, + unsigned int start_idx, unsigned int count, unsigned int start_instance, unsigned int instance_count) { - const struct wined3d_ffp_attrib_ops *ops = &context->d3d_info->ffp_attrib_ops; + const struct wined3d_ffp_attrib_ops *ops = &context_gl->c.d3d_info->ffp_attrib_ops; GLenum idx_type = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; - const struct wined3d_stream_info *si = &context->stream_info; + const struct wined3d_stream_info *si = &context_gl->c.stream_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int instanced_elements[ARRAY_SIZE(si->elements)]; - const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int instanced_element_count = 0; GLenum mode = state->gl_primitive_type; const void *indices; @@ -4460,7 +4460,8 @@ static void draw_primitive_arrays(struct wined3d_context *context, const struct element = &si->elements[element_idx]; ptr = element->data.addr + element->stride * i; if (element->data.buffer_object) - ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, context); + ptr += (ULONG_PTR)wined3d_buffer_load_sysmem(state->streams[element->stream_idx].buffer, + &context_gl->c); ops->generic[element->format->emit_idx](element_idx, ptr); } @@ -4991,9 +4992,9 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s idx_size, parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, parameters->u.direct.index_count, instance_count); else - draw_primitive_arrays(context, state, idx_data, idx_size, parameters->u.direct.base_vertex_idx, - parameters->u.direct.start_idx, parameters->u.direct.index_count, - parameters->u.direct.start_instance, instance_count); + wined3d_context_gl_draw_primitive_arrays(context_gl, state, idx_data, idx_size, + parameters->u.direct.base_vertex_idx, parameters->u.direct.start_idx, + parameters->u.direct.index_count, parameters->u.direct.start_instance, instance_count); } if (context->uses_uavs)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_gl_load_sysmem() in texture3d_load_location().
by Alexandre Julliard 18 Jun '19

18 Jun '19

Module: wine Branch: master Commit: 19470fc870649e385817b35cf9deb19feff8fb02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19470fc870649e385817b35c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 18 02:51:36 2019 +0430 wined3d: Use wined3d_texture_gl_load_sysmem() in texture3d_load_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 47 ++++------------------------------------------- 1 file changed, 4 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 13ebd31..2971e45 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3266,6 +3266,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_context *context, DWORD location) { struct wined3d_texture_sub_resource *sub_resource = &texture->sub_resources[sub_resource_idx]; + struct wined3d_texture_gl *texture_gl = wined3d_texture_gl(texture); struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int row_pitch, slice_pitch; @@ -3282,8 +3283,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_box src_box; data.addr += sub_resource->offset; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3294,8 +3294,7 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in struct wined3d_const_bo_address data = {sub_resource->buffer_object, NULL}; struct wined3d_box src_box; - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), - context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); + wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); wined3d_texture_get_level_box(texture, sub_resource_idx % texture->level_count, &src_box); wined3d_texture_upload_data(texture, sub_resource_idx, context, texture->resource.format, @@ -3317,46 +3316,8 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in break; case WINED3D_LOCATION_SYSMEM: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {0, texture->resource.heap_memory}; - - data.addr += sub_resource->offset; - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - ++texture->download_count; - } - else - { - FIXME("Implement WINED3D_LOCATION_SYSMEM loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; - case WINED3D_LOCATION_BUFFER: - if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) - { - struct wined3d_bo_address data = {sub_resource->buffer_object, NULL}; - - if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, FALSE); - else - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(texture), context_gl, TRUE); - - wined3d_texture_download_data(texture, sub_resource_idx, context, &data); - } - else - { - FIXME("Implement WINED3D_LOCATION_BUFFER loading from %s.\n", - wined3d_debug_location(sub_resource->locations)); - return FALSE; - } - break; + return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); default: FIXME("Implement %s loading from %s.\n", wined3d_debug_location(location),

1 0