September 2018 - Wine-commits

Dmitry Timoshkov : ntdll/tests: Fix compilation with PSDK.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: wine Branch: master Commit: 4fd82271eb2dbf9acc34e923fdfd134b9d51e0e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fd82271eb2dbf9acc34e923… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 16:30:46 2018 +0800 ntdll/tests: Fix compilation with PSDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index d9d029b..87c3339 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1044,7 +1044,7 @@ static void test_iocp_fileio(HANDLE h) ok( !count, "Unexpected msg count: %ld\n", count ); /* using APCs on handle with associated completion port is not allowed */ - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -1070,7 +1070,7 @@ static void test_iocp_fileio(HANDLE h) count = get_pending_msgs(h); ok( !count, "Unexpected msg count: %ld\n", count ); - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_PENDING, "NtReadFile returned %x\n", res); U(iosb).Status = 0xdeadbeef; @@ -1092,7 +1092,7 @@ static void test_iocp_fileio(HANDLE h) ok( !count, "Unexpected msg count: %ld\n", count ); /* using APCs on handle with associated completion port is not allowed */ - res = NtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); + res = pNtReadFile( hPipeSrv, NULL, apc, &apc_count, &iosb, recv_buf, sizeof(recv_buf), NULL, NULL ); ok(res == STATUS_INVALID_PARAMETER, "NtReadFile returned %x\n", res); } @@ -4197,7 +4197,7 @@ static void test_ioctl(void) ok(status == STATUS_INVALID_HANDLE, "NtFsControlFile returned %x\n", status); memset(&iosb, 0x55, sizeof(iosb)); - status = NtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, + status = pNtFsControlFile(file, NULL, NULL, NULL, &iosb, FSCTL_PIPE_PEEK, NULL, 0, &peek_buf, sizeof(peek_buf)); todo_wine ok(status == STATUS_INVALID_DEVICE_REQUEST, "NtFsControlFile failed: %x\n", status);

1 0

Dmitry Timoshkov : ntdll/tests: Clarify some file disposition test results , remove useless tests.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: wine Branch: master Commit: feb73b2af9d959a87794b6d8194efbff549b4da8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=feb73b2af9d959a87794b6d8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 16:30:49 2018 +0800 ntdll/tests: Clarify some file disposition test results, remove useless tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 87c3339..b9b6591 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -2679,7 +2679,7 @@ static void test_file_disposition_information(void) ok( !fileDeleted, "File shouldn't have been deleted\n" ); DeleteFileA( buffer ); - /* Delete-on-close flag doesn't change file disposition until a handle is closed */ + /* can't reset disposition if delete-on-close flag is specified */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); @@ -2689,14 +2689,15 @@ static void test_file_disposition_information(void) CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( fileDeleted, "File should have been deleted\n" ); - DeleteFileA( buffer ); - /* Delete-on-close flag sets disposition when a handle is closed and then it could be changed back */ + /* can't reset disposition on duplicated handle if delete-on-close flag is specified */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); handle = CreateFileA(buffer, GENERIC_WRITE | DELETE, 0, NULL, CREATE_ALWAYS, FILE_FLAG_DELETE_ON_CLOSE, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to create temp file\n" ); ok( DuplicateHandle( GetCurrentProcess(), handle, GetCurrentProcess(), &handle2, 0, FALSE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" ); CloseHandle( handle ); + fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; + ok( !fileDeleted, "File shouldn't have been deleted\n" ); fdi.DoDeleteFile = FALSE; res = pNtSetInformationFile( handle2, &io, &fdi, sizeof fdi, FileDispositionInformation ); ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); @@ -2719,16 +2720,15 @@ static void test_file_disposition_information(void) ok( fileDeleted, "Directory should have been deleted\n" ); RemoveDirectoryA( buffer ); - /* RemoveDirectory sets directory disposition and it can be undone */ + /* RemoveDirectory fails for wrong sharing mode */ GetTempFileNameA( tmp_path, "dis", 0, buffer ); DeleteFileA( buffer ); ok( CreateDirectoryA( buffer, NULL ), "CreateDirectory failed\n" ); handle = CreateFileA(buffer, DELETE, 0, NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0); ok( handle != INVALID_HANDLE_VALUE, "failed to open a directory\n" ); - RemoveDirectoryA( buffer ); - fdi.DoDeleteFile = FALSE; - res = pNtSetInformationFile( handle, &io, &fdi, sizeof fdi, FileDispositionInformation ); - ok( res == STATUS_SUCCESS, "unexpected FileDispositionInformation result (expected STATUS_SUCCESS, got %x)\n", res ); + fileDeleted = RemoveDirectoryA( buffer ); + ok( !fileDeleted, "Directory shouldn't have been deleted\n" ); + ok(GetLastError() == ERROR_SHARING_VIOLATION, "got %u\n", GetLastError()); CloseHandle( handle ); fileDeleted = GetFileAttributesA( buffer ) == INVALID_FILE_ATTRIBUTES && GetLastError() == ERROR_FILE_NOT_FOUND; ok( !fileDeleted, "Directory shouldn't have been deleted\n" );

