September 2020 - Wine-commits

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: d2406ad95e03e10aba4ab720e4a7050dafcee838 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2406ad95e03e10aba4ab720… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 30 12:53:46 2020 +0200 d3dx10: Implement D3DX10GetImageInfoFromFileW(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +-- dlls/d3dx10_43/texture.c | 70 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 640e83fcd0..e33b832646 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1383,12 +1383,10 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); } - todo_wine { hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -1396,7 +1394,7 @@ static void test_get_image_info(void) hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); delete_file(test_filename); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr != S_OK) continue; diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 63e6d71546..b871345148 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -96,6 +97,57 @@ static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) return format; } +static HRESULT load_file(const WCHAR *filename, void **buffer, DWORD *size) +{ + HRESULT hr = S_OK; + DWORD bytes_read; + HANDLE file; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *size = GetFileSize(file, NULL); + if (*size == INVALID_FILE_SIZE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *buffer = heap_alloc(*size); + if (!*buffer) + { + hr = E_OUTOFMEMORY; + goto done; + } + + ret = ReadFile(file, *buffer, *size, &bytes_read, NULL); + if (!ret) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if (bytes_read != *size) + { + hr = E_FAIL; + goto done; + } + +done: + if (FAILED(hr)) + { + heap_free(*buffer); + *buffer = NULL; + } + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); + return hr; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -107,9 +159,23 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPu HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), pump, info, result); + void *buffer = NULL; + DWORD size = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("src_file %s, pump %p, info %p, result %p.\n", debugstr_w(src_file), pump, info, result); + + if (!src_file || !info) + return E_FAIL; + + if (FAILED(load_file(src_file, &buffer, &size))) + return D3D10_ERROR_FILE_NOT_FOUND; + + hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump,

1 0

