wine-devel August 2018

wine-devel@winehq.org

62 participants
701 discussions

[PATCH] kernel32/tests: Add more pipe tests.
by Jacek Caban 16 Aug '18

16 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 5 +++++ 1 file changed, 5 insertions(+)

1 0

[PATCH] d2d1: Fix scaling when rendering text in bitmap mode.
by Henri Verbeet 16 Aug '18

16 Aug '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 47 ++++++++++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 67b3fab9066..cb7e8a540a5 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1107,10 +1107,9 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) { - D2D1_MATRIX_3X2_F prev_transform, *transform; ID2D1RectangleGeometry *geometry = NULL; ID2D1BitmapBrush *opacity_brush = NULL; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -1119,10 +1118,11 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta DWRITE_TEXTURE_TYPE texture_type; D2D1_BRUSH_PROPERTIES brush_desc; IDWriteFactory2 *dwrite_factory; - DWRITE_GLYPH_RUN scaled_run; + D2D1_MATRIX_3X2_F *transform, m; void *opacity_values = NULL; size_t opacity_values_size; D2D1_SIZE_U bitmap_size; + float scale_x, scale_y; D2D1_RECT_F run_rect; RECT bounds; HRESULT hr; @@ -1134,12 +1134,21 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - scaled_run = *glyph_run; - scaled_run.fontEmSize *= ppd; - hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run, - (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, - DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, - baseline_origin.y, &analysis); + transform = &render_target->drawing_state.transform; + + scale_x = render_target->desc.dpiX / 96.0f; + m._11 = transform->_11 * scale_x; + m._21 = transform->_21 * scale_x; + m._31 = transform->_31 * scale_x; + + scale_y = render_target->desc.dpiY / 96.0f; + m._12 = transform->_12 * scale_y; + m._22 = transform->_22 * scale_y; + m._32 = transform->_32 * scale_y; + + hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, (DWRITE_MATRIX *)&m, + rendering_mode, measuring_mode, DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, + baseline_origin.x, baseline_origin.y, &analysis); IDWriteFactory2_Release(dwrite_factory); if (FAILED(hr)) { @@ -1194,13 +1203,16 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } + d2d_rect_set(&run_rect, bounds.left / scale_x, bounds.top / scale_y, + bounds.right / scale_x, bounds.bottom / scale_y); + brush_desc.opacity = 1.0f; brush_desc.transform._11 = 1.0f; brush_desc.transform._12 = 0.0f; brush_desc.transform._21 = 0.0f; brush_desc.transform._22 = 1.0f; - brush_desc.transform._31 = bounds.left; - brush_desc.transform._32 = bounds.top; + brush_desc.transform._31 = run_rect.left; + brush_desc.transform._32 = run_rect.top; if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { @@ -1208,19 +1220,17 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } - d2d_rect_set(&run_rect, bounds.left, bounds.top, bounds.right, bounds.bottom); if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, &run_rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr); goto done; } - transform = &render_target->drawing_state.transform; - prev_transform = *transform; + m = *transform; *transform = identity; d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), unsafe_impl_from_ID2D1Brush((ID2D1Brush *)opacity_brush)); - *transform = prev_transform; + *transform = m; done: if (geometry) @@ -1242,7 +1252,6 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg IDWriteRenderingParams *rendering_params; DWRITE_RENDERING_MODE rendering_mode; HRESULT hr; - float ppd; TRACE("iface %p, baseline_origin {%.8e, %.8e}, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, baseline_origin.x, baseline_origin.y, glyph_run, brush, measuring_mode); @@ -1298,11 +1307,11 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg ; } - ppd = max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f; if (rendering_mode == DWRITE_RENDERING_MODE_DEFAULT) { if (FAILED(hr = IDWriteFontFace_GetRecommendedRenderingMode(glyph_run->fontFace, glyph_run->fontEmSize, - ppd, measuring_mode, rendering_params, &rendering_mode))) + max(render_target->desc.dpiX, render_target->desc.dpiY) / 96.0f, + measuring_mode, rendering_params, &rendering_mode))) { ERR("Failed to get recommended rendering mode, hr %#x.\n", hr); rendering_mode = DWRITE_RENDERING_MODE_OUTLINE; @@ -1313,7 +1322,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, - ppd, rendering_mode, measuring_mode, antialias_mode); + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, -- 2.11.0