1 0

Dmitry Timoshkov : ntdll/tests: Add more file disposition tests.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: wine Branch: master Commit: a4d5a919de30db1252735f2ec0dbad0fd1af6ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4d5a919de30db1252735f2e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Sep 27 16:30:52 2018 +0800 ntdll/tests: Add more file disposition tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 198 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 195 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4d5a919de30db125273…

1 0

Francois Gouget : wined3d: Modernize the macOS spelling.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: wine Branch: master Commit: a659194ebdca74fcae477cbbb96259fd127546b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a659194ebdca74fcae477cbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Sep 27 09:25:04 2018 +0200 wined3d: Modernize the macOS spelling. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 87418e1..80ba614 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -433,11 +433,11 @@ static BOOL match_apple(const struct wined3d_gl_info *gl_info, struct wined3d_ca * * Detecting this isn't really easy. The vendor string doesn't mention * Apple. Compile-time checks aren't sufficient either because a Linux - * binary may display on a MacOS X server via remote X11. So try to detect + * binary may display on a macOS X server via remote X11. So try to detect * the OpenGL implementation by looking at certain Apple extensions. Some * extensions like client storage might be supported on other * implementations too, but GL_APPLE_flush_render is specific to the - * MacOS X window management, and GL_APPLE_ycbcr_422 is QuickTime + * macOS X window management, and GL_APPLE_ycbcr_422 is QuickTime * specific. So the chance that other implementations support them is * rather small since Win32 QuickTime uses DirectDraw, not OpenGL. * @@ -893,11 +893,11 @@ static void quirk_no_np2(struct wined3d_gl_info *gl_info) static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) { - /* The Intel GPUs on MacOS set the .w register of texcoords to 0.0 by + /* The Intel GPUs on macOS set the .w register of texcoords to 0.0 by * default, which causes problems with fixed-function fragment processing. * Ideally this flag should be detected with a test shader and OpenGL - * feedback mode, but some OpenGL implementations (MacOS ATI at least, - * probably all MacOS ones) do not like vertex shaders in feedback mode + * feedback mode, but some OpenGL implementations (macOS ATI at least, + * probably all macOS ones) do not like vertex shaders in feedback mode * and return an error, even though it should be valid according to the * spec. * @@ -906,8 +906,8 @@ static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) * instruction slots which should be available to the Direct3D * application. * - * ATI Radeon HD 2xxx cards on MacOS have the issue. Instead of checking - * for the buggy cards, blacklist all Radeon cards on MacOS and whitelist + * ATI Radeon HD 2xxx cards on macOS have the issue. Instead of checking + * for the buggy cards, blacklist all Radeon cards on macOS and whitelist * the good ones. That way we're prepared for the future. If this * workaround is activated on cards that do not need it, it won't break * things, just affect performance negatively. */

1 0

Alexandre Julliard : kernel32: Create a fresh PE info structure when running winevdm.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: wine Branch: master Commit: dc0ec5502d81446d7e1d70a79c062725772b295f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc0ec5502d81446d7e1d70a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 28 19:22:44 2018 +0200 kernel32: Create a fresh PE info structure when running winevdm. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 98ea09b..f7808af 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2425,14 +2425,14 @@ error: static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, LPCWSTR cur_dir, LPSECURITY_ATTRIBUTES psa, LPSECURITY_ATTRIBUTES tsa, BOOL inherit, DWORD flags, LPSTARTUPINFOW startup, - LPPROCESS_INFORMATION info, LPCSTR unixdir, - const pe_image_info_t *pe_info, int exec_only ) + LPPROCESS_INFORMATION info, LPCSTR unixdir, int exec_only ) { static const WCHAR argsW[] = {'%','s',' ','-','-','a','p','p','-','n','a','m','e',' ','"','%','s','"',' ','%','s',0}; BOOL ret; WCHAR buffer[MAX_PATH]; LPWSTR new_cmd_line; + pe_image_info_t pe_info; if (!(ret = GetFullPathNameW(filename, MAX_PATH, buffer, NULL))) return FALSE; @@ -2446,8 +2446,10 @@ static BOOL create_vdm_process( LPCWSTR filename, LPWSTR cmd_line, LPWSTR env, L return FALSE; } sprintfW(new_cmd_line, argsW, winevdmW, buffer, cmd_line); + memset( &pe_info, 0, sizeof(pe_info) ); + pe_info.machine = IMAGE_FILE_MACHINE_I386; ret = create_process( 0, winevdmW, new_cmd_line, env, cur_dir, psa, tsa, inherit, - flags, startup, info, unixdir, pe_info, exec_only ); + flags, startup, info, unixdir, &pe_info, exec_only ); HeapFree( GetProcessHeap(), 0, new_cmd_line ); return ret; } @@ -2678,7 +2680,7 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A case BINARY_WIN16: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, &pe_info, FALSE ); + inherit, flags, startup_info, info, unixdir, FALSE ); break; case BINARY_UNIX_LIB: TRACE( "starting %s as %d-bit Winelib app\n", @@ -2693,9 +2695,8 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A if (!strcmpiW( p, comW ) || !strcmpiW( p, pifW )) { TRACE( "starting %s as DOS binary\n", debugstr_w(name) ); - pe_info.machine = IMAGE_FILE_MACHINE_I386; retv = create_vdm_process( name, tidy_cmdline, envW, cur_dir, process_attr, thread_attr, - inherit, flags, startup_info, info, unixdir, &pe_info, FALSE ); + inherit, flags, startup_info, info, unixdir, FALSE ); break; } if (!strcmpiW( p, batW ) || !strcmpiW( p, cmdW ) ) @@ -2829,12 +2830,11 @@ static void exec_process( LPCWSTR name ) /* check for .com or .pif extension */ if (!(p = strrchrW( name, '.' ))) break; if (strcmpiW( p, comW ) && strcmpiW( p, pifW )) break; - pe_info.machine = IMAGE_FILE_MACHINE_I386; /* fall through */ case BINARY_WIN16: TRACE( "starting %s as Win16/DOS binary\n", debugstr_w(name) ); create_vdm_process( name, GetCommandLineW(), NULL, NULL, NULL, NULL, - FALSE, 0, &startup_info, &info, NULL, &pe_info, TRUE ); + FALSE, 0, &startup_info, &info, NULL, TRUE ); break; default: break;

