wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Daniel Lehman : kernel32/tests: Don't call DeleteFile from assert().
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: d14456ceff621c95fe3201d51963f5c1d5e6d359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d14456ceff621c95fe3201d51… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:07:05 2017 -0800 kernel32/tests: Don't call DeleteFile from assert(). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 12 ++++++------ dlls/kernel32/tests/process.c | 44 +++++++++++++++++++++--------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 759234c..a85fe59 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -321,8 +321,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) TerminateProcess(info.hProcess, WAIT_TIMEOUT); WaitForSingleObject(info.hProcess, 5000); CloseHandle(info.hProcess); - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); win_skip("Giving up on child process\n"); return; } @@ -357,8 +357,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) skip_crash_and_debug = broken(wait_code == WAIT_TIMEOUT); if (skip_crash_and_debug) { - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); win_skip("Giving up on debugger\n"); return; } @@ -375,8 +375,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) ok(dbg_blackbox.nokill_rc, "DebugSetProcessKillOnExit(FALSE) failed err=%d\n", dbg_blackbox.nokill_err); ok(dbg_blackbox.detach_rc, "DebugActiveProcessStop(%d) failed err=%d\n", dbg_blackbox.pid, dbg_blackbox.detach_err); - assert(DeleteFileA(dbglog) != 0); - assert(DeleteFileA(childlog) != 0); + DeleteFileA(dbglog); + DeleteFileA(childlog); } static void crash_and_winedbg(HKEY hkey, const char* argv0) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f66ab45..68d6b64 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -632,7 +632,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -670,7 +670,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -708,7 +708,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -746,7 +746,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -786,7 +786,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -824,7 +824,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* not so simplistic now */ memset(&startup, 0, sizeof(startup)); @@ -862,7 +862,7 @@ static void test_Startup(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* TODO: test for A/W and W/A and W/W */ } @@ -894,7 +894,7 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA5", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -917,7 +917,7 @@ static void test_CommandLine(void) okChildString("Arguments", "argvA7", NULL); okChildString("Arguments", "CommandLineA", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* Test for Bug1330 to show that XP doesn't change '/' to '\\' in argv[0]*/ get_file_name(resfile); @@ -933,7 +933,7 @@ static void test_CommandLine(void) sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); get_file_name(resfile); /* Use exename to avoid buffer containing things like 'C:' */ @@ -948,8 +948,8 @@ static void test_CommandLine(void) sprintf(buffer, ".\\%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); - + DeleteFileA(resfile); + get_file_name(resfile); GetFullPathNameA(selfname, MAX_PATH, fullpath, &lpFilePart); assert ( lpFilePart != 0); @@ -969,7 +969,7 @@ static void test_CommandLine(void) else sprintf(buffer, "./%s", exename); okChildString("Arguments", "argvA0", buffer); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* Using AppName */ get_file_name(resfile); @@ -993,7 +993,7 @@ static void test_CommandLine(void) okChildString("Arguments", "CommandLineA", buffer2); okChildStringWA("Arguments", "CommandLineW", buffer2); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); if (0) /* Test crashes on NT-based Windows. */ { @@ -1088,7 +1088,7 @@ static void test_Directory(void) okChildIString("Misc", "CurrDirA", windir); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); /* search PATH for the exe if directory is NULL */ ok(CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess\n"); @@ -1301,7 +1301,7 @@ static void test_Environment(void) env = GetEnvironmentStringsA(); cmpEnvironment(env); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); @@ -1360,7 +1360,7 @@ static void test_Environment(void) HeapFree(GetProcessHeap(), 0, child_env); FreeEnvironmentStringsA(env); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_SuspendFlag(void) @@ -1408,7 +1408,7 @@ static void test_SuspendFlag(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_DebuggingFlag(void) @@ -1470,7 +1470,7 @@ static void test_DebuggingFlag(void) okChildInt("StartupInfoA", "dwFlags", startup.dwFlags); okChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static BOOL is_console(HANDLE h) @@ -1617,7 +1617,7 @@ static void test_Console(void) ok(sbiC.dwCursorPosition.Y == (sbi.dwCursorPosition.Y ^ 1), "Wrong cursor position\n"); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); ok(CreatePipe(&hParentIn, &hChildOut, NULL, 0), "Creating parent-input pipe\n"); ok(DuplicateHandle(GetCurrentProcess(), hChildOut, GetCurrentProcess(), @@ -1660,7 +1660,7 @@ static void test_Console(void) okChildString("StdHandle", "msg", msg); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_ExitCode(void) @@ -1689,7 +1689,7 @@ static void test_ExitCode(void) okChildInt("ExitCode", "value", code); release_memory(); - assert(DeleteFileA(resfile) != 0); + DeleteFileA(resfile); } static void test_OpenProcess(void)

1 0

Daniel Lehman : kernel32/tests: Don't call function in assert().
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 4310ebcd6ace34fca2c4f09f2972c083761882b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4310ebcd6ace34fca2c4f09f2… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Feb 6 21:07:04 2017 -0800 kernel32/tests: Don't call function in assert(). Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 82faf3f..759234c 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -365,8 +365,8 @@ static void crash_and_debug(HKEY hkey, const char* argv0, const char* dbgtasks) #endif ok(wait_code == WAIT_OBJECT_0, "Timed out waiting for the debugger\n"); - assert(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox))); - assert(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox))); + ok(load_blackbox(childlog, &crash_blackbox, sizeof(crash_blackbox)), "failed to open: %s\n", childlog); + ok(load_blackbox(dbglog, &dbg_blackbox, sizeof(dbg_blackbox)), "failed to open: %s\n", dbglog); ok(dbg_blackbox.argc == 6, "wrong debugger argument count: %d\n", dbg_blackbox.argc); ok(dbg_blackbox.pid == crash_blackbox.pid, "the child and debugged pids don't match: %d != %d\n", crash_blackbox.pid, dbg_blackbox.pid);

1 0

Huw Davies : user32/tests: Restore the mouse cursor to its original position.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 01112061c257cd77f6150dd1cde3468186e4e28c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01112061c257cd77f6150dd1c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 10:26:23 2017 +0000 user32/tests: Restore the mouse cursor to its original position. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index a42bc1c..03454fe 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -2463,6 +2463,7 @@ static void test_menu_input(void) { HANDLE hThread, hWnd; DWORD tid; ATOM aclass; + POINT orig_pos; if (!pSendInput) { @@ -2507,6 +2508,8 @@ static void test_menu_input(void) { ShowWindow(hWnd, SW_SHOW); UpdateWindow(hWnd); + GetCursorPos(&orig_pos); + hThread = CreateThread(NULL, 0, test_menu_input_thread, hWnd, 0, &tid); while(1) { @@ -2514,6 +2517,7 @@ static void test_menu_input(void) { break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hWnd); }

1 0

Józef Kucia : wined3d: Allow passing compute states to device_invalidate_state().
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 8ac7c1faf20208e2e71fac9e8e17c824fd1e8285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac7c1faf20208e2e71fac9e8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:16 2017 +0100 wined3d: Allow passing compute states to device_invalidate_state(). 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> --- dlls/wined3d/cs.c | 13 ++----------- dlls/wined3d/device.c | 16 +++++++--------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 10 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index d575159..422f3f1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -907,10 +907,7 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi if (prev) InterlockedDecrement(&prev->resource.bind_count); - if (op->type != WINED3D_SHADER_TYPE_COMPUTE) - device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); - else - device_invalidate_compute_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); } void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, @@ -1097,15 +1094,9 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_set_shader *op = data; cs->state.shader[op->type] = op->shader; + device_invalidate_state(cs->device, STATE_SHADER(op->type)); if (op->type != WINED3D_SHADER_TYPE_COMPUTE) - { - device_invalidate_state(cs->device, STATE_SHADER(op->type)); device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); - } - else - { - device_invalidate_compute_state(cs->device, STATE_SHADER(op->type)); - } } void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 71bb929..03d4069 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5092,7 +5092,6 @@ err: return hr; } - void device_invalidate_state(const struct wined3d_device *device, DWORD state) { DWORD rep = device->StateTable[state].representative; @@ -5101,6 +5100,13 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) BYTE shift; UINT i; + if (STATE_IS_COMPUTE(state)) + { + for (i = 0; i < device->context_count; ++i) + context_invalidate_compute_state(device->contexts[i], state); + return; + } + for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; @@ -5113,14 +5119,6 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } -void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) -{ - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - context_invalidate_compute_state(device->contexts[i], state_id); -} - LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ca992b9..3a0de2a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1443,6 +1443,7 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_COMPUTE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) #define STATE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) +#define STATE_IS_COMPUTE(a) ((a) >= STATE_COMPUTE_OFFSET && (a) <= STATE_COMPUTE_HIGHEST) #define STATE_COMPUTE_COUNT (STATE_COMPUTE_HIGHEST - STATE_COMPUTE_OFFSET + 1) #define STATE_SHADER(a) ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_SHADER(a) : STATE_COMPUTE_SHADER) @@ -2651,7 +2652,6 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0