1 0

[PATCH] kernel32: Add AttachConsole implementation.
by Jacek Caban 16 Aug '18

16 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=41573 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43910 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/console.c | 19 +++++- dlls/kernel32/tests/console.c | 131 +++++++++++++++++++++++++++++++++++++++--- server/console.c | 43 ++++++++++++++ server/protocol.def | 10 ++++ 4 files changed, 193 insertions(+), 10 deletions(-)

4 4

[PATCH 3/5] msvcrt: Don't read past end of string in _strncoll/_wcsncoll.
by Daniel Lehman 16 Aug '18

16 Aug '18

2 1

[PATCH 2/5] msvcrt/tests: Add tests for _strncoll/_wcsncoll.
by Daniel Lehman 16 Aug '18

16 Aug '18

2 1

[PATCH 1/2] d2d1: Fix scaling when rendering text in bitmap mode.
by Nikolay Sivov 16 Aug '18

16 Aug '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/device.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 67b3fab906..58e39b30b2 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1107,10 +1107,10 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target, D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, - float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_TEXT_ANTIALIAS_MODE antialias_mode) { - D2D1_MATRIX_3X2_F prev_transform, *transform; + D2D1_MATRIX_3X2_F prev_transform, *transform, scale, m; ID2D1RectangleGeometry *geometry = NULL; ID2D1BitmapBrush *opacity_brush = NULL; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -1119,10 +1119,10 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta DWRITE_TEXTURE_TYPE texture_type; D2D1_BRUSH_PROPERTIES brush_desc; IDWriteFactory2 *dwrite_factory; - DWRITE_GLYPH_RUN scaled_run; void *opacity_values = NULL; size_t opacity_values_size; D2D1_SIZE_U bitmap_size; + float scale_x, scale_y; D2D1_RECT_F run_rect; RECT bounds; HRESULT hr; @@ -1134,11 +1134,13 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - scaled_run = *glyph_run; - scaled_run.fontEmSize *= ppd; - hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run, - (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, - DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, + m = render_target->drawing_state.transform; + memset(&scale, 0, sizeof(scale)); + scale._11 = render_target->desc.dpiX / 96.0f; + scale._22 = render_target->desc.dpiY / 96.0f; + d2d_matrix_multiply(&m, &scale); + hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, (DWRITE_MATRIX *)&m, + rendering_mode, measuring_mode, DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x, baseline_origin.y, &analysis); IDWriteFactory2_Release(dwrite_factory); if (FAILED(hr)) @@ -1194,13 +1196,18 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } + scale_x = 96.0f / render_target->desc.dpiX; + scale_y = 96.0f / render_target->desc.dpiY; + d2d_rect_set(&run_rect, bounds.left * scale_x, bounds.top * scale_y, bounds.right * scale_x, + bounds.bottom * scale_y); + brush_desc.opacity = 1.0f; brush_desc.transform._11 = 1.0f; brush_desc.transform._12 = 0.0f; brush_desc.transform._21 = 0.0f; brush_desc.transform._22 = 1.0f; - brush_desc.transform._31 = bounds.left; - brush_desc.transform._32 = bounds.top; + brush_desc.transform._31 = run_rect.left; + brush_desc.transform._32 = run_rect.top; if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface, opacity_bitmap, NULL, &brush_desc, &opacity_brush))) { @@ -1208,7 +1215,6 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } - d2d_rect_set(&run_rect, bounds.left, bounds.top, bounds.right, bounds.bottom); if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, &run_rect, &geometry))) { ERR("Failed to create geometry, hr %#x.\n", hr); @@ -1313,7 +1319,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush); else d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush, - ppd, rendering_mode, measuring_mode, antialias_mode); + rendering_mode, measuring_mode, antialias_mode); } static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface, -- 2.18.0