1 0

Andrew Wesie : wined3d: Use query buffer objects for occlusion queries.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: wine Branch: master Commit: 580ea44bc65472c0304d74b7e873acfb7f680b85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=580ea44bc65472c0304d74b7… Author: Andrew Wesie <awesie(a)gmail.com> Date: Fri Sep 28 22:06:29 2018 +0330 wined3d: Use query buffer objects for occlusion queries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45723 Signed-off-by: Andrew Wesie <awesie(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 6 +++ dlls/wined3d/cs.c | 5 +- dlls/wined3d/query.c | 106 +++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_gl.h | 2 + dlls/wined3d/wined3d_private.h | 3 ++ 5 files changed, 116 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 80ba614..b794415 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -58,6 +58,7 @@ static const struct wined3d_extension_map gl_extension_map[] = /* ARB */ {"GL_ARB_base_instance", ARB_BASE_INSTANCE }, {"GL_ARB_blend_func_extended", ARB_BLEND_FUNC_EXTENDED }, + {"GL_ARB_buffer_storage", ARB_BUFFER_STORAGE }, {"GL_ARB_clear_buffer_object", ARB_CLEAR_BUFFER_OBJECT }, {"GL_ARB_clear_texture", ARB_CLEAR_TEXTURE }, {"GL_ARB_clip_control", ARB_CLIP_CONTROL }, @@ -103,6 +104,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_point_parameters", ARB_POINT_PARAMETERS }, {"GL_ARB_point_sprite", ARB_POINT_SPRITE }, {"GL_ARB_provoking_vertex", ARB_PROVOKING_VERTEX }, + {"GL_ARB_query_buffer_object", ARB_QUERY_BUFFER_OBJECT }, {"GL_ARB_sample_shading", ARB_SAMPLE_SHADING }, {"GL_ARB_sampler_objects", ARB_SAMPLER_OBJECTS }, {"GL_ARB_seamless_cube_map", ARB_SEAMLESS_CUBE_MAP }, @@ -2061,6 +2063,8 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) /* GL_ARB_blend_func_extended */ USE_GL_FUNC(glBindFragDataLocationIndexed) USE_GL_FUNC(glGetFragDataIndex) + /* GL_ARB_buffer_storage */ + USE_GL_FUNC(glBufferStorage) /* GL_ARB_clear_buffer_object */ USE_GL_FUNC(glClearBufferData) USE_GL_FUNC(glClearBufferSubData) @@ -3301,7 +3305,9 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_TEXTURE_STORAGE_MULTISAMPLE, MAKEDWORD_VERSION(4, 2)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + {ARB_BUFFER_STORAGE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, + {ARB_QUERY_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ff4d562..2aae559 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1986,7 +1986,10 @@ static void wined3d_cs_exec_query_issue(struct wined3d_cs *cs, const void *data) if (poll && list_empty(&query->poll_list_entry)) { - list_add_tail(&cs->query_poll_list, &query->poll_list_entry); + if (query->buffer_object) + InterlockedIncrement(&query->counter_retrieved); + else + list_add_tail(&cs->query_poll_list, &query->poll_list_entry); return; } diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 01e6bcb..26c32b1 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -25,6 +25,88 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +static void wined3d_query_buffer_invalidate(struct wined3d_query *query) +{ + /* map[0] != map[1]: exact values do not have any significance. */ + query->map_ptr[0] = 0; + query->map_ptr[1] = ~(UINT64)0; +} + +static BOOL wined3d_query_buffer_is_valid(struct wined3d_query *query) +{ + return query->map_ptr[0] == query->map_ptr[1]; +} + +static void wined3d_query_create_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + const GLuint map_flags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_MAP_PERSISTENT_BIT | GL_MAP_COHERENT_BIT; + GLuint buffer_object; + + GL_EXTCALL(glGenBuffers(1, &buffer_object)); + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, buffer_object)); + GL_EXTCALL(glBufferStorage(GL_QUERY_BUFFER, sizeof(query->map_ptr[0]) * 2, NULL, map_flags)); + query->map_ptr = GL_EXTCALL(glMapBufferRange(GL_QUERY_BUFFER, 0, sizeof(query->map_ptr[0]) * 2, map_flags)); + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); + checkGLcall("query buffer object creation"); + + wined3d_query_buffer_invalidate(query); + query->buffer_object = buffer_object; +} + +static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + GL_EXTCALL(glDeleteBuffers(1, &query->buffer_object)); + checkGLcall("query buffer object destruction"); + + query->buffer_object = 0; + query->map_ptr = NULL; +} + +/* From ARB_occlusion_query: "Querying the state for a given occlusion query + * forces that occlusion query to complete within a finite amount of time." + * In practice, that means drivers flush when retrieving + * GL_QUERY_RESULT_AVAILABLE, which can be undesirable when applications use a + * significant number of queries. Using a persistently mapped query buffer + * object allows us to avoid these implicit flushes. An additional benefit is + * that it allows us to poll the query status from the application-thread + * instead of from the csmt-thread. */ +static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + + if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) + return FALSE; + /* Don't use query buffers without CSMT, mainly for simplicity. */ + if (!context->device->cs->thread) + return FALSE; + + if (query->buffer_object) + { + /* If there's still a query result in-flight for the existing buffer + * object (i.e., the query was restarted before we received its + * result), we can't reuse the existing buffer object. */ + if (wined3d_query_buffer_is_valid(query)) + wined3d_query_buffer_invalidate(query); + else + wined3d_query_destroy_buffer_object(context, query); + } + + if (!query->buffer_object) + wined3d_query_create_buffer_object(context, query); + + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, query->buffer_object)); + /* Read the same value twice. We know we have the result if map_ptr[0] == map_ptr[1]. */ + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)0)); + GL_EXTCALL(glGetQueryObjectui64v(id, GL_QUERY_RESULT, (void *)sizeof(query->map_ptr[0]))); + GL_EXTCALL(glBindBuffer(GL_QUERY_BUFFER, 0)); + checkGLcall("queue query result"); + + return TRUE; +} + static UINT64 get_query_result64(GLuint id, const struct wined3d_gl_info *gl_info) { if (gl_info->supported[ARB_TIMER_QUERY]) @@ -339,6 +421,14 @@ static void wined3d_query_destroy_object(void *object) if (!list_empty(&query->poll_list_entry)) list_remove(&query->poll_list_entry); + if (query->buffer_object) + { + struct wined3d_context *context; + context = context_acquire(query->device, NULL, 0); + wined3d_query_destroy_buffer_object(context, query); + context_release(context); + } + /* Queries are specific to the GL context that created them. Not * deleting the query will obviously leak it, but that's still better * than potentially deleting a different query with the same id in this @@ -382,15 +472,20 @@ HRESULT CDECL wined3d_query_get_data(struct wined3d_query *query, return WINED3DERR_INVALIDCALL; } - if (!query->device->cs->thread) + if (query->device->cs->thread) { - if (!query->query_ops->query_poll(query, flags)) + if (query->counter_main != query->counter_retrieved + || (query->buffer_object && !wined3d_query_buffer_is_valid(query))) + { + if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) + wined3d_cs_emit_flush(query->device->cs); return S_FALSE; + } + if (query->buffer_object) + query->data = query->map_ptr; } - else if (query->counter_main != query->counter_retrieved) + else if (!query->query_ops->query_poll(query, flags)) { - if (flags & WINED3DGETDATA_FLUSH && !query->device->cs->queries_flushed) - wined3d_cs_emit_flush(query->device->cs); return S_FALSE; } @@ -579,6 +674,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD gl_info = context->gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); + wined3d_query_buffer_queue_result(context, query, oq->id); context_release(context); poll = TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 06aa21c..2a985da 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -44,6 +44,7 @@ enum wined3d_gl_extension /* ARB */ ARB_BASE_INSTANCE, ARB_BLEND_FUNC_EXTENDED, + ARB_BUFFER_STORAGE, ARB_CLEAR_BUFFER_OBJECT, ARB_CLEAR_TEXTURE, ARB_CLIP_CONTROL, @@ -89,6 +90,7 @@ enum wined3d_gl_extension ARB_POINT_PARAMETERS, ARB_POINT_SPRITE, ARB_PROVOKING_VERTEX, + ARB_QUERY_BUFFER_OBJECT, ARB_SAMPLE_SHADING, ARB_SAMPLER_OBJECTS, ARB_SEAMLESS_CUBE_MAP, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 941bfa6..8cfa4c3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1730,6 +1730,9 @@ struct wined3d_query LONG counter_main, counter_retrieved; struct list poll_list_entry; + + GLuint buffer_object; + UINT64 *map_ptr; }; struct wined3d_event_query

1 0

Józef Kucia : vkd3d-shader: Use TRACE() for skipped DXBC chunks.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: d11b9618e03df0c50f6b44af83ad214af9c4f795 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d11b9618e03df0c50f6b44a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:36 2018 +0200 vkd3d-shader: Use TRACE() for skipped DXBC chunks. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 3be3ca9..5daf07a 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2040,7 +2040,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont break; default: - FIXME("Unhandled chunk %#x.\n", tag); + TRACE("Skipping chunk %#x.\n", tag); break; }