Ziqing Hui : d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA().
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: a0fa7810e1b331799d746df99476fe6d2af789b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0fa7810e1b331799d746df9… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 30 12:53:47 2020 +0200 d3dx10/tests: Add tests for D3DX10GetImageInfoFromFileA(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e33b832646..02de73865f 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -558,6 +558,14 @@ static BOOL compare_float(float f, float g, unsigned int ulps) return TRUE; } +static char *get_str_a(const WCHAR *wstr) +{ + static char buffer[MAX_PATH]; + + WideCharToMultiByte(CP_ACP, 0, wstr, -1, buffer, sizeof(buffer), NULL, NULL); + return buffer; +} + static BOOL create_file(const WCHAR *filename, const void *data, unsigned int size, WCHAR *out_path) { WCHAR path[MAX_PATH]; @@ -1387,19 +1395,30 @@ static void test_get_image_info(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + todo_wine { + hr = D3DX10GetImageInfoFromFileA(NULL, NULL, &image_info, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = D3DX10GetImageInfoFromFileA("deadbeaf", NULL, &image_info, NULL); + ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { create_file(test_filename, test_image[i].data, test_image[i].size, path); - hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); - delete_file(test_filename); + hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - if (hr != S_OK) - continue; + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); - check_image_info(&image_info, i, __LINE__); + hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); + todo_wine + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + if (hr == S_OK) + check_image_info(&image_info, i, __LINE__); + + delete_file(test_filename); } CoUninitialize();

1 0

Ziqing Hui : d3dx10: Implement D3DX10GetImageInfoFromFileA().
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 937b585996b0bf4e65170b447cef60bc6d9408d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=937b585996b0bf4e65170b44… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Sep 30 12:53:48 2020 +0200 d3dx10: Implement D3DX10GetImageInfoFromFileA(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +--- dlls/d3dx10_43/texture.c | 24 ++++++++++++++++++++++-- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 02de73865f..897c54249b 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1395,12 +1395,10 @@ static void test_get_image_info(void) ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - todo_wine { hr = D3DX10GetImageInfoFromFileA(NULL, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileA("deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -1413,7 +1411,7 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); hr = D3DX10GetImageInfoFromFileA(get_str_a(path), NULL, &image_info, NULL); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr == S_OK) check_image_info(&image_info, i, __LINE__); diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index b871345148..23d7b93e64 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -151,9 +151,29 @@ done: HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_a(src_file), pump, info, result); + WCHAR *buffer; + int str_len; + HRESULT hr; - return E_NOTIMPL; + TRACE("src_file %s, pump %p, info %p, result %p.\n", debugstr_a(src_file), pump, info, result); + + if (!src_file || !info) + return E_FAIL; + + str_len = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0); + if (!str_len) + return HRESULT_FROM_WIN32(GetLastError()); + + buffer = heap_alloc(str_len * sizeof(*buffer)); + if (!buffer) + return E_OUTOFMEMORY; + + MultiByteToWideChar(CP_ACP, 0, src_file, -1, buffer, str_len); + hr = D3DX10GetImageInfoFromFileW(buffer, pump, info, result); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info,

1 0

Nikolay Sivov : mfreadwrite/tests: Add return value test (Coverity).
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 82584160d42ebf0fd60eefe738d6a9e4fbf0223e URL: https://source.winehq.org/git/wine.git/?a=commit;h=82584160d42ebf0fd60eefe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 30 13:55:06 2020 +0300 mfreadwrite/tests: Add return value test (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ed9428970..84581f9be9 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -438,11 +438,13 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia struct test_media_stream *stream; IMFPresentationDescriptor *pd; BOOL selected; + HRESULT hr; stream = heap_alloc_zero(sizeof(*stream)); stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; - MFCreateEventQueue(&stream->event_queue); + hr = MFCreateEventQueue(&stream->event_queue); + ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); stream->source = source; IMFMediaSource_AddRef(stream->source); stream->is_new = TRUE;

1 0

Michael Stefaniuc : d2d1/tests:Use wide-char string literals.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 141ff5f4f5c042d4809597983cd4ade2baf29282 URL: https://source.winehq.org/git/wine.git/?a=commit;h=141ff5f4f5c042d480959798… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Sep 29 23:29:33 2020 +0200 d2d1/tests:Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index f52a34514e..166cdfccda 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -4870,9 +4870,6 @@ static void test_draw_text_layout(void) { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_NATURAL, E_INVALIDARG }, { D2D1_TEXT_ANTIALIAS_MODE_ALIASED, DWRITE_RENDERING_MODE_CLEARTYPE_GDI_CLASSIC, E_INVALIDARG }, }; - static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; - static const WCHAR textW[] = {'t','e','x','t',0}; - static const WCHAR emptyW[] = {0}; D2D1_RENDER_TARGET_PROPERTIES desc; IDXGISwapChain *swapchain; ID2D1Factory *factory, *factory2; @@ -4926,11 +4923,11 @@ static void test_draw_text_layout(void) hr = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED, &IID_IDWriteFactory, (IUnknown **)&dwrite_factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextFormat(dwrite_factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0f, emptyW, &text_format); + hr = IDWriteFactory_CreateTextFormat(dwrite_factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0f, L"", &text_format); ok(SUCCEEDED(hr), "Failed to create text format, hr %#x.\n", hr); - hr = IDWriteFactory_CreateTextLayout(dwrite_factory, textW, 4, text_format, 100.0f, 100.0f, &text_layout); + hr = IDWriteFactory_CreateTextLayout(dwrite_factory, L"text", 4, text_format, 100.0f, 100.0f, &text_layout); ok(SUCCEEDED(hr), "Failed to create text layout, hr %#x.\n", hr); set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f);

1 0

Zebediah Figura : wined3d: Introduce WINED3DFMT_FLAG_UNORDERED_ACCESS.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: ba29503654a752a9417908f8e077cd27ec56fb37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba29503654a752a9417908f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 29 16:06:16 2020 -0500 wined3d: Introduce WINED3DFMT_FLAG_UNORDERED_ACCESS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 6 ++++++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 01a838db89..88175d4bf2 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -2989,6 +2989,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, WINED3DFMT_FLAG_VTF, "vertex texture usage"); query_format_flag(gl_info, format, format->internal, GL_FILTER, WINED3DFMT_FLAG_FILTERING, "filtering"); + query_format_flag(gl_info, format, format->internal, GL_SHADER_IMAGE_STORE, + WINED3DFMT_FLAG_UNORDERED_ACCESS, "unordered access"); if (srgb_format || format->srgb_internal != format->internal) { @@ -4183,6 +4185,10 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { flags |= WINED3DFMT_FLAG_FILTERING; } + if (texture_flags & VK_FORMAT_FEATURE_STORAGE_IMAGE_BIT) + { + flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; + } format->f.flags[WINED3D_GL_RES_TYPE_TEX_1D] |= flags; format->f.flags[WINED3D_GL_RES_TYPE_TEX_2D] |= flags; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index abc6e0e57b..1c783d28bc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5560,6 +5560,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN /* WineD3D pixel format flags */ #define WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING 0x00000001 #define WINED3DFMT_FLAG_FILTERING 0x00000002 +#define WINED3DFMT_FLAG_UNORDERED_ACCESS 0x00000004 #define WINED3DFMT_FLAG_DEPTH_STENCIL 0x00000008 #define WINED3DFMT_FLAG_RENDERTARGET 0x00000010 #define WINED3DFMT_FLAG_EXTENSION 0x00000020

1 0

Zebediah Figura : wined3d: Check for UAV support in wined3d_check_device_format.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 76653835532efb68ce1ce0d3eb34367e0c770262 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76653835532efb68ce1ce0d3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 29 16:06:17 2020 -0500 wined3d: Check for UAV support in wined3d_check_device_format. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 386d84e54e..0fa05a06be 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1618,7 +1618,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, case WINED3D_RTYPE_NONE: allowed_usage = 0; allowed_bind_flags = WINED3D_BIND_RENDER_TARGET - | WINED3D_BIND_DEPTH_STENCIL; + | WINED3D_BIND_DEPTH_STENCIL + | WINED3D_BIND_UNORDERED_ACCESS; gl_type = WINED3D_GL_RES_TYPE_TEX_2D; gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; @@ -1633,7 +1634,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; - allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_1D; break; @@ -1642,7 +1644,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, if (bind_flags & WINED3D_BIND_RENDER_TARGET) allowed_usage |= WINED3DUSAGE_QUERY_SRGBWRITE; allowed_bind_flags = WINED3D_BIND_RENDER_TARGET - | WINED3D_BIND_DEPTH_STENCIL; + | WINED3D_BIND_DEPTH_STENCIL + | WINED3D_BIND_UNORDERED_ACCESS; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { if (!wined3d_check_surface_format(format)) @@ -1683,7 +1686,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, | WINED3DUSAGE_QUERY_SRGBWRITE | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; - allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; @@ -1713,6 +1717,8 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, format_flags |= WINED3DFMT_FLAG_RENDERTARGET; if (bind_flags & WINED3D_BIND_DEPTH_STENCIL) format_flags |= WINED3DFMT_FLAG_DEPTH_STENCIL; + if (bind_flags & WINED3D_BIND_UNORDERED_ACCESS) + format_flags |= WINED3DFMT_FLAG_UNORDERED_ACCESS; if (usage & WINED3DUSAGE_QUERY_FILTER) format_flags |= WINED3DFMT_FLAG_FILTERING; if (usage & WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING) @@ -1754,6 +1760,13 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; } + if ((bind_flags & WINED3D_BIND_UNORDERED_ACCESS) && wined3d_format_is_typeless(format)) + { + TRACE("Requested WINED3D_BIND_UNORDERED_ACCESS, but format %s is typeless.\n", + debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + if ((format->flags[gl_type] & format_flags) != format_flags) { TRACE("Requested format flags %#x, but format %s only has %#x.\n",

1 0

Zebediah Figura : d3d11: Report D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW in CheckFormatSupport().
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 8130475d1475314786774bea0dd0bfd6ae474417 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8130475d1475314786774bea… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 29 16:06:18 2020 -0500 d3d11: Report D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW in CheckFormatSupport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index dd0a67ebc8..2a08d2b1e6 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3318,6 +3318,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_LEGACY_CUBEMAP, D3D11_FORMAT_SUPPORT_TEXTURECUBE}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, 0, D3D11_FORMAT_SUPPORT_RENDER_TARGET}, {WINED3D_RTYPE_NONE, WINED3D_BIND_DEPTH_STENCIL, 0, D3D11_FORMAT_SUPPORT_DEPTH_STENCIL}, + {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_GENMIPMAP, D3D11_FORMAT_SUPPORT_MIP_AUTOGEN}, {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE},

1 0

Zebediah Figura : d3d11/tests: Add a test for deferred context state management.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 932bc89995e5f4db25d02cdb73977db741ab87e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=932bc89995e5f4db25d02cdb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Sep 29 19:23:26 2020 -0500 d3d11/tests: Add a test for deferred context state management. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 91280f2c37..82a165c62d 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -30164,6 +30164,79 @@ static void test_dual_source_blend(void) release_test_context(&test_context); } +static void test_deferred_context_state(void) +{ + ID3D11Buffer *green_buffer, *blue_buffer, *ret_buffer; + ID3D11DeviceContext *immediate, *deferred; + struct d3d11_test_context test_context; + ID3D11CommandList *list1, *list2; + ID3D11Device *device; + HRESULT hr; + + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + immediate = test_context.immediate_context; + + green_buffer = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(green), &green); + blue_buffer = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(blue), &blue); + ID3D11DeviceContext_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + + hr = ID3D11Device_CreateDeferredContext(device, 0, &deferred); + todo_wine ok(hr == S_OK, "Failed to create deferred context, hr %#x.\n", hr); + if (hr != S_OK) + { + ID3D11Buffer_Release(blue_buffer); + ID3D11Buffer_Release(green_buffer); + release_test_context(&test_context); + return; + } + + ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3D11DeviceContext_PSSetConstantBuffers(deferred, 0, 1, &blue_buffer); + + ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(ret_buffer == blue_buffer, "Got unexpected buffer %p.\n", ret_buffer); + ID3D11Buffer_Release(ret_buffer); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, TRUE, &list1); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(ret_buffer == blue_buffer, "Got unexpected buffer %p.\n", ret_buffer); + ID3D11Buffer_Release(ret_buffer); + + hr = ID3D11DeviceContext_FinishCommandList(deferred, FALSE, &list2); + ok(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); + + ID3D11DeviceContext_PSGetConstantBuffers(deferred, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3D11DeviceContext_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, TRUE); + ID3D11DeviceContext_PSGetConstantBuffers(immediate, 0, 1, &ret_buffer); + ok(ret_buffer == green_buffer, "Got unexpected buffer %p.\n", ret_buffer); + ID3D11Buffer_Release(ret_buffer); + + ID3D11DeviceContext_PSSetConstantBuffers(immediate, 0, 1, &green_buffer); + ID3D11DeviceContext_ExecuteCommandList(immediate, list1, FALSE); + ID3D11DeviceContext_PSGetConstantBuffers(immediate, 0, 1, &ret_buffer); + ok(!ret_buffer, "Got unexpected buffer %p.\n", ret_buffer); + + ID3D11CommandList_Release(list2); + ID3D11CommandList_Release(list1); + ID3D11DeviceContext_Release(deferred); + ID3D11Buffer_Release(blue_buffer); + ID3D11Buffer_Release(green_buffer); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -30327,6 +30400,7 @@ START_TEST(d3d11) queue_test(test_color_mask); queue_test(test_independent_blend); queue_test(test_dual_source_blend); + queue_test(test_deferred_context_state); run_queued_tests(); }

1 0

Alexandre Julliard : gdi32: Move font codepage setup out of freetype.c.
by Alexandre Julliard 30 Sep '20

30 Sep '20

Module: wine Branch: master Commit: 29d35db9a5e713f286adc16665c5b34d419de8f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29d35db9a5e713f286adc166… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 30 16:08:21 2020 +0200 gdi32: Move font codepage setup out of freetype.c. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 409 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/freetype.c | 429 +---------------------------------------------- dlls/gdi32/gdi_private.h | 2 + dlls/gdi32/gdiobj.c | 2 +- 4 files changed, 413 insertions(+), 429 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=29d35db9a5e713f286ad…

1 0