1 1

[PATCH] d3d11/tests: Add a test for CopySubresourceRegion() with 3D textures.
by Henri Verbeet 16 Aug '18

16 Aug '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 149543. --- dlls/d3d11/tests/d3d11.c | 216 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 209 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2d62342fa98..60c88f4a24c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11566,7 +11566,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11582,7 +11582,7 @@ static void test_update_subresource(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11605,8 +11605,8 @@ static void test_copy_subresource_region(void) ID3D11SamplerState *sampler_state; ID3D11ShaderResourceView *ps_srv; D3D11_SAMPLER_DESC sampler_desc; - ID3D11DeviceContext *context; ID3D11DeviceContext1 *context1; + ID3D11DeviceContext *context; struct vec4 float_colors[16]; struct resource_readback rb; ID3D11PixelShader *ps; @@ -11773,7 +11773,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, expected_colors[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, expected_colors[j + i * 4]); } } @@ -11789,7 +11789,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11821,7 +11821,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11896,7 +11896,7 @@ static void test_copy_subresource_region(void) { color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); ok(compare_color(color, bitmap_data[j + i * 4], 1), - "Got unexpected color 0x%08x at (%u, %u), expected 0x%08x.\n", + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", color, j, i, bitmap_data[j + i * 4]); } } @@ -11908,6 +11908,207 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } +static void test_copy_subresource_region_3d(void) +{ + ID3D11ShaderResourceView *dst_srv, *src_srv; + ID3D11Texture3D *dst_texture, *src_texture; + D3D11_SUBRESOURCE_DATA resource_data[4]; + struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture2d_desc; + D3D11_TEXTURE3D_DESC texture3d_desc; + ID3D11SamplerState *sampler_state; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture2D *texture2d; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD data[4][16]; + D3D11_BOX box; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture3D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return t.Sample(s, position.xyz / float3(640, 480, 1)); + } +#endif + 0x43425844, 0x27b15ae8, 0xbebf46f7, 0x6cd88d8d, 0x5118de51, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000070f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04002858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101072, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100072, 0x00000000, 0x00101246, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x3f800000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100246, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + texture3d_desc.Width = 4; + texture3d_desc.Height = 4; + texture3d_desc.Depth = 4; + texture3d_desc.MipLevels = 1; + texture3d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture3d_desc.Usage = D3D11_USAGE_DEFAULT; + texture3d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture3d_desc.CPUAccessFlags = 0; + texture3d_desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &src_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateTexture3D(device, &texture3d_desc, NULL, &dst_texture); + ok(hr == S_OK, "Failed to create 3d texture, hr %#x.\n", hr); + + texture2d_desc.Width = 4; + texture2d_desc.Height = 4; + texture2d_desc.MipLevels = 1; + texture2d_desc.ArraySize = 4; + texture2d_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture2d_desc.SampleDesc.Count = 1; + texture2d_desc.SampleDesc.Quality = 0; + texture2d_desc.Usage = D3D11_USAGE_IMMUTABLE; + texture2d_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture2d_desc.CPUAccessFlags = 0; + texture2d_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(*data); ++i) + { + data[0][i] = 0xff0000ff; + data[1][i] = bitmap_data[i]; + data[2][i] = 0xff00ff00; + data[3][i] = 0xffff00ff; + } + + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + resource_data[i].pSysMem = data[i]; + resource_data[i].SysMemPitch = texture2d_desc.Width * sizeof(data[0][0]); + resource_data[i].SysMemSlicePitch = 0; + } + + hr = ID3D11Device_CreateTexture2D(device, &texture2d_desc, resource_data, &texture2d); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)src_texture, NULL, &src_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)dst_texture, NULL, &dst_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D11_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D11_COMPARISON_NEVER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 0.0f; + + hr = ID3D11Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(SUCCEEDED(hr), "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &src_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 0.25f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 1.0f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &dst_srv); + + set_box(&box, 0, 0, 0, 4, 4, 2); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 2, (ID3D11Resource *)src_texture, 0, &box); + set_box(&box, 0, 0, 2, 4, 4, 4); + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)dst_texture, 0, + 0, 0, 0, (ID3D11Resource *)src_texture, 0, &box); + + set_box(&box, 0, 0, 0, 4, 4, 1); + for (i = 0; i < ARRAY_SIZE(resource_data); ++i) + { + ID3D11DeviceContext_CopySubresourceRegion(context, (ID3D11Resource *)src_texture, 0, + 0, 0, i, (ID3D11Resource *)texture2d, i, &box); + } + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + draw_quad_z(&test_context, 0.25f); + check_texture_color(test_context.backbuffer, 0xffff00ff, 1); + draw_quad_z(&test_context, 0.5f); + check_texture_color(test_context.backbuffer, 0xff0000ff, 1); + draw_quad_z(&test_context, 1.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + color = get_readback_color(&rb, 80 + j * 160, 60 + i * 120, 0); + ok(compare_color(color, bitmap_data[j + i * 4], 1), + "Got color 0x%08x at (%u, %u), expected 0x%08x.\n", + color, j, i, bitmap_data[j + i * 4]); + } + } + release_resource_readback(&rb); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(dst_srv); + ID3D11ShaderResourceView_Release(src_srv); + ID3D11Texture2D_Release(texture2d); + ID3D11Texture3D_Release(dst_texture); + ID3D11Texture3D_Release(src_texture); + release_test_context(&test_context); +} + static void test_resource_map(void) { D3D11_MAPPED_SUBRESOURCE mapped_subresource; @@ -27874,6 +28075,7 @@ START_TEST(d3d11) queue_test(test_fragment_coords); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); + queue_test(test_copy_subresource_region_3d); queue_test(test_resource_map); queue_for_each_feature_level(test_resource_access); queue_test(test_check_multisample_quality_levels); -- 2.11.0