1 0

Józef Kucia : vkd3d: Fix 2D array depth stencil views.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: fe3ad219495539895a31dcfc27c1cccb6e5e672d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fe3ad219495539895a31dcf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:37 2018 +0200 vkd3d: Fix 2D array depth stencil views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 5 +++-- libs/vkd3d/resource.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5fd0936..b4d8ecd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3681,7 +3681,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi list->views[0] = view->u.vk_image_view; list->fb_width = max(list->fb_width, dsv_desc->width); list->fb_height = max(list->fb_height, dsv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, 1); + list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); } d3d12_command_list_invalidate_current_framebuffer(list); @@ -3841,7 +3841,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearDepthStencilView(ID3D12Gra ds_reference.layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; d3d12_command_list_clear(list, &attachment_desc, NULL, &ds_reference, - dsv_desc->view, dsv_desc->width, dsv_desc->height, 1, &clear_value, rect_count, rects); + dsv_desc->view, dsv_desc->width, dsv_desc->height, dsv_desc->layer_count, + &clear_value, rect_count, rects); } static void STDMETHODCALLTYPE d3d12_command_list_ClearRenderTargetView(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 98c703a..d633094 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2131,6 +2131,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev dsv_desc->format = vkd3d_desc.format->vk_format; dsv_desc->width = d3d12_resource_desc_get_width(&resource->desc, vkd3d_desc.miplevel_idx); dsv_desc->height = d3d12_resource_desc_get_height(&resource->desc, vkd3d_desc.miplevel_idx); + dsv_desc->layer_count = vkd3d_desc.layer_count; dsv_desc->view = view; dsv_desc->resource = resource; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index bffae35..d744af5 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -358,6 +358,7 @@ struct d3d12_dsv_desc VkFormat format; uint64_t width; unsigned int height; + unsigned int layer_count; struct vkd3d_view *view; struct d3d12_resource *resource; };

