wine-commits June 2020

wine-commits@winehq.org

1 participants
947 discussions

Alexandre Julliard : ntdll: Move the semaphore functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 39915c9bc42f17619b1d2c46e6b3aea485c471a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39915c9bc42f17619b1d2c46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 20:19:37 2020 +0200 ntdll: Move the semaphore functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 87 ++------------------ dlls/ntdll/unix/loader.c | 4 + dlls/ntdll/unix/sync.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 9 +- 4 files changed, 227 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=39915c9bc42f17619b1d…

1 0

Alexandre Julliard : ntdll: Move some wait functions to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: a18444984171ee86503d1250094965fb50a198ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=a18444984171ee86503d1250… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 20:06:53 2020 +0200 ntdll: Move some wait functions to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/sync.c | 76 ++------------------- dlls/ntdll/unix/loader.c | 5 ++ dlls/ntdll/unix/sync.c | 167 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/unixlib.h | 11 +++- 5 files changed, 189 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a18444984171ee86503d…

1 0

Alexandre Julliard : ntdll: Move mapping of the user shared data to the Unix library.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 4ffe39573b537d638e4b39c9b5990c6566d62b09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ffe39573b537d638e4b39c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 19:48:26 2020 +0200 ntdll: Move mapping of the user shared data to the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 1 - dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/thread.c | 47 +----------------------------------------- dlls/ntdll/unix/thread.c | 2 ++ dlls/ntdll/unix/unix_private.h | 1 + dlls/ntdll/unix/virtual.c | 44 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 1dbb073963..45d32399ad 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4392,7 +4392,6 @@ void __wine_process_init(void) FILE_umask = umask(0777); umask( FILE_umask ); - map_user_shared_data(); load_global_options(); version_init(); diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index f2a1baf17f..65c65cc02d 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -176,7 +176,6 @@ extern NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, ANSI_S extern void virtual_fill_image_information( const pe_image_info_t *pe_info, SECTION_IMAGE_INFORMATION *info ) DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; -extern void map_user_shared_data(void) DECLSPEC_HIDDEN; /* completion */ extern NTSTATUS NTDLL_AddCompletion( HANDLE hFile, ULONG_PTR CompletionValue, diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 2d4fbe6cbe..8918b39a9c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -49,7 +49,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); WINE_DECLARE_DEBUG_CHANNEL(relay); -struct _KUSER_SHARED_DATA *user_shared_data = NULL; +struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; @@ -173,33 +173,6 @@ int __cdecl __wine_dbg_output( const char *str ) return unix_funcs->dbg_output( str ); } -void map_user_shared_data(void) -{ - static const WCHAR wine_usdW[] = {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', - '\\','_','_','w','i','n','e','_','u','s','e','r','_','s','h','a','r','e','d','_','d','a','t','a',0}; - OBJECT_ATTRIBUTES attr = {sizeof(attr)}; - UNICODE_STRING wine_usd_str; - NTSTATUS status; - HANDLE section; - int res, fd, needs_close; - - RtlInitUnicodeString( &wine_usd_str, wine_usdW ); - InitializeObjectAttributes( &attr, &wine_usd_str, OBJ_OPENIF, NULL, NULL ); - if ((status = NtOpenSection( &section, SECTION_ALL_ACCESS, &attr ))) - { - MESSAGE( "wine: failed to open the USD section: %08x\n", status ); - exit(1); - } - if ((res = unix_funcs->server_get_unix_fd( section, 0, &fd, &needs_close, NULL, NULL )) || - (user_shared_data != mmap( user_shared_data, sizeof(*user_shared_data), - PROT_READ, MAP_SHARED | MAP_FIXED, fd, 0 ))) - { - MESSAGE( "wine: failed to remap the process USD: %d\n", res ); - exit(1); - } - if (needs_close) close( fd ); - NtClose( section ); -} /*********************************************************************** * thread_init @@ -211,27 +184,9 @@ void map_user_shared_data(void) TEB *thread_init( SIZE_T *info_size, BOOL *suspend ) { TEB *teb; - void *addr; - SIZE_T size; - NTSTATUS status; virtual_init(); - /* reserve space for shared user data */ - - addr = (void *)0x7ffe0000; - size = 0x1000; - status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, - MEM_RESERVE|MEM_COMMIT, PAGE_READONLY ); - if (status) - { - MESSAGE( "wine: failed to map the shared user data: %08x\n", status ); - exit(1); - } - user_shared_data = addr; - - /* allocate and initialize the PEB and initial TEB */ - teb = unix_funcs->init_threading( &nb_threads, &__wine_ldt_copy, info_size, suspend, &server_cpus, &is_wow64, &server_start_time ); diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 3c69dfbd64..1d84c7173a 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -107,6 +107,8 @@ TEB * CDECL init_threading( int *nb_threads_ptr, struct ldt_copy **ldt_copy, SIZ dbg_init(); server_init_process(); info_size = server_init_thread( teb->Peb, suspend ); + virtual_map_user_shared_data(); + if (size) *size = info_size; if (cpus) *cpus = server_cpus; if (wow64) *wow64 = is_wow64; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 962774f8c1..ce751c9030 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -134,6 +134,7 @@ extern void virtual_init(void) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; +extern void virtual_map_user_shared_data(void) DECLSPEC_HIDDEN; extern void signal_init_threading(void) DECLSPEC_HIDDEN; extern NTSTATUS signal_alloc_thread( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index d768f32f12..7c5b5d5cf1 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -161,6 +161,8 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif +static struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; + SIZE_T signal_stack_size = 0; SIZE_T signal_stack_mask = 0; static SIZE_T signal_stack_align; @@ -2543,10 +2545,21 @@ TEB *virtual_alloc_first_teb(void) { TEB *teb; PEB *peb; + NTSTATUS status; + SIZE_T data_size = page_size; SIZE_T peb_size = page_size; SIZE_T teb_size = signal_stack_mask + 1; SIZE_T total = 32 * teb_size; + /* reserve space for shared user data */ + status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&user_shared_data, 0, &data_size, + MEM_RESERVE | MEM_COMMIT, PAGE_READONLY ); + if (status) + { + ERR( "wine: failed to map the shared user data: %08x\n", status ); + exit(1); + } + NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&teb_block, 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; @@ -2733,6 +2746,37 @@ void virtual_clear_thread_stack( void *stack_end ) } +/*********************************************************************** + * virtual_map_user_shared_data + */ +void virtual_map_user_shared_data(void) +{ + static const WCHAR wine_usdW[] = {'\\','K','e','r','n','e','l','O','b','j','e','c','t','s', + '\\','_','_','w','i','n','e','_','u','s','e','r','_','s','h','a','r','e','d','_','d','a','t','a',0}; + OBJECT_ATTRIBUTES attr = {sizeof(attr)}; + UNICODE_STRING wine_usd_str; + NTSTATUS status; + HANDLE section; + int res, fd, needs_close; + + RtlInitUnicodeString( &wine_usd_str, wine_usdW ); + InitializeObjectAttributes( &attr, &wine_usd_str, OBJ_OPENIF, NULL, NULL ); + if ((status = NtOpenSection( &section, SECTION_ALL_ACCESS, &attr ))) + { + ERR( "failed to open the USD section: %08x\n", status ); + exit(1); + } + if ((res = server_get_unix_fd( section, 0, &fd, &needs_close, NULL, NULL )) || + (user_shared_data != mmap( user_shared_data, page_size, PROT_READ, MAP_SHARED|MAP_FIXED, fd, 0 ))) + { + ERR( "failed to remap the process USD: %d\n", res ); + exit(1); + } + if (needs_close) close( fd ); + NtClose( section ); +} + + /*********************************************************************** * virtual_handle_fault */

1 0

Alexandre Julliard : ntdll: Consolidate some of the init routines into the init_threading() entry point.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: cd0c5988020acc92ff98260e3304967bf31e4e87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd0c5988020acc92ff98260e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 19:37:35 2020 +0200 ntdll: Consolidate some of the init routines into the init_threading() entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 8 +------- dlls/ntdll/ntdll_misc.h | 2 +- dlls/ntdll/server.c | 1 - dlls/ntdll/thread.c | 15 ++++----------- dlls/ntdll/unix/debug.c | 2 +- dlls/ntdll/unix/loader.c | 4 ---- dlls/ntdll/unix/server.c | 8 ++------ dlls/ntdll/unix/thread.c | 27 +++++++++++++++++++++++++-- dlls/ntdll/unix/unix_private.h | 20 +++++++++++--------- dlls/ntdll/unix/virtual.c | 5 +---- dlls/ntdll/unixlib.h | 10 +++------- 11 files changed, 49 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd0c5988020acc92ff98…

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in create_and_bind_fbo_attachment().
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: c73f4a81298d9a13a5a2ea21bcb03ed64d3a98db URL: https://source.winehq.org/git/wine.git/?a=commit;h=c73f4a81298d9a13a5a2ea21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:50:02 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in create_and_bind_fbo_attachment(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 26dd9ef533..21215ca7e7 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2236,13 +2236,15 @@ static void delete_fbo_attachment(const struct wined3d_gl_info *gl_info, } } -/* Context activation is done by the caller. */ -static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info, unsigned int flags, - enum wined3d_gl_resource_type d3d_type, GLuint *object, GLenum internal, GLenum format, GLenum type) +static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info, + const struct wined3d_format_gl *format_gl, + enum wined3d_gl_resource_type d3d_type, GLuint *object, GLenum internal) { - GLenum attach_type = flags & WINED3DFMT_FLAG_DEPTH ? - GL_DEPTH_ATTACHMENT : GL_COLOR_ATTACHMENT0; + GLenum format = format_gl->format; + GLenum type = format_gl->type; + GLenum attach_type; + attach_type = format_gl->f.depth_size ? GL_DEPTH_ATTACHMENT : GL_COLOR_ATTACHMENT0; switch (d3d_type) { case WINED3D_GL_RES_TYPE_TEX_1D: @@ -2252,11 +2254,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_1D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_1D, - *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_1D, - *object, 0); + gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_1D, *object, 0); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferTexture1D(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_TEXTURE_1D, *object, 0); break; case WINED3D_GL_RES_TYPE_TEX_2D: @@ -2270,7 +2271,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, attach_type, wined3d_gl_type_to_enum(d3d_type), *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) + if (format_gl->f.stencil_size) gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, wined3d_gl_type_to_enum(d3d_type), *object, 0); break; @@ -2282,11 +2283,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_3D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, attach_type, - GL_TEXTURE_3D, *object, 0, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, - GL_TEXTURE_3D, *object, 0, 0); + gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_3D, *object, 0, 0); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferTexture3D(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_TEXTURE_3D, *object, 0, 0); break; case WINED3D_GL_RES_TYPE_TEX_CUBE: @@ -2309,7 +2309,7 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, attach_type, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, *object, 0); - if (flags & WINED3DFMT_FLAG_STENCIL) + if (format_gl->f.stencil_size) gl_info->fbo_ops.glFramebufferTexture2D(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB, *object, 0); break; @@ -2318,11 +2318,10 @@ static void create_and_bind_fbo_attachment(const struct wined3d_gl_info *gl_info gl_info->fbo_ops.glGenRenderbuffers(1, object); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, *object); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, internal, 16, 16); - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, attach_type, GL_RENDERBUFFER, - *object); - if (flags & WINED3DFMT_FLAG_STENCIL) - gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, - *object); + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, attach_type, GL_RENDERBUFFER, *object); + if (format_gl->f.stencil_size) + gl_info->fbo_ops.glFramebufferRenderbuffer(GL_FRAMEBUFFER, + GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, *object); break; case WINED3D_GL_RES_TYPE_BUFFER: @@ -2484,8 +2483,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (type == WINED3D_GL_RES_TYPE_BUFFER) continue; - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, - &object, format->internal, format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->internal); if (format->f.flags[type] & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) { @@ -2539,8 +2537,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for while (gl_info->gl_ops.gl.p_glGetError()); delete_fbo_attachment(gl_info, type, object); - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, - &object, format->rt_internal, format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->rt_internal); status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); checkGLcall("Framebuffer format check"); @@ -2691,8 +2688,7 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for if (format->internal != format->srgb_internal) { delete_fbo_attachment(gl_info, type, object); - create_and_bind_fbo_attachment(gl_info, format->f.flags[type], type, &object, format->srgb_internal, - format->format, format->type); + create_and_bind_fbo_attachment(gl_info, format, type, &object, format->srgb_internal); status = gl_info->fbo_ops.glCheckFramebufferStatus(GL_FRAMEBUFFER); checkGLcall("Framebuffer format check");

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in query_internal_format().
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 6fd061ba1958f828b792ae5ee216e599f531ed45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fd061ba1958f828b792ae5e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:50:01 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in query_internal_format(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index df948264f9..26dd9ef533 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3100,8 +3100,7 @@ static void query_internal_format(struct wined3d_adapter *adapter, if ((format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_SRGB_WRITE) && !srgb_write_supported) format_clear_flag(&format->f, WINED3DFMT_FLAG_SRGB_WRITE); - if (!gl_info->supported[ARB_DEPTH_TEXTURE] - && texture_info->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (!gl_info->supported[ARB_DEPTH_TEXTURE] && (format->f.depth_size || format->f.stencil_size)) { format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] &= ~WINED3DFMT_FLAG_TEXTURE; format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] &= ~WINED3DFMT_FLAG_TEXTURE;

1 0

Henri Verbeet : wined3d: Use "depth_size" to check for a depth format in resolve_depth_buffer().
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 28145b97eba69a32a97af7aa2a957169f8e5f43c URL: https://source.winehq.org/git/wine.git/?a=commit;h=28145b97eba69a32a97af7aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:50:00 2020 +0430 wined3d: Use "depth_size" to check for a depth format in resolve_depth_buffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2ce3e346ef..59b53aa355 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1695,7 +1695,7 @@ static void resolve_depth_buffer(struct wined3d_device *device) if (!(dst_texture = state->textures[0])) return; dst_resource = &dst_texture->resource; - if (!(dst_resource->format_flags & WINED3DFMT_FLAG_DEPTH)) + if (!dst_resource->format->depth_size) return; if (!(src_view = state->fb.depth_stencil)) return;

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: 831701d3f4f14de1ae2e9713a8849f18103a9af0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=831701d3f4f14de1ae2e9713… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:49:59 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in the FBO cache. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 08a90e3663..b7ca8ceca2 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -566,9 +566,9 @@ static struct fbo_entry *wined3d_context_gl_create_fbo_entry(const struct wined3 entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); @@ -594,9 +594,9 @@ static void wined3d_context_gl_reuse_fbo_entry(struct wined3d_context_gl *contex entry->flags = 0; if (depth_stencil->resource) { - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_DEPTH) + if (depth_stencil->resource->format->depth_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_DEPTH; - if (depth_stencil->resource->format_flags & WINED3DFMT_FLAG_STENCIL) + if (depth_stencil->resource->format->stencil_size) entry->flags |= WINED3D_FBO_ENTRY_FLAG_STENCIL; } }

1 0

Henri Verbeet : wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in fbo_blitter_blit().
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: f570c9b6554c20d730e6f547d6f3951733f0773c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f570c9b6554c20d730e6f547… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 15:49:58 2020 +0430 wined3d: Use "depth_size"/"stencil_size" to check for depth/stencil formats in fbo_blitter_blit(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cd3d4b4912..65e9da73b4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5859,7 +5859,7 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_resource->format->id == src_resource->format->id) { - if (dst_resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) + if (dst_resource->format->depth_size || dst_resource->format->stencil_size) blit_op = WINED3D_BLIT_OP_DEPTH_BLIT; else blit_op = WINED3D_BLIT_OP_COLOR_BLIT;

1 0

Nikolay Sivov : mfmediaengine: Set up audio output branch.
by Alexandre Julliard 04 Jun '20

04 Jun '20

Module: wine Branch: master Commit: a82fa9207d6875a096c0cbf2694d45cc98a201d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a82fa9207d6875a096c0cbf2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 4 13:41:49 2020 +0300 mfmediaengine: Set up audio output branch. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 77 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index fee5f6338d..d93e2b2f38 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -329,11 +329,55 @@ static ULONG WINAPI media_engine_load_handler_Release(IMFAsyncCallback *iface) return IMFMediaEngine_Release(&engine->IMFMediaEngine_iface); } +static HRESULT media_engine_create_source_node(IMFMediaSource *source, IMFPresentationDescriptor *pd, IMFStreamDescriptor *sd, + IMFTopologyNode **node) +{ + HRESULT hr; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_SOURCESTREAM_NODE, node))) + return hr; + + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_SOURCE, (IUnknown *)source); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_PRESENTATION_DESCRIPTOR, (IUnknown *)pd); + IMFTopologyNode_SetUnknown(*node, &MF_TOPONODE_STREAM_DESCRIPTOR, (IUnknown *)sd); + + return S_OK; +} + +static HRESULT media_engine_create_audio_renderer(struct media_engine *engine, IMFTopologyNode **node) +{ + unsigned int category, role; + IMFActivate *sar_activate; + HRESULT hr; + + *node = NULL; + + if (FAILED(hr = MFCreateAudioRendererActivate(&sar_activate))) + return hr; + + /* Configuration attributes keys differ between Engine and SAR. */ + if (SUCCEEDED(IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_CATEGORY, &category))) + IMFActivate_SetUINT32(sar_activate, &MF_AUDIO_RENDERER_ATTRIBUTE_STREAM_CATEGORY, category); + if (SUCCEEDED(IMFAttributes_GetUINT32(engine->attributes, &MF_MEDIA_ENGINE_AUDIO_ENDPOINT_ROLE, &role))) + IMFActivate_SetUINT32(sar_activate, &MF_AUDIO_RENDERER_ATTRIBUTE_ENDPOINT_ROLE, role); + + if (SUCCEEDED(hr = MFCreateTopologyNode(MF_TOPOLOGY_OUTPUT_NODE, node))) + { + IMFTopologyNode_SetObject(*node, (IUnknown *)sar_activate); + IMFTopologyNode_SetUINT32(*node, &MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE); + } + + IMFActivate_Release(sar_activate); + + return hr; +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; unsigned int stream_count = 0, i; IMFPresentationDescriptor *pd; + IMFTopology *topology; UINT64 duration; HRESULT hr; @@ -410,7 +454,36 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); - /* TODO: set up topology nodes */ + /* TODO: set up video stream nodes */ + + if (SUCCEEDED(hr = MFCreateTopology(&topology))) + { + IMFTopologyNode *sar_node = NULL, *audio_src = NULL; + + if (sd_audio) + { + if (FAILED(hr = media_engine_create_source_node(source, pd, sd_audio, &audio_src))) + WARN("Failed to create audio source node, hr %#x.\n", hr); + + if (FAILED(hr = media_engine_create_audio_renderer(engine, &sar_node))) + WARN("Failed to create audio renderer node, hr %#x.\n", hr); + + if (sar_node && audio_src) + { + IMFTopology_AddNode(topology, audio_src); + IMFTopology_AddNode(topology, sar_node); + IMFTopologyNode_ConnectOutput(audio_src, 0, sar_node, 0); + } + + if (sar_node) + IMFTopologyNode_Release(sar_node); + if (audio_src) + IMFTopologyNode_Release(audio_src); + } + } + + if (topology) + IMFTopology_Release(topology); if (sd_video) IMFStreamDescriptor_Release(sd_video); @@ -419,7 +492,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFPresentationDescriptor_Release(pd); - return S_OK; + return hr; } static HRESULT WINAPI media_engine_load_handler_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result)

1 0

← Newer
1
...
68
69
70
71
72
73
74
...
95
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 June 2020