1 0

[PATCH 2/6] wined3d: Use snprintf() in init_debug_buffer() (Coverity).
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- This doesn't fix anything --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 491d888ad4c1..76f86334886b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4340,9 +4340,9 @@ struct debug_buffer static void init_debug_buffer(struct debug_buffer *buffer, const char *default_string) { - strcpy(buffer->str, default_string); + snprintf(buffer->str, sizeof(buffer->str), default_string); buffer->ptr = buffer->str; - buffer->size = ARRAY_SIZE(buffer->str); + buffer->size = sizeof(buffer->str); } static void debug_append(struct debug_buffer *buffer, const char *str, const char *separator) @@ -4355,7 +4355,7 @@ static void debug_append(struct debug_buffer *buffer, const char *str, const cha if (size == -1 || size >= buffer->size) { buffer->size = 0; - strcpy(&buffer->str[ARRAY_SIZE(buffer->str) - 4], "..."); + strcpy(&buffer->str[sizeof(buffer->str) - 4], "..."); return; } -- 2.16.4

3 2

[PATCH 3/3] dxgi: Prefer vkGet*ProcAddr() for loading Vulkan functions.
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 241db3b10b10..83e0f256748f 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -846,7 +846,6 @@ struct dxgi_vk_funcs PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; PFN_vkEndCommandBuffer p_vkEndCommandBuffer; PFN_vkFreeMemory p_vkFreeMemory; - PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; PFN_vkGetImageMemoryRequirements p_vkGetImageMemoryRequirements; PFN_vkGetInstanceProcAddr p_vkGetInstanceProcAddr; PFN_vkGetPhysicalDeviceMemoryProperties p_vkGetPhysicalDeviceMemoryProperties; @@ -1640,19 +1639,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return FALSE; } - dxgi->p_vkCreateSwapchainKHR = vk->p_vkCreateSwapchainKHR; - dxgi->p_vkCreateWin32SurfaceKHR = vk->p_vkCreateWin32SurfaceKHR; - dxgi->p_vkDestroySurfaceKHR = vk->p_vkDestroySurfaceKHR; - dxgi->p_vkDestroySwapchainKHR = vk->p_vkDestroySwapchainKHR; - dxgi->p_vkGetDeviceProcAddr = (PFN_vkGetDeviceProcAddr)vk->p_vkGetDeviceProcAddr; dxgi->p_vkGetInstanceProcAddr = (PFN_vkGetInstanceProcAddr)vk->p_vkGetInstanceProcAddr; - dxgi->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR = vk->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceFormatsKHR = vk->p_vkGetPhysicalDeviceSurfaceFormatsKHR; - dxgi->p_vkGetPhysicalDeviceSurfacePresentModesKHR = vk->p_vkGetPhysicalDeviceSurfacePresentModesKHR; - dxgi->p_vkGetPhysicalDeviceSurfaceSupportKHR = vk->p_vkGetPhysicalDeviceSurfaceSupportKHR; - dxgi->p_vkGetPhysicalDeviceWin32PresentationSupportKHR = vk->p_vkGetPhysicalDeviceWin32PresentationSupportKHR; - dxgi->p_vkGetSwapchainImagesKHR = vk->p_vkGetSwapchainImagesKHR; - dxgi->p_vkQueuePresentKHR = vk->p_vkQueuePresentKHR; #define LOAD_INSTANCE_PFN(name) \ if (!(dxgi->p_##name = vk->p_vkGetInstanceProcAddr(vk_instance, #name))) \ @@ -1660,7 +1647,14 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk ERR("Failed to get instance proc "#name".\n"); \ return FALSE; \ } + LOAD_INSTANCE_PFN(vkCreateWin32SurfaceKHR) + LOAD_INSTANCE_PFN(vkDestroySurfaceKHR) LOAD_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceCapabilitiesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceFormatsKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfacePresentModesKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceSurfaceSupportKHR) + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceWin32PresentationSupportKHR) #undef LOAD_INSTANCE_PFN #define LOAD_DEVICE_PFN(name) \ @@ -1680,13 +1674,17 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk LOAD_DEVICE_PFN(vkCreateFence) LOAD_DEVICE_PFN(vkCreateImage) LOAD_DEVICE_PFN(vkCreateSemaphore) + LOAD_DEVICE_PFN(vkCreateSwapchainKHR) LOAD_DEVICE_PFN(vkDestroyCommandPool) LOAD_DEVICE_PFN(vkDestroyFence) LOAD_DEVICE_PFN(vkDestroyImage) LOAD_DEVICE_PFN(vkDestroySemaphore) + LOAD_DEVICE_PFN(vkDestroySwapchainKHR) LOAD_DEVICE_PFN(vkEndCommandBuffer) LOAD_DEVICE_PFN(vkFreeMemory) LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) + LOAD_DEVICE_PFN(vkGetSwapchainImagesKHR) + LOAD_DEVICE_PFN(vkQueuePresentKHR) LOAD_DEVICE_PFN(vkQueueSubmit) LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences) -- 2.16.4

2 1

[PATCH 2/3] d3d12: Return DXGI_ERROR_SDK_COMPONENT_MISSING from D3D12GetDebugInterface().
by Józef Kucia 16 Aug '18

16 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 324ad3cc4ee5..f0c48ee7af43 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -39,9 +39,10 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); HRESULT WINAPI D3D12GetDebugInterface(REFIID iid, void **debug) { - FIXME("iid %s, debug %p stub!\n", debugstr_guid(iid), debug); + TRACE("iid %s, debug %p.\n", debugstr_guid(iid), debug); - return E_NOTIMPL; + WARN("Returning DXGI_ERROR_SDK_COMPONENT_MISSING.\n"); + return DXGI_ERROR_SDK_COMPONENT_MISSING; } static HRESULT d3d12_signal_event(HANDLE event) -- 2.16.4

2 1

← Newer
1
...
39
40
41
42
43
44
45
...
71
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-devel August 2018