1 0

Józef Kucia : tests: Add test for clearing 2D array DSVs.
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: 3b9657cd6a9ba014c6e72247bdbacc945658ca9e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3b9657cd6a9ba014c6e7224… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:38 2018 +0200 tests: Add test for clearing 2D array DSVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 8301067..0528ceb 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1058,9 +1058,9 @@ struct depth_stencil_resource D3D12_CPU_DESCRIPTOR_HANDLE dsv_handle; }; -#define init_depth_stencil(a, b, c, d, e, f, g) init_depth_stencil_(__LINE__, a, b, c, d, e, f, g) +#define init_depth_stencil(a, b, c, d, e, f, g, h) init_depth_stencil_(__LINE__, a, b, c, d, e, f, g, h) static void init_depth_stencil_(unsigned int line, struct depth_stencil_resource *ds, - ID3D12Device *device, unsigned int width, unsigned int height, + ID3D12Device *device, unsigned int width, unsigned int height, unsigned int array_size, DXGI_FORMAT format, DXGI_FORMAT view_format, const D3D12_CLEAR_VALUE *clear_value) { D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc, *view_desc; @@ -1078,7 +1078,7 @@ static void init_depth_stencil_(unsigned int line, struct depth_stencil_resource resource_desc.Alignment = 0; resource_desc.Width = width; resource_desc.Height = height; - resource_desc.DepthOrArraySize = 1; + resource_desc.DepthOrArraySize = array_size; resource_desc.MipLevels = 1; resource_desc.Format = format; resource_desc.SampleDesc.Count = 1; @@ -3289,7 +3289,9 @@ static void test_multithread_fence_wait(void) static void test_clear_depth_stencil_view(void) { + static const float expected_values[] = {0.5f, 0.1f, 0.1f, 0.6, 1.0f, 0.5f}; ID3D12GraphicsCommandList *command_list; + D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc; struct depth_stencil_resource ds; unsigned int dsv_increment_size; D3D12_CLEAR_VALUE clear_value; @@ -3297,6 +3299,7 @@ static void test_clear_depth_stencil_view(void) struct test_context context; ID3D12CommandQueue *queue; ID3D12Device *device; + unsigned int i; memset(&desc, 0, sizeof(desc)); desc.no_render_target = true; @@ -3314,13 +3317,45 @@ static void test_clear_depth_stencil_view(void) clear_value.Format = DXGI_FORMAT_D32_FLOAT; clear_value.DepthStencil.Depth = 0.5f; clear_value.DepthStencil.Stencil = 0x3; - init_depth_stencil(&ds, device, 32, 32, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); + init_depth_stencil(&ds, device, 32, 32, 1, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH | D3D12_CLEAR_FLAG_STENCIL, 0.75f, 0x7, 0, NULL); transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_sub_resource_uint(ds.texture, 0, queue, command_list, 0x3f400000, 0); + check_sub_resource_float(ds.texture, 0, queue, command_list, 0.75f, 1); + + destroy_depth_stencil(&ds); + reset_command_list(command_list, context.allocator); + init_depth_stencil(&ds, device, 32, 32, 6, DXGI_FORMAT_D32_FLOAT, 0, &clear_value); + + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[0], 0, 0, NULL); + memset(&dsv_desc, 0, sizeof(dsv_desc)); + dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; + dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY; + dsv_desc.Texture2DArray.FirstArraySlice = 1; + dsv_desc.Texture2DArray.ArraySize = 2; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[1], 0, 0, NULL); + dsv_desc.Texture2DArray.FirstArraySlice = 3; + dsv_desc.Texture2DArray.ArraySize = 1; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[3], 0, 0, NULL); + dsv_desc.Texture2DArray.FirstArraySlice = 4; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + check_sub_resource_float(ds.texture, i, queue, command_list, expected_values[i], 1); + reset_command_list(command_list, context.allocator); + } destroy_depth_stencil(&ds); destroy_test_context(&context); @@ -4546,7 +4581,7 @@ static void test_draw_depth_only(void) command_list = context.list; queue = context.queue; - init_depth_stencil(&ds, context.device, 640, 480, DXGI_FORMAT_D32_FLOAT, 0, NULL); + init_depth_stencil(&ds, context.device, 640, 480, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); set_rect(&context.scissor_rect, 0, 0, 640, 480); @@ -12156,7 +12191,7 @@ static void test_copy_descriptors(void) transition_resource_state(command_list, t[5], D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE); - init_depth_stencil(&ds, device, 32, 32, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); + init_depth_stencil(&ds, device, 32, 32, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); t[6] = ds.texture; ID3D12Resource_AddRef(t[6]); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, @@ -13509,7 +13544,7 @@ static void test_depth_stencil_sampling(void) reset_command_list(command_list, context.allocator); init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, tests[i].typeless_format, + context.render_target_desc.Height, 1, tests[i].typeless_format, tests[i].dsv_format, NULL); texture = ds.texture; dsv_handle = ds.dsv_handle; @@ -13722,7 +13757,7 @@ static void test_depth_load(void) heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, DXGI_FORMAT_R32_TYPELESS, + context.render_target_desc.Height, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); memset(&srv_desc, 0, sizeof(srv_desc)); srv_desc.Format = DXGI_FORMAT_R32_FLOAT; @@ -13854,7 +13889,7 @@ static void test_depth_read_only_view(void) clear_value.DepthStencil.Depth = 0.5f; clear_value.DepthStencil.Stencil = 0; init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, DXGI_FORMAT_R32_TYPELESS, + context.render_target_desc.Height, 1, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, &clear_value); memset(&dsv_desc, 0, sizeof(dsv_desc)); dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; @@ -16705,7 +16740,7 @@ static void test_query_occlusion(void) command_list = context.list; queue = context.queue; - init_depth_stencil(&ds, context.device, 640, 480, DXGI_FORMAT_D32_FLOAT, 0, NULL); + init_depth_stencil(&ds, context.device, 640, 480, 1, DXGI_FORMAT_D32_FLOAT, 0, NULL); set_viewport(&context.viewport, 0.0f, 0.0f, 640.0f, 480.0f, 0.0f, 1.0f); set_rect(&context.scissor_rect, 0, 0, 640, 480); @@ -17632,7 +17667,7 @@ static void test_copy_texture_region(void) for (i = 0; i < ARRAY_SIZE(depth_values); ++i) { init_depth_stencil(&ds, device, context.render_target_desc.Width, - context.render_target_desc.Height, DXGI_FORMAT_D32_FLOAT, + context.render_target_desc.Height, 1, DXGI_FORMAT_D32_FLOAT, DXGI_FORMAT_D32_FLOAT, NULL); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL);