Józef Kucia : wined3d: Group compute states together.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 5a093509d030d89f7a2980bb00bd02203550dc72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a093509d030d89f7a2980bb0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:15 2017 +0100 wined3d: Group compute states together. 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> --- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/state.c | 14 ++++++++++++-- dlls/wined3d/utils.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 42 +++++++++++++++++++++++++++++++----------- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5ae1bdc..e8cc3fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1407,7 +1407,7 @@ static void context_enter(struct wined3d_context *context) void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) { - DWORD representative = context->state_table[state_id].representative; + DWORD representative = context->state_table[state_id].representative - STATE_COMPUTE_OFFSET; unsigned int index, shift; index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); @@ -3585,7 +3585,7 @@ void context_apply_compute_state(struct wined3d_context *context, context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - for (i = 0, state_id = 0; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) { for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e469414..540a1b3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3731,6 +3731,11 @@ void apply_pixelshader(struct wined3d_context *context, const struct wined3d_sta context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } +static void state_compute_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_COMPUTE; +} + static void state_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { enum wined3d_shader_type shader_type = state_id - STATE_SHADER(0); @@ -4942,13 +4947,18 @@ void state_srgbwrite(struct wined3d_context *context, const struct wined3d_state static void state_cb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - enum wined3d_shader_type shader_type = state_id - STATE_CONSTANT_BUFFER(0); const struct wined3d_gl_info *gl_info = context->gl_info; + enum wined3d_shader_type shader_type; struct wined3d_buffer *buffer; unsigned int i, base, count; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + if (STATE_IS_GRAPHICS_CONSTANT_BUFFER(state_id)) + shader_type = state_id - STATE_GRAPHICS_CONSTANT_BUFFER(0); + else + shader_type = WINED3D_SHADER_TYPE_COMPUTE; + wined3d_gl_limits_get_uniform_block_range(&gl_info->limits, shader_type, &base, &count); for (i = 0; i < count; ++i) { @@ -5188,7 +5198,7 @@ const struct StateEntryTemplate misc_state_template[] = { STATE_FRAMEBUFFER, { STATE_FRAMEBUFFER, context_state_fb }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), context_state_drawbuf},WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), { STATE_SHADER(WINED3D_SHADER_TYPE_GEOMETRY), state_shader }, WINED3D_GL_EXT_NONE }, - { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_shader }, WINED3D_GL_EXT_NONE }, + { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), { STATE_SHADER(WINED3D_SHADER_TYPE_COMPUTE), state_compute_shader}, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c40a339..30a80e5 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4377,9 +4377,13 @@ const char *debug_d3dstate(DWORD state) } if (STATE_IS_SAMPLER(state)) return wine_dbg_sprintf("STATE_SAMPLER(%#x)", state - STATE_SAMPLER(0)); - if (STATE_IS_SHADER(state)) + if (STATE_IS_COMPUTE_SHADER(state)) + return wine_dbg_sprintf("STATE_SHADER(%s)", debug_shader_type(WINED3D_SHADER_TYPE_COMPUTE)); + if (STATE_IS_GRAPHICS_SHADER(state)) return wine_dbg_sprintf("STATE_SHADER(%s)", debug_shader_type(state - STATE_SHADER(0))); - if (STATE_IS_CONSTANT_BUFFER(state)) + if (STATE_IS_COMPUTE_CONSTANT_BUFFER(state)) + return wine_dbg_sprintf("STATE_CONSTANT_BUFFER(%s)", debug_shader_type(WINED3D_SHADER_TYPE_COMPUTE)); + if (STATE_IS_GRAPHICS_CONSTANT_BUFFER(state)) return wine_dbg_sprintf("STATE_CONSTANT_BUFFER(%s)", debug_shader_type(state - STATE_CONSTANT_BUFFER(0))); if (STATE_IS_SHADER_RESOURCE_BINDING(state)) return "STATE_SHADER_RESOURCE_BINDING"; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ead8847..ca992b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -806,7 +806,9 @@ enum wined3d_shader_type WINED3D_SHADER_TYPE_GEOMETRY, WINED3D_SHADER_TYPE_HULL, WINED3D_SHADER_TYPE_DOMAIN, - WINED3D_SHADER_TYPE_COMPUTE, + WINED3D_SHADER_TYPE_GRAPHICS_COUNT, + + WINED3D_SHADER_TYPE_COMPUTE = WINED3D_SHADER_TYPE_GRAPHICS_COUNT, WINED3D_SHADER_TYPE_COUNT, }; @@ -1360,20 +1362,25 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_RENDER(a) (a) #define STATE_IS_RENDER(a) ((a) >= STATE_RENDER(1) && (a) <= STATE_RENDER(WINEHIGHEST_RENDER_STATE)) -#define STATE_TEXTURESTAGE(stage, num) (STATE_RENDER(WINEHIGHEST_RENDER_STATE) + 1 + (stage) * (WINED3D_HIGHEST_TEXTURE_STATE + 1) + (num)) -#define STATE_IS_TEXTURESTAGE(a) ((a) >= STATE_TEXTURESTAGE(0, 1) && (a) <= STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE)) +#define STATE_TEXTURESTAGE(stage, num) \ + (STATE_RENDER(WINEHIGHEST_RENDER_STATE) + 1 + (stage) * (WINED3D_HIGHEST_TEXTURE_STATE + 1) + (num)) +#define STATE_IS_TEXTURESTAGE(a) \ + ((a) >= STATE_TEXTURESTAGE(0, 1) && (a) <= STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE)) /* + 1 because samplers start with 0 */ #define STATE_SAMPLER(num) (STATE_TEXTURESTAGE(MAX_TEXTURES - 1, WINED3D_HIGHEST_TEXTURE_STATE) + 1 + (num)) #define STATE_IS_SAMPLER(num) ((num) >= STATE_SAMPLER(0) && (num) <= STATE_SAMPLER(MAX_COMBINED_SAMPLERS - 1)) -#define STATE_SHADER(a) (STATE_SAMPLER(MAX_COMBINED_SAMPLERS) + (a)) -#define STATE_IS_SHADER(a) ((a) >= STATE_SHADER(0) && (a) < STATE_SHADER(WINED3D_SHADER_TYPE_COUNT)) +#define STATE_GRAPHICS_SHADER(a) (STATE_SAMPLER(MAX_COMBINED_SAMPLERS) + (a)) +#define STATE_IS_GRAPHICS_SHADER(a) \ + ((a) >= STATE_GRAPHICS_SHADER(0) && (a) < STATE_GRAPHICS_SHADER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT)) -#define STATE_CONSTANT_BUFFER(a) (STATE_SHADER(WINED3D_SHADER_TYPE_COUNT) + (a)) -#define STATE_IS_CONSTANT_BUFFER(a) ((a) >= STATE_CONSTANT_BUFFER(0) && (a) < STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COUNT)) +#define STATE_GRAPHICS_CONSTANT_BUFFER(a) (STATE_GRAPHICS_SHADER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT) + (a)) +#define STATE_IS_GRAPHICS_CONSTANT_BUFFER(a) \ + ((a) >= STATE_GRAPHICS_CONSTANT_BUFFER(0) \ + && (a) < STATE_GRAPHICS_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT)) -#define STATE_SHADER_RESOURCE_BINDING (STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COUNT)) +#define STATE_SHADER_RESOURCE_BINDING (STATE_GRAPHICS_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_GRAPHICS_COUNT)) #define STATE_IS_SHADER_RESOURCE_BINDING(a) ((a) == STATE_SHADER_RESOURCE_BINDING) #define STATE_UNORDERED_ACCESS_VIEW_BINDING (STATE_SHADER_RESOURCE_BINDING + 1) @@ -1425,9 +1432,22 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_COLOR_KEY (STATE_POINT_ENABLE + 1) #define STATE_IS_COLOR_KEY(a) ((a) == STATE_COLOR_KEY) -#define STATE_HIGHEST (STATE_COLOR_KEY) +#define STATE_COMPUTE_OFFSET (STATE_COLOR_KEY + 1) + +#define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) +#define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) + +#define STATE_COMPUTE_CONSTANT_BUFFER (STATE_COMPUTE_SHADER + 1) +#define STATE_IS_COMPUTE_CONSTANT_BUFFER(a) ((a) == STATE_COMPUTE_CONSTANT_BUFFER) + +#define STATE_COMPUTE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) +#define STATE_HIGHEST (STATE_COMPUTE_CONSTANT_BUFFER) + +#define STATE_COMPUTE_COUNT (STATE_COMPUTE_HIGHEST - STATE_COMPUTE_OFFSET + 1) -#define STATE_COMPUTE_HIGHEST (STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)) +#define STATE_SHADER(a) ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_SHADER(a) : STATE_COMPUTE_SHADER) +#define STATE_CONSTANT_BUFFER(a) \ + ((a) != WINED3D_SHADER_TYPE_COMPUTE ? STATE_GRAPHICS_CONSTANT_BUFFER(a) : STATE_COMPUTE_CONSTANT_BUFFER) enum fogsource { FOGSOURCE_FFP, @@ -1532,7 +1552,7 @@ struct wined3d_context DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ DWORD numDirtyEntries; DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ - unsigned int dirty_compute_states[STATE_COMPUTE_HIGHEST / (sizeof(unsigned int) * CHAR_BIT) + 1]; + unsigned int dirty_compute_states[STATE_COMPUTE_COUNT / (sizeof(unsigned int) * CHAR_BIT) + 1]; struct wined3d_device *device; struct wined3d_swapchain *swapchain;

