wine-devel March 2020

72 participants
969 discussions

[PATCH v2 5/6] wined3d: Check cursor sizes are powers of two.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 1 - dlls/d3d9/tests/device.c | 1 - dlls/wined3d/device.c | 13 +++++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c96adfc7481..6bb8ab3a02b 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1027,7 +1027,6 @@ static void test_cursor(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr == D3DERR_INVALIDCALL) ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", test_idx, expected_hr, hr); IDirect3DSurface8_Release(cursor); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 0b6668d12b9..efcd630e2df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1839,7 +1839,6 @@ static void test_cursor(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr == D3DERR_INVALIDCALL) ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", test_idx, expected_hr, hr); IDirect3DSurface9_Release(cursor); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f8caa0c23c6..05087fee244 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4934,14 +4934,21 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } + /* Cursor width and height must all be powers of two */ + cursor_width = wined3d_texture_get_level_width(texture, texture_level); + cursor_height = wined3d_texture_get_level_height(texture, texture_level); + if ((cursor_width & (cursor_width - 1)) || (cursor_height & (cursor_height - 1))) + { + WARN("Cursor size %ux%u are not all powers of two.\n", cursor_width, cursor_height); + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = wined3d_output_get_display_mode(&device->adapter->outputs[0], &mode, NULL))) { ERR("Failed to get display mode, hr %#x.\n", hr); return WINED3DERR_INVALIDCALL; } - cursor_width = wined3d_texture_get_level_width(texture, texture_level); - cursor_height = wined3d_texture_get_level_height(texture, texture_level); if (cursor_width > mode.width || cursor_height > mode.height) { WARN("Texture %p, sub-resource %u dimensions are %ux%u, but screen dimensions are %ux%u.\n", @@ -4949,8 +4956,6 @@ HRESULT CDECL wined3d_device_set_cursor_properties(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - /* TODO: MSDN: Cursor sizes must be a power of 2 */ - /* Do not store the surface's pointer because the application may * release it after setting the cursor image. Windows doesn't * addref the set surface, so we can't do this either without -- 2.20.1

4 years, 1 month

[PATCH v2 4/6] d3d9/tests: Add cursor size tests.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/device.c | 99 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 74d330c80bc..0b6668d12b9 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1742,16 +1742,30 @@ cleanup: static void test_cursor(void) { + unsigned int adapter_idx, adapter_count, test_idx; IDirect3DSurface9 *cursor = NULL; + struct device_desc device_desc; + unsigned int width, height; IDirect3DDevice9 *device; + HRESULT expected_hr, hr; + D3DDISPLAYMODE mode; CURSORINFO info; IDirect3D9 *d3d; ULONG refcount; HCURSOR cur; HWND window; - HRESULT hr; BOOL ret; + static const DWORD device_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + static const SIZE cursor_sizes[] = + { + {1, 1}, + {2, 4}, + {3, 2}, + {2, 3}, + {6, 6}, + }; + window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -1812,8 +1826,91 @@ static void test_cursor(void) ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + /* Cursor dimensions must all be powers of two */ + for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx) + { + width = cursor_sizes[test_idx].cx; + height = cursor_sizes[test_idx].cy; + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, D3DFMT_A8R8G8B8, + D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + if (width && !(width & (width - 1)) && height && !(height & (height - 1))) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + todo_wine_if(expected_hr == D3DERR_INVALIDCALL) + ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", + test_idx, expected_hr, hr); + IDirect3DSurface9_Release(cursor); + } + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* Cursor dimensions must not exceed adapter display mode */ + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + + adapter_count = IDirect3D9_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + for (test_idx = 0; test_idx < ARRAY_SIZE(device_flags); ++test_idx) + { + device_desc.adapter_ordinal = adapter_idx; + device_desc.flags = device_flags[test_idx]; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + break; + } + + hr = IDirect3D9_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + + /* Find the largest width and height that are powers of two and less than the display mode */ + width = 1; + height = 1; + while (width * 2 <= mode.Width) + width *= 2; + while (height * 2 <= mode.Height) + height *= 2; + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Adapter %u test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3D_OK, "Adapter %u test %u: SetCursorProperties failed, hr %#x.\n", + adapter_idx, test_idx, hr); + IDirect3DSurface9_Release(cursor); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width * 2, height, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Adapter %u test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface9_Release(cursor); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, width, height * 2, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &cursor, NULL); + ok(hr == D3D_OK, "Adapter %u test %u: CreateOffscreenPlainSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface9_Release(cursor); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); + } + } cleanup: IDirect3D9_Release(d3d); DestroyWindow(window); -- 2.20.1

4 years, 1 month

[PATCH v2 3/6] d3d8/tests: Add cursor size tests.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d8/tests/device.c | 97 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index b7aa02adabb..c96adfc7481 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -931,16 +931,30 @@ cleanup: static void test_cursor(void) { + unsigned int adapter_idx, adapter_count, test_idx; IDirect3DSurface8 *cursor = NULL; + struct device_desc device_desc; + unsigned int width, height; IDirect3DDevice8 *device; + HRESULT expected_hr, hr; + D3DDISPLAYMODE mode; CURSORINFO info; IDirect3D8 *d3d; ULONG refcount; HCURSOR cur; HWND window; - HRESULT hr; BOOL ret; + static const DWORD device_flags[] = {0, CREATE_DEVICE_FULLSCREEN}; + static const SIZE cursor_sizes[] = + { + {1, 1}, + {2, 4}, + {3, 2}, + {2, 3}, + {6, 6}, + }; + window = create_window(); ok(!!window, "Failed to create a window.\n"); @@ -1001,8 +1015,89 @@ static void test_cursor(void) ok(info.flags & (CURSOR_SHOWING|CURSOR_SUPPRESSED), "The gdi cursor is hidden (%08x)\n", info.flags); ok(info.hCursor != cur, "The cursor handle is %p\n", info.hCursor); + /* Cursor dimensions must all be powers of two */ + for (test_idx = 0; test_idx < ARRAY_SIZE(cursor_sizes); ++test_idx) + { + width = cursor_sizes[test_idx].cx; + height = cursor_sizes[test_idx].cy; + hr = IDirect3DDevice8_CreateImageSurface(device, width, height, D3DFMT_A8R8G8B8, &cursor); + ok(hr == D3D_OK, "Test %u: CreateImageSurface failed, hr %#x.\n", test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + if (width && !(width & (width - 1)) && height && !(height & (height - 1))) + expected_hr = D3D_OK; + else + expected_hr = D3DERR_INVALIDCALL; + todo_wine_if(expected_hr == D3DERR_INVALIDCALL) + ok(hr == expected_hr, "Test %u: Expect SetCursorProperties return %#x, got %#x.\n", + test_idx, expected_hr, hr); + IDirect3DSurface8_Release(cursor); + } + refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); + + /* Cursor dimensions must not exceed adapter display mode */ + device_desc.device_window = window; + device_desc.width = 640; + device_desc.height = 480; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + for (test_idx = 0; test_idx < ARRAY_SIZE(device_flags); ++test_idx) + { + device_desc.adapter_ordinal = adapter_idx; + device_desc.flags = device_flags[test_idx]; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u test %u: Failed to create a D3D device.\n", adapter_idx, test_idx); + break; + } + + hr = IDirect3D8_GetAdapterDisplayMode(d3d, adapter_idx, &mode); + ok(hr == D3D_OK, "Adapter %u test %u: GetAdapterDisplayMode failed, hr %#x.\n", + adapter_idx, test_idx, hr); + + /* Find the largest width and height that are powers of two and less than the display mode */ + width = 1; + height = 1; + while (width * 2 <= mode.Width) + width *= 2; + while (height * 2 <= mode.Height) + height *= 2; + + hr = IDirect3DDevice8_CreateImageSurface(device, width, height, D3DFMT_A8R8G8B8, &cursor); + ok(hr == D3D_OK, "Adapter %u test %u: CreateImageSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3D_OK, "Adapter %u test %u: SetCursorProperties failed, hr %#x.\n", + adapter_idx, test_idx, hr); + IDirect3DSurface8_Release(cursor); + + hr = IDirect3DDevice8_CreateImageSurface(device, width * 2, height, D3DFMT_A8R8G8B8, + &cursor); + ok(hr == D3D_OK, "Adapter %u test %u: CreateImageSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface8_Release(cursor); + + hr = IDirect3DDevice8_CreateImageSurface(device, width, height * 2, D3DFMT_A8R8G8B8, + &cursor); + ok(hr == D3D_OK, "Adapter %u test %u: CreateImageSurface failed, hr %#x.\n", + adapter_idx, test_idx, hr); + hr = IDirect3DDevice8_SetCursorProperties(device, 0, 0, cursor); + ok(hr == D3DERR_INVALIDCALL, + "Adapter %u test %u: Expect SetCursorProperties return %#x, got %#x.\n", + adapter_idx, test_idx, D3DERR_INVALIDCALL, hr); + IDirect3DSurface8_Release(cursor); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Adapter %u: Device has %u references left.\n", adapter_idx, refcount); + } + } cleanup: IDirect3D8_Release(d3d); DestroyWindow(window); -- 2.20.1

4 years, 1 month

[PATCH v2 2/6] d3d9/tests: Fix possible test failures.

by Zhiyi Zhang

expect_messages points to a local variable. When it goes out of scope, it reads into random memory, causing failures. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d9/tests/d3d9ex.c | 17 +++++++++++++---- dlls/d3d9/tests/device.c | 21 +++++++++++++++++---- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5b24f6b05eb..dab5cf6d8df 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -2631,6 +2631,7 @@ static void test_wndproc(void) { struct wndproc_thread_param thread_params; struct device_desc device_desc; + static WINDOWPOS windowpos; IDirect3DDevice9Ex *device; WNDCLASSA wc = {0}; HANDLE thread; @@ -2646,7 +2647,6 @@ static void test_wndproc(void) LONG change_ret, device_style; BOOL ret; IDirect3D9Ex *d3d9ex; - WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -2747,7 +2747,7 @@ static void test_wndproc(void) /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages[] = + static const struct message mode_change_messages[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -2760,7 +2760,7 @@ static void test_wndproc(void) * ShowWindow does not send such a message because the window is already visible. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages_hidden[] = + static const struct message mode_change_messages_hidden[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -2777,7 +2777,7 @@ static void test_wndproc(void) {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, {0, 0, FALSE, 0}, }; - struct + static const struct { DWORD create_flags; const struct message *focus_loss_messages; @@ -2859,6 +2859,9 @@ static void test_wndproc(void) return; } + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -3189,6 +3192,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ device_style = GetWindowLongA(device_window, GWL_STYLE); @@ -3208,6 +3212,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) { @@ -3244,6 +3249,7 @@ static void test_wndproc(void) done: filter_messages = NULL; + expect_messages = NULL; DestroyWindow(device_window); DestroyWindow(focus_window); SetEvent(thread_params.test_finished); @@ -3270,6 +3276,9 @@ static void test_wndproc_windowed(void) DWORD res, tid; HWND tmp; + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 839c0301853..74d330c80bc 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3655,6 +3655,7 @@ static void test_wndproc(void) { struct wndproc_thread_param thread_params; struct device_desc device_desc; + static WINDOWPOS windowpos; IDirect3DDevice9 *device; WNDCLASSA wc = {0}; IDirect3D9 *d3d9; @@ -3670,7 +3671,6 @@ static void test_wndproc(void) DEVMODEW devmode; LONG change_ret, device_style; BOOL ret; - WINDOWPOS windowpos; static const struct message create_messages[] = { @@ -3784,7 +3784,7 @@ static void test_wndproc(void) /* WM_SIZE(SIZE_MAXIMIZED) is unreliable on native. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages[] = + static const struct message mode_change_messages[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -3797,7 +3797,7 @@ static void test_wndproc(void) * ShowWindow does not send such a message because the window is already visible. */ {0, 0, FALSE, 0}, }; - struct message mode_change_messages_hidden[] = + static const struct message mode_change_messages_hidden[] = { {WM_WINDOWPOSCHANGING, DEVICE_WINDOW, FALSE, 0}, {WM_WINDOWPOSCHANGED, DEVICE_WINDOW, FALSE, 0}, @@ -3814,7 +3814,7 @@ static void test_wndproc(void) {WM_DISPLAYCHANGE, FOCUS_WINDOW, FALSE, 0}, {0, 0, FALSE, 0}, }; - struct + static const struct { DWORD create_flags; const struct message *focus_loss_messages, *reactivate_messages; @@ -3893,6 +3893,9 @@ static void test_wndproc(void) return; } + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -4258,6 +4261,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; /* World of Warplanes hides the window by removing WS_VISIBLE and expects Reset() to show it again. */ device_style = GetWindowLongA(device_window, GWL_STYLE); @@ -4277,6 +4281,7 @@ static void test_wndproc(void) flush_events(); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + expect_messages = NULL; if (!(tests[i].create_flags & CREATE_DEVICE_NOWINDOWCHANGES)) { @@ -4314,6 +4319,7 @@ static void test_wndproc(void) done: filter_messages = NULL; + expect_messages = NULL; DestroyWindow(device_window); DestroyWindow(focus_window); SetEvent(thread_params.test_finished); @@ -4344,6 +4350,9 @@ static void test_wndproc_windowed(void) d3d9 = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d9, "Failed to create a D3D object.\n"); + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); @@ -4557,6 +4566,7 @@ static void test_reset_fullscreen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + filter_messages = NULL; expect_messages = messages; wc.cbSize = sizeof(wc); @@ -5259,6 +5269,9 @@ static void test_device_window_reset(void) HRESULT hr; ULONG ref; + filter_messages = NULL; + expect_messages = NULL; + wc.lpfnWndProc = test_proc; wc.lpszClassName = "d3d9_test_wndproc_wc"; ok(RegisterClassA(&wc), "Failed to register window class.\n"); -- 2.20.1

4 years, 1 month

[PATCH v2 1/6] d3d8/tests: Fix possible test failures.

by Zhiyi Zhang

4 years, 1 month

[PATCH 10/10] d3d8: Introduce a helper to convert d3d8 primitive types to wined3d types.

by Henri Verbeet

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e094fef002c..ba6ac7717a0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -449,6 +449,11 @@ static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYP return (enum wined3d_render_state)state; } +static enum wined3d_primitive_type wined3d_primitive_type_from_d3d(D3DPRIMITIVETYPE type) +{ + return (enum wined3d_primitive_type)type; +} + /* Handle table functions */ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enum d3d8_handle_type type) { @@ -2457,7 +2462,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitive(IDirect3DDevice8 *iface, vertex_count = vertex_count_from_primitive_count(primitive_type, primitive_count); wined3d_mutex_lock(); d3d8_device_upload_sysmem_vertex_buffers(device, start_vertex, vertex_count); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, start_vertex, vertex_count); wined3d_mutex_unlock(); @@ -2482,7 +2487,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitive(IDirect3DDevice8 *iface, base_vertex_index = device->stateblock_state->base_vertex_index; d3d8_device_upload_sysmem_vertex_buffers(device, base_vertex_index + min_vertex_idx, vertex_count); d3d8_device_upload_sysmem_index_buffer(device, start_idx, index_count); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, start_idx, index_count); wined3d_mutex_unlock(); @@ -2576,7 +2581,7 @@ static HRESULT WINAPI d3d8_device_DrawPrimitiveUP(IDirect3DDevice8 *iface, if (FAILED(hr)) goto done; - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / stride, vtx_count); wined3d_stateblock_set_stream_source(device->state, 0, NULL, 0, 0); @@ -2704,7 +2709,7 @@ static HRESULT WINAPI d3d8_device_DrawIndexedPrimitiveUP(IDirect3DDevice8 *iface wined3dformat_from_d3dformat(index_format)); wined3d_stateblock_set_base_vertex_index(device->state, vb_pos / vertex_stride - min_vertex_idx); - wined3d_device_set_primitive_type(device->wined3d_device, primitive_type, 0); + wined3d_device_set_primitive_type(device->wined3d_device, wined3d_primitive_type_from_d3d(primitive_type), 0); wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_draw_indexed_primitive(device->wined3d_device, ib_pos / idx_fmt_size, idx_count); -- 2.20.1

4 years, 1 month

[PATCH 09/10] d3d8: Introduce a helper to convert d3d8 render states to wined3d states.

by Henri Verbeet

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 058937d3cc4..e094fef002c 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -442,6 +442,13 @@ static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFOR return (enum wined3d_transform_state)state; } +static enum wined3d_render_state wined3d_render_state_from_d3d(D3DRENDERSTATETYPE state) +{ + if (state == D3DRS_ZBIAS) + return WINED3D_RS_DEPTHBIAS; + return (enum wined3d_render_state)state; +} + /* Handle table functions */ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enum d3d8_handle_type type) { @@ -1888,9 +1895,7 @@ static HRESULT WINAPI d3d8_device_SetRenderState(IDirect3DDevice8 *iface, TRACE("iface %p, state %#x, value %#x.\n", iface, state, value); wined3d_mutex_lock(); - if (state == D3DRS_ZBIAS) - state = WINED3D_RS_DEPTHBIAS; - wined3d_stateblock_set_render_state(device->update_state, state, value); + wined3d_stateblock_set_render_state(device->update_state, wined3d_render_state_from_d3d(state), value); if (state == D3DRS_POINTSIZE && value == D3D8_RESZ_CODE) resolve_depth_buffer(device); wined3d_mutex_unlock(); -- 2.20.1

4 years, 1 month

[PATCH 08/10] d3d8: Introduce a helper to convert d3d8 transform states to wined3d states.

by Henri Verbeet

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/device.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 0df0f61930e..058937d3cc4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -437,6 +437,11 @@ void d3dcaps_from_wined3dcaps(D3DCAPS8 *caps, const struct wined3d_caps *wined3d caps->MaxVertexShaderConst = min(D3D8_MAX_VERTEX_SHADER_CONSTANTF, caps->MaxVertexShaderConst); } +static enum wined3d_transform_state wined3d_transform_state_from_d3d(D3DTRANSFORMSTATETYPE state) +{ + return (enum wined3d_transform_state)state; +} + /* Handle table functions */ static DWORD d3d8_allocate_handle(struct d3d8_handle_table *t, void *object, enum d3d8_handle_type type) { @@ -1627,7 +1632,8 @@ static HRESULT WINAPI d3d8_device_SetTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_set_transform(device->update_state, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_set_transform(device->update_state, + wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; @@ -1657,7 +1663,8 @@ static HRESULT WINAPI d3d8_device_MultiplyTransform(IDirect3DDevice8 *iface, /* Note: D3DMATRIX is compatible with struct wined3d_matrix. */ wined3d_mutex_lock(); - wined3d_stateblock_multiply_transform(device->state, state, (const struct wined3d_matrix *)matrix); + wined3d_stateblock_multiply_transform(device->state, + wined3d_transform_state_from_d3d(state), (const struct wined3d_matrix *)matrix); wined3d_mutex_unlock(); return D3D_OK; -- 2.20.1

4 years, 1 month

[PATCH 07/10] d3d8: Introduce a helper to convert d3d8 device types to wined3d types.

by Henri Verbeet

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 5 +++++ dlls/d3d8/device.c | 4 ++-- dlls/d3d8/directx.c | 14 +++++++------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 7e772c2b99b..04bca7ddfa0 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -374,4 +374,9 @@ static inline D3DMULTISAMPLE_TYPE d3dmultisample_type_from_wined3d(enum wined3d_ return (D3DMULTISAMPLE_TYPE)type; } +static inline enum wined3d_device_type wined3d_device_type_from_d3d(D3DDEVTYPE type) +{ + return (enum wined3d_device_type)type; +} + #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 08076228e2a..0df0f61930e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3700,7 +3700,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(parent->wined3d_outputs[output_idx]); - if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, device_type, + if (FAILED(hr = wined3d_device_create(wined3d, wined3d_adapter, wined3d_device_type_from_d3d(device_type), focus_window, flags, 4, feature_levels, ARRAY_SIZE(feature_levels), &device->device_parent, &device->wined3d_device))) { @@ -3710,7 +3710,7 @@ HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wine return hr; } - wined3d_get_device_caps(wined3d_adapter, device_type, &caps); + wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &caps); device->max_user_clip_planes = caps.MaxUserClipPlanes; device->vs_uniform_count = caps.MaxVertexShaderConst; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 874f9ea047b..0c0f2ecaadc 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -232,8 +232,8 @@ static HRESULT WINAPI d3d8_CheckDeviceType(IDirect3D8 *iface, UINT adapter, D3DD return WINED3DERR_NOTAVAILABLE; wined3d_mutex_lock(); - hr = wined3d_check_device_type(d3d8->wined3d, d3d8->wined3d_outputs[output_idx], device_type, - wined3dformat_from_d3dformat(display_format), + hr = wined3d_check_device_type(d3d8->wined3d, d3d8->wined3d_outputs[output_idx], + wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(display_format), wined3dformat_from_d3dformat(backbuffer_format), windowed); wined3d_mutex_unlock(); @@ -298,13 +298,13 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 { DWORD levels; - hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, + hr = wined3d_check_device_multisample_type(wined3d_adapter, wined3d_device_type_from_d3d(device_type), WINED3DFMT_D24_UNORM_S8_UINT, FALSE, WINED3D_MULTISAMPLE_NON_MASKABLE, &levels); if (SUCCEEDED(hr) && !levels) hr = D3DERR_NOTAVAILABLE; } else - hr = wined3d_check_device_format(d3d8->wined3d, wined3d_adapter, device_type, + hr = wined3d_check_device_format(d3d8->wined3d, wined3d_adapter, wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(adapter_format), usage, bind_flags, wined3d_rtype, wined3dformat_from_d3dformat(format)); wined3d_mutex_unlock(); @@ -332,7 +332,7 @@ static HRESULT WINAPI d3d8_CheckDeviceMultiSampleType(IDirect3D8 *iface, UINT ad wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); - hr = wined3d_check_device_multisample_type(wined3d_adapter, device_type, + hr = wined3d_check_device_multisample_type(wined3d_adapter, wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(format), windowed, (enum wined3d_multisample_type)multisample_type, NULL); wined3d_mutex_unlock(); @@ -357,7 +357,7 @@ static HRESULT WINAPI d3d8_CheckDepthStencilMatch(IDirect3D8 *iface, UINT adapte wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); - hr = wined3d_check_depth_stencil_match(wined3d_adapter, device_type, + hr = wined3d_check_depth_stencil_match(wined3d_adapter, wined3d_device_type_from_d3d(device_type), wined3dformat_from_d3dformat(adapter_format), wined3dformat_from_d3dformat(rt_format), wined3dformat_from_d3dformat(ds_format)); wined3d_mutex_unlock(); @@ -384,7 +384,7 @@ static HRESULT WINAPI d3d8_GetDeviceCaps(IDirect3D8 *iface, UINT adapter, D3DDEV wined3d_mutex_lock(); wined3d_adapter = wined3d_output_get_adapter(d3d8->wined3d_outputs[output_idx]); - hr = wined3d_get_device_caps(wined3d_adapter, device_type, &wined3d_caps); + hr = wined3d_get_device_caps(wined3d_adapter, wined3d_device_type_from_d3d(device_type), &wined3d_caps); wined3d_mutex_unlock(); d3dcaps_from_wined3dcaps(caps, &wined3d_caps, adapter); -- 2.20.1

4 years, 1 month

[PATCH 06/10] d3d8: Introduce helpers to convert between d3d8 and wined3d multisample types.

by Henri Verbeet

From: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/d3d8_private.h | 5 +++++ dlls/d3d8/device.c | 14 ++++++++++---- dlls/d3d8/surface.c | 2 +- dlls/d3d8/texture.c | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 93526411767..7e772c2b99b 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -369,4 +369,9 @@ static inline unsigned int wined3d_bind_flags_from_d3d8_usage(DWORD usage) return bind_flags; } +static inline D3DMULTISAMPLE_TYPE d3dmultisample_type_from_wined3d(enum wined3d_multisample_type type) +{ + return (D3DMULTISAMPLE_TYPE)type; +} + #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 23e93df0616..08076228e2a 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -204,7 +204,7 @@ static void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS present_parameters->BackBufferHeight = swapchain_desc->backbuffer_height; present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc->backbuffer_format); present_parameters->BackBufferCount = swapchain_desc->backbuffer_count; - present_parameters->MultiSampleType = swapchain_desc->multisample_type; + present_parameters->MultiSampleType = d3dmultisample_type_from_wined3d(swapchain_desc->multisample_type); present_parameters->SwapEffect = d3dswapeffect_from_wined3dswapeffect(swapchain_desc->swap_effect); present_parameters->hDeviceWindow = swapchain_desc->device_window; present_parameters->Windowed = swapchain_desc->windowed; @@ -255,6 +255,11 @@ static enum wined3d_swap_interval wined3dswapinterval_from_d3d(DWORD interval) } } +static enum wined3d_multisample_type wined3d_multisample_type_from_d3d(D3DMULTISAMPLE_TYPE type) +{ + return (enum wined3d_multisample_type)type; +} + static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapchain_desc *swapchain_desc, const D3DPRESENT_PARAMETERS *present_parameters) { @@ -291,7 +296,7 @@ static BOOL wined3d_swapchain_desc_from_present_parameters(struct wined3d_swapch swapchain_desc->backbuffer_format = wined3dformat_from_d3dformat(present_parameters->BackBufferFormat); swapchain_desc->backbuffer_count = max(1, present_parameters->BackBufferCount); swapchain_desc->backbuffer_bind_flags = WINED3D_BIND_RENDER_TARGET; - swapchain_desc->multisample_type = present_parameters->MultiSampleType; + swapchain_desc->multisample_type = wined3d_multisample_type_from_d3d(present_parameters->MultiSampleType); swapchain_desc->multisample_quality = 0; /* d3d9 only */ swapchain_desc->swap_effect = wined3dswapeffect_from_d3dswapeffect(present_parameters->SwapEffect); swapchain_desc->device_window = present_parameters->hDeviceWindow; @@ -1241,7 +1246,8 @@ static HRESULT WINAPI d3d8_device_CreateRenderTarget(IDirect3DDevice8 *iface, UI access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; return d3d8_device_create_surface(device, wined3dformat_from_d3dformat(format), - multisample_type, WINED3D_BIND_RENDER_TARGET, access, width, height, surface); + wined3d_multisample_type_from_d3d(multisample_type), + WINED3D_BIND_RENDER_TARGET, access, width, height, surface); } static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *iface, @@ -1259,7 +1265,7 @@ static HRESULT WINAPI d3d8_device_CreateDepthStencilSurface(IDirect3DDevice8 *if *surface = NULL; return d3d8_device_create_surface(device, wined3dformat_from_d3dformat(format), - multisample_type, WINED3D_BIND_DEPTH_STENCIL, + wined3d_multisample_type_from_d3d(multisample_type), WINED3D_BIND_DEPTH_STENCIL, WINED3D_RESOURCE_ACCESS_GPU, width, height, surface); } diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index bbd7e38338b..c3d28efba20 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -193,7 +193,7 @@ static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_ desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; - desc->MultiSampleType = wined3d_desc.multisample_type; + desc->MultiSampleType = d3dmultisample_type_from_wined3d(wined3d_desc.multisample_type); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index c82a75d87a4..f383b374bde 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -255,7 +255,7 @@ static HRESULT WINAPI d3d8_texture_2d_GetLevelDesc(IDirect3DTexture8 *iface, UIN desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; - desc->MultiSampleType = wined3d_desc.multisample_type; + desc->MultiSampleType = d3dmultisample_type_from_wined3d(wined3d_desc.multisample_type); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; } @@ -602,7 +602,7 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage, wined3d_desc.bind_flags); desc->Pool = d3dpool_from_wined3daccess(wined3d_desc.access, wined3d_desc.usage); desc->Size = wined3d_desc.size; - desc->MultiSampleType = wined3d_desc.multisample_type; + desc->MultiSampleType = d3dmultisample_type_from_wined3d(wined3d_desc.multisample_type); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; } -- 2.20.1

4 years, 1 month

← Newer
1
2
3
4
5
6
7
8
...
97
Older →

Jump to page:

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-devel March 2020