1 0

Józef Kucia : vkd3d: Implement d3d12_command_list_OMSetBlendFactor().
by Alexandre Julliard 28 Sep '18

28 Sep '18

Module: vkd3d Branch: master Commit: 03b9f4ff5abd089f2f10eeb825dc063dd4a57a63 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=03b9f4ff5abd089f2f10eeb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Sep 28 12:16:39 2018 +0200 vkd3d: Implement d3d12_command_list_OMSetBlendFactor(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b4d8ecd..5a2baef 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1849,6 +1849,7 @@ static VkPipeline d3d12_command_list_get_or_create_pipeline(struct d3d12_command { VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, + VK_DYNAMIC_STATE_BLEND_CONSTANTS, VK_DYNAMIC_STATE_STENCIL_REFERENCE, }; static const struct VkPipelineDynamicStateCreateInfo dynamic_desc = @@ -2972,7 +2973,13 @@ static void STDMETHODCALLTYPE d3d12_command_list_RSSetScissorRects(ID3D12Graphic static void STDMETHODCALLTYPE d3d12_command_list_OMSetBlendFactor(ID3D12GraphicsCommandList *iface, const FLOAT blend_factor[4]) { - FIXME("iface %p, blend_factor %p stub!\n", iface, blend_factor); + struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); + const struct vkd3d_vk_device_procs *vk_procs; + + TRACE("iface %p, blend_factor %p.\n", iface, blend_factor); + + vk_procs = &list->device->vk_procs; + VK_CALL(vkCmdSetBlendConstants(list->vk_command_buffer, blend_factor)); } static void STDMETHODCALLTYPE d3d12_command_list_OMSetStencilRef(ID3D12GraphicsCommandList *iface,

1 0