1 0

Józef Kucia : wined3d: Implement applying state for compute pipeline.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 1b400f74335e8c4b9e919aeeb72de60f16a44b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b400f74335e8c4b9e919aeeb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:14 2017 +0100 wined3d: Implement applying state for compute pipeline. 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> --- dlls/wined3d/context.c | 45 +++++++++++++++++++++++++++++++++++++----- dlls/wined3d/cs.c | 19 ++++++++++++++---- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 5 +++++ 4 files changed, 68 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index c141d70..5ae1bdc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1405,6 +1405,16 @@ static void context_enter(struct wined3d_context *context) } } +void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) +{ + DWORD representative = context->state_table[state_id].representative; + unsigned int index, shift; + + index = representative / (sizeof(*context->dirty_compute_states) * CHAR_BIT); + shift = representative & (sizeof(*context->dirty_compute_states) * CHAR_BIT - 1); + context->dirty_compute_states[index] |= (1u << shift); +} + void context_invalidate_state(struct wined3d_context *context, DWORD state) { DWORD rep = context->state_table[state].representative; @@ -3312,7 +3322,8 @@ static void context_preload_textures(struct wined3d_context *context, const stru } } -static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state) +static void context_load_shader_resources(struct wined3d_context *context, const struct wined3d_state *state, + unsigned int shader_mask) { struct wined3d_shader_sampler_map_entry *entry; struct wined3d_shader_resource_view *view; @@ -3321,6 +3332,9 @@ static void context_load_shader_resources(struct wined3d_context *context, const for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) { + if (!(shader_mask & (1u << i))) + continue; + if (!(shader = state->shader[i])) continue; @@ -3489,7 +3503,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, * updating a resource location. */ context_update_tex_unit_map(context, state); context_preload_textures(context, state); - context_load_shader_resources(context, state); + context_load_shader_resources(context, state, ~(1u << WINED3D_SHADER_TYPE_COMPUTE)); /* TODO: Right now the dependency on the vertex shader is necessary * since context_stream_info_from_declaration depends on the reg_maps of * the current VS but maybe it's possible to relax the coupling in some @@ -3528,10 +3542,10 @@ BOOL context_apply_draw_state(struct wined3d_context *context, state_table[rep].apply(context, state, rep); } - if (context->shader_update_mask) + if (context->shader_update_mask & ~(1u << WINED3D_SHADER_TYPE_COMPUTE)) { device->shader_backend->shader_select(device->shader_priv, context, state); - context->shader_update_mask = 0; + context->shader_update_mask &= 1u << WINED3D_SHADER_TYPE_COMPUTE; } if (context->constant_update_mask) @@ -3566,7 +3580,28 @@ BOOL context_apply_draw_state(struct wined3d_context *context, void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { - FIXME("Implement applying compute state.\n"); + const struct StateEntry *state_table = context->state_table; + unsigned int state_id, i, j; + + context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + + for (i = 0, state_id = 0; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + { + for (j = 0; j < sizeof(*context->dirty_compute_states) * CHAR_BIT; ++j, ++state_id) + { + if (context->dirty_compute_states[i] & (1u << j)) + state_table[state_id].apply(context, state, state_id); + } + } + memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states)); + + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + { + device->shader_backend->shader_select_compute(device->shader_priv, context, state); + context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); + } + + context->last_was_blit = FALSE; } static void context_setup_target(struct wined3d_context *context, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 220ddee..d575159 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -907,7 +907,10 @@ static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const voi if (prev) InterlockedDecrement(&prev->resource.bind_count); - device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) + device_invalidate_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); + else + device_invalidate_compute_state(cs->device, STATE_CONSTANT_BUFFER(op->type)); } void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, @@ -1020,7 +1023,8 @@ static void wined3d_cs_exec_set_shader_resource_view(struct wined3d_cs *cs, cons const struct wined3d_cs_set_shader_resource_view *op = data; cs->state.shader_resource_view[op->type][op->view_idx] = op->view; - device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) + device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); } void wined3d_cs_emit_set_unordered_access_view(struct wined3d_cs *cs, unsigned int view_idx, @@ -1093,8 +1097,15 @@ static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) const struct wined3d_cs_set_shader *op = data; cs->state.shader[op->type] = op->shader; - device_invalidate_state(cs->device, STATE_SHADER(op->type)); - device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); + if (op->type != WINED3D_SHADER_TYPE_COMPUTE) + { + device_invalidate_state(cs->device, STATE_SHADER(op->type)); + device_invalidate_state(cs->device, STATE_SHADER_RESOURCE_BINDING); + } + else + { + device_invalidate_compute_state(cs->device, STATE_SHADER(op->type)); + } } void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0e969be..71bb929 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5113,6 +5113,14 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } +void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) +{ + unsigned int i; + + for (i = 0; i < device->context_count; ++i) + context_invalidate_compute_state(device->contexts[i], state_id); +} + LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b16e14..ead8847 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1427,6 +1427,8 @@ DWORD get_flexible_vertex_size(DWORD d3dvtVertexType) DECLSPEC_HIDDEN; #define STATE_HIGHEST (STATE_COLOR_KEY) +#define STATE_COMPUTE_HIGHEST (STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)) + enum fogsource { FOGSOURCE_FFP, FOGSOURCE_VS, @@ -1530,6 +1532,7 @@ struct wined3d_context DWORD dirtyArray[STATE_HIGHEST + 1]; /* Won't get bigger than that, a state is never marked dirty 2 times */ DWORD numDirtyEntries; DWORD isStateDirty[STATE_HIGHEST / (sizeof(DWORD) * CHAR_BIT) + 1]; /* Bitmap to find out quickly if a state is dirty */ + unsigned int dirty_compute_states[STATE_COMPUTE_HIGHEST / (sizeof(unsigned int) * CHAR_BIT) + 1]; struct wined3d_device *device; struct wined3d_swapchain *swapchain; @@ -1811,6 +1814,7 @@ GLenum context_get_offscreen_gl_buffer(const struct wined3d_context *context) DE DWORD context_get_tls_idx(void) DECLSPEC_HIDDEN; void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; +void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; void context_release(struct wined3d_context *context) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, @@ -2627,6 +2631,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; +void device_invalidate_compute_state(const struct wined3d_device *device, DWORD state_id) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_iadd opcode.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 9311141cd47b7d34e437de574af1a6aaeb3409b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9311141cd47b7d34e437de574… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:13 2017 +0100 wined3d: Recognize SM5 imm_atomic_iadd opcode. 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> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7fc97b5..f9906b2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5142,6 +5142,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2df308e..e47d18b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9026,6 +9026,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_CONSUME */ NULL, /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, + /* WINED3DSIH_IMM_ATOMIC_IADD */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 00ed452..490c985 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -162,6 +162,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_CMP_EXCH */ "imm_atomic_cmp_exch", /* WINED3DSIH_IMM_ATOMIC_CONSUME */ "imm_atomic_consume", /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", + /* WINED3DSIH_IMM_ATOMIC_IADD */ "imm_atomic_iadd", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 9bd9b62..991fad7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -277,6 +277,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, WINED3D_SM5_OP_IMM_ATOMIC_CONSUME = 0xb3, + WINED3D_SM5_OP_IMM_ATOMIC_IADD = 0xb4, WINED3D_SM5_OP_IMM_ATOMIC_AND = 0xb5, WINED3D_SM5_OP_IMM_ATOMIC_OR = 0xb6, WINED3D_SM5_OP_IMM_ATOMIC_XOR = 0xb7, @@ -1000,6 +1001,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, {WINED3D_SM5_OP_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_CONSUME, "u", "U"}, + {WINED3D_SM5_OP_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_IADD, "uU", "ii"}, {WINED3D_SM5_OP_IMM_ATOMIC_AND, WINED3DSIH_IMM_ATOMIC_AND, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_OR, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_XOR, WINED3DSIH_IMM_ATOMIC_XOR, "uU", "iu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7209ce8..9b16e14 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -692,6 +692,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CONSUME, WINED3DSIH_IMM_ATOMIC_EXCH, + WINED3DSIH_IMM_ATOMIC_IADD, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMIN,

1 0

Józef Kucia : ddraw/tests: Add basic test for D3DOP_TEXTURELOAD.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: a865aa368f94a7d6693782a69a44384b0f454399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a865aa368f94a7d6693782a69… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:12 2017 +0100 ddraw/tests: Add basic test for D3DOP_TEXTURELOAD. 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> --- dlls/ddraw/tests/ddraw1.c | 168 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2832095..c408024 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -352,6 +352,23 @@ static void emit_tquad_tlist(void **ptr, WORD base_idx) *ptr = tri; } +static void emit_texture_load(void **ptr, D3DTEXTUREHANDLE dst_texture, + D3DTEXTUREHANDLE src_texture) +{ + D3DINSTRUCTION *instruction = *ptr; + D3DTEXTURELOAD *texture_load = (D3DTEXTURELOAD *)(instruction + 1); + + instruction->bOpcode = D3DOP_TEXTURELOAD; + instruction->bSize = sizeof(*texture_load); + instruction->wCount = 1; + + texture_load->hDestTexture = dst_texture; + texture_load->hSrcTexture = src_texture; + ++texture_load; + + *ptr = texture_load; +} + static void emit_end(void **ptr) { D3DINSTRUCTION *inst = *ptr; @@ -9996,6 +10013,156 @@ static void test_surface_desc_size(void) ok(!refcount, "DirectDraw has %u references left.\n", refcount); } +static void test_texture_load(void) +{ + static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; + static D3DTLVERTEX tquad[] = + { + {{ 0.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {0.0f}}, + {{ 0.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {0.0f}, {1.0f}}, + {{640.0f}, {480.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, + {{640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, + }; + D3DTEXTUREHANDLE dst_texture_handle, src_texture_handle; + IDirectDrawSurface *dst_surface, *src_surface; + IDirect3DExecuteBuffer *execute_buffer; + D3DEXECUTEBUFFERDESC exec_desc; + IDirect3DMaterial *background; + IDirect3DViewport *viewport; + DDSURFACEDESC surface_desc; + IDirect3DTexture *texture; + IDirect3DDevice *device; + IDirectDrawSurface *rt; + IDirectDraw *ddraw; + UINT inst_length; + D3DCOLOR color; + ULONG refcount; + HWND window; + DDBLTFX fx; + HRESULT hr; + void *ptr; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice_QueryInterface(device, &IID_IDirectDrawSurface, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + background = create_diffuse_material(device, 1.0f, 1.0f, 1.0f, 1.0f); + viewport = create_viewport(device, 0, 0, 640, 480); + viewport_set_background(device, viewport, background); + + memset(&exec_desc, 0, sizeof(exec_desc)); + exec_desc.dwSize = sizeof(exec_desc); + exec_desc.dwFlags = D3DDEB_BUFSIZE | D3DDEB_CAPS; + exec_desc.dwBufferSize = 1024; + exec_desc.dwCaps = D3DDEBCAPS_SYSTEMMEMORY; + hr = IDirect3DDevice_CreateExecuteBuffer(device, &exec_desc, &execute_buffer, NULL); + ok(SUCCEEDED(hr), "Failed to create execute buffer, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + surface_desc.dwWidth = 256; + surface_desc.dwHeight = 256; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 32; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x000000ff; + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(src_surface, &IID_IDirect3DTexture, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &src_texture_handle); + ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); + IDirect3DTexture_Release(texture); + + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_QueryInterface(dst_surface, &IID_IDirect3DTexture, (void **)&texture); + ok(SUCCEEDED(hr), "Failed to get texture interface, hr %#x.\n", hr); + hr = IDirect3DTexture_GetHandle(texture, device, &dst_texture_handle); + ok(SUCCEEDED(hr), "Failed to get texture handle, hr %#x.\n", hr); + IDirect3DTexture_Release(texture); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x0000ffff; + hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirect3DExecuteBuffer_Lock(execute_buffer, &exec_desc); + ok(SUCCEEDED(hr), "Failed to lock execute buffer, hr %#x.\n", hr); + memcpy(exec_desc.lpData, tquad, sizeof(tquad)); + ptr = (BYTE *)exec_desc.lpData + sizeof(tquad); + emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); + emit_texture_load(&ptr, dst_texture_handle, src_texture_handle); + emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, dst_texture_handle); + emit_tquad(&ptr, 0); + emit_end(&ptr); + inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(tquad); + hr = IDirect3DExecuteBuffer_Unlock(execute_buffer); + ok(SUCCEEDED(hr), "Failed to unlock execute buffer, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ffff, 1), "Got unexpected color 0x%08x.\n", color); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x000000ff; + hr = IDirectDrawSurface_Blt(src_surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); + ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x00ffffff, 1), "Got unexpected color 0x%08x.\n", color); + set_execute_data(execute_buffer, 4, sizeof(tquad), inst_length); + hr = IDirect3DDevice_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice_Execute(device, execute_buffer, viewport, D3DEXECUTE_CLIPPED); + ok(SUCCEEDED(hr), "Failed to execute exec buffer, hr %#x.\n", hr); + hr = IDirect3DDevice_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(dst_surface); + IDirectDrawSurface_Release(src_surface); + IDirectDrawSurface_Release(rt); + IDirect3DExecuteBuffer_Release(execute_buffer); + IDirect3DMaterial_Release(background); + destroy_viewport(device, viewport); + IDirect3DDevice_Release(device); + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "DirectDraw has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { IDirectDraw *ddraw; @@ -10081,4 +10248,5 @@ START_TEST(ddraw1) test_transform_vertices(); test_display_mode_surface_pixel_format(); test_surface_desc_size(); + test_texture_load(); }

1 0

Józef Kucia : ddraw: Implement D3DOP_TEXTURELOAD.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 19d85623cf4d5540be709de3040a298700c4a8eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=19d85623cf4d5540be709de30… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 6 14:12:11 2017 +0100 ddraw: Implement D3DOP_TEXTURELOAD. 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> --- dlls/ddraw/executebuffer.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 98e9404..393c52c 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -352,8 +352,30 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, break; case D3DOP_TEXTURELOAD: - WARN("TEXTURELOAD-s (%u)\n", count); - instr += count * size; + TRACE("TEXTURELOAD (%u)\n", count); + + for (i = 0; i < count; ++i) + { + D3DTEXTURELOAD *ci = (D3DTEXTURELOAD *)instr; + struct ddraw_surface *dst, *src; + + instr += size; + + if (!(dst = ddraw_get_object(&device->handle_table, + ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE))) + { + WARN("Invalid destination texture handle %#x.\n", ci->hDestTexture); + continue; + } + if (!(src = ddraw_get_object(&device->handle_table, + ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE))) + { + WARN("Invalid source texture handle %#x.\n", ci->hSrcTexture); + continue; + } + + IDirect3DTexture2_Load(&dst->IDirect3DTexture2_iface, &src->IDirect3DTexture2_iface); + } break; case D3DOP_EXIT:

1 0

Guillaume Charifi : wined3d: Add dual-source blend factors.
by Alexandre Julliard 07 Feb '17

07 Feb '17

Module: wine Branch: master Commit: 8bb7b9498670460b4ae26dacc6de446767b3276e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bb7b9498670460b4ae26dacc… Author: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Date: Tue Feb 7 12:45:28 2017 +0100 wined3d: Add dual-source blend factors. Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 8 ++++++++ include/wine/wined3d.h | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4b21c57..e469414 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -406,6 +406,14 @@ static GLenum gl_blend_factor(enum wined3d_blend factor, const struct wined3d_fo return GL_CONSTANT_COLOR_EXT; case WINED3D_BLEND_INVBLENDFACTOR: return GL_ONE_MINUS_CONSTANT_COLOR_EXT; + case WINED3D_BLEND_SRC1COLOR: + return GL_SRC1_COLOR; + case WINED3D_BLEND_INVSRC1COLOR: + return GL_ONE_MINUS_SRC1_COLOR; + case WINED3D_BLEND_SRC1ALPHA: + return GL_SRC1_ALPHA; + case WINED3D_BLEND_INVSRC1ALPHA: + return GL_ONE_MINUS_SRC1_ALPHA; default: FIXME("Unhandled blend factor %#x.\n", factor); return GL_NONE; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8b8305b..7788e90 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -400,6 +400,10 @@ enum wined3d_blend WINED3D_BLEND_BOTHINVSRCALPHA = 13, WINED3D_BLEND_BLENDFACTOR = 14, WINED3D_BLEND_INVBLENDFACTOR = 15, + WINED3D_BLEND_SRC1COLOR = 16, + WINED3D_BLEND_INVSRC1COLOR = 17, + WINED3D_BLEND_SRC1ALPHA = 18, + WINED3D_BLEND_INVSRC1ALPHA = 19, }; enum wined3d_blend_op

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
84
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 February 2017