wine-devel October 2018

wine-devel@winehq.org

60 participants
608 discussions

[PATCH 1/2] d2d1: Return S_OK from RegisterEffectFromString().
by Nikolay Sivov 18 Oct '18

18 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- These 2 patches let Office 2016 to work when ID2D1Factory1 is exposed. dlls/d2d1/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 8d9d8c324b..dea25effa9 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -480,7 +480,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Facto FIXME("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p stub!\n", iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) -- 2.19.1

2 3

[PATCH] d3d10core/tests: Add test for rendering to A8_UNORM texture.
by Józef Kucia 18 Oct '18

18 Oct '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 105 +++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 777384558d64..0e8a63a60f69 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -727,6 +727,11 @@ static void *get_readback_data(struct resource_readback *rb, unsigned int x, uns return (BYTE *)rb->map_desc.pData + y * rb->map_desc.RowPitch + x * byte_width; } +static BYTE get_readback_byte(struct resource_readback *rb, unsigned int x, unsigned int y) +{ + return *(BYTE *)get_readback_data(rb, x, y, sizeof(BYTE)); +} + static DWORD get_readback_color(struct resource_readback *rb, unsigned int x, unsigned int y) { return *(DWORD *)get_readback_data(rb, x, y, sizeof(DWORD)); @@ -779,6 +784,40 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne return color; } +#define check_readback_data_byte(a, b, c, d) check_readback_data_byte_(__LINE__, a, b, c, d) +static void check_readback_data_byte_(unsigned int line, struct resource_readback *rb, + const RECT *rect, BYTE expected_value, BYTE max_diff) +{ + unsigned int x = 0, y = 0; + BOOL all_match = TRUE; + RECT default_rect; + BYTE value = 0; + + if (!rect) + { + SetRect(&default_rect, 0, 0, rb->width, rb->height); + rect = &default_rect; + } + + for (y = rect->top; y < rect->bottom; ++y) + { + for (x = rect->left; x < rect->right; ++x) + { + value = get_readback_byte(rb, x, y); + if (!compare_color(value, expected_value, max_diff)) + { + all_match = FALSE; + break; + } + } + if (!all_match) + break; + } + ok_(__FILE__, line)(all_match, + "Got 0x%02x, expected 0x%02x at (%u, %u), sub-resource %u.\n", + value, expected_value, x, y, rb->sub_resource_idx); +} + #define check_readback_data_color(a, b, c, d) check_readback_data_color_(__LINE__, a, b, c, d) static void check_readback_data_color_(unsigned int line, struct resource_readback *rb, const RECT *rect, DWORD expected_color, BYTE max_diff) @@ -17340,6 +17379,71 @@ static void test_staging_buffers(void) release_test_context(&test_context); } +static void test_render_a8(void) +{ + static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; + struct d3d10core_test_context test_context; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + struct resource_readback rb; + ID3D10Texture2D *texture; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + void main(out float4 target : SV_Target) + { + target = float4(0.0f, 0.25f, 0.5f, 1.0f); + } +#endif + 0x43425844, 0x8a06129f, 0x3041bde2, 0x09389749, 0xb339ba8b, 0x00000001, 0x000000b0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3e800000, 0x3f000000, 0x3f800000, 0x0100003e, + }; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_A8_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create render target view, hr %#x.\n", hr); + + for (i = 0; i < 2; ++i) + { + ID3D10Device_ClearRenderTargetView(device, rtv, black); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + check_readback_data_byte(&rb, NULL, 0xff, 0); + release_resource_readback(&rb); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, black); + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + draw_quad(&test_context); + check_texture_sub_resource_color(test_context.backbuffer, 0, NULL, 0xff7f4000, 1); + } + + ID3D10PixelShader_Release(ps); + ID3D10Texture2D_Release(texture); + ID3D10RenderTargetView_Release(rtv); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -17449,6 +17553,7 @@ START_TEST(d3d10core) queue_test(test_multisample_resolve); queue_test(test_depth_clip); queue_test(test_staging_buffers); + queue_test(test_render_a8); run_queued_tests(); -- 2.18.1

3 2

[PATCH 2/3] d3d11/tests: Add test for initial texture data.
by Józef Kucia 18 Oct '18

18 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45996 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 135 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 74b429f6e395..010139c7e0dc 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11565,6 +11565,140 @@ static void test_fragment_coords(void) release_test_context(&test_context); } +static void test_initial_texture_data(void) +{ + ID3D11Texture2D *texture, *staging_texture; + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11SamplerState *sampler_state; + ID3D11ShaderResourceView *ps_srv; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xffffffff, 0xff000000, 0xffffffff, 0xff000000, + 0xff00ff00, 0xff0000ff, 0xff00ffff, 0x00000000, + 0xffffff00, 0xffff0000, 0xffff00ff, 0x00000000, + 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + texture_desc.BindFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &staging_texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.CPUAccessFlags = 0; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + ID3D11DeviceContext_CopyResource(context, (ID3D11Resource *)texture, (ID3D11Resource *)staging_texture); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &ps_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(hr == S_OK, "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, &ps_srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + draw_quad(&test_context); + 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(ps_srv); + ID3D11Texture2D_Release(staging_texture); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_update_subresource(void) { struct d3d11_test_context test_context; @@ -28454,6 +28588,7 @@ START_TEST(d3d11) queue_test(test_il_append_aligned); queue_test(test_instance_id); queue_test(test_fragment_coords); + queue_test(test_initial_texture_data); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); queue_test(test_copy_subresource_region_1d); -- 2.18.1

3 2

[PATCH 3/3] d3d10core/tests: Add test for initial texture data.
by Józef Kucia 18 Oct '18

18 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45996 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 133 +++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 777384558d64..e4d353ac69e1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -8913,6 +8913,138 @@ static void test_fragment_coords(void) release_test_context(&test_context); } +static void test_initial_texture_data(void) +{ + ID3D10Texture2D *texture, *staging_texture; + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10SamplerState *sampler_state; + ID3D10ShaderResourceView *ps_srv; + D3D10_SAMPLER_DESC sampler_desc; + struct resource_readback rb; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i, j; + DWORD color; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t; + SamplerState s; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + return t.Sample(s, p); + } +#endif + 0x43425844, 0x1ce9b612, 0xc8176faa, 0xd37844af, 0xdb515605, 0x00000001, 0x00000134, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000098, 0x00000040, + 0x00000026, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, + 0x00000001, 0x0a000038, 0x00100032, 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x00000000, 0x00000000, 0x09000045, 0x001020f2, 0x00000000, 0x00100046, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, + }; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + static const DWORD bitmap_data[] = + { + 0xffffffff, 0xff000000, 0xffffffff, 0xff000000, + 0xff00ff00, 0xff0000ff, 0xff00ffff, 0x00000000, + 0xffffff00, 0xffff0000, 0xffff00ff, 0x00000000, + 0xff000000, 0xff7f7f7f, 0xffffffff, 0x00000000, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 4; + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_STAGING; + texture_desc.CPUAccessFlags = D3D10_CPU_ACCESS_WRITE; + texture_desc.BindFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * sizeof(*bitmap_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &staging_texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.CPUAccessFlags = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create 2d texture, hr %#x.\n", hr); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)texture, (ID3D10Resource *)staging_texture); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &ps_srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + sampler_desc.Filter = D3D10_FILTER_MIN_MAG_MIP_POINT; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_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 = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler_state); + ok(hr == S_OK, "Failed to create sampler state, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_code, sizeof(ps_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetShaderResources(device, 0, 1, &ps_srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + ID3D10Device_PSSetShader(device, ps); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + draw_quad(&test_context); + 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); + 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); + + ID3D10PixelShader_Release(ps); + ID3D10SamplerState_Release(sampler_state); + ID3D10ShaderResourceView_Release(ps_srv); + ID3D10Texture2D_Release(staging_texture); + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_update_subresource(void) { struct d3d10core_test_context test_context; @@ -17395,6 +17527,7 @@ START_TEST(d3d10core) queue_test(test_il_append_aligned); queue_test(test_instance_id); queue_test(test_fragment_coords); + queue_test(test_initial_texture_data); queue_test(test_update_subresource); queue_test(test_copy_subresource_region); queue_test(test_copy_subresource_region_1d); -- 2.18.1

3 2

[PATCH 1/3] wined3d: Call wined3d_cs_emit_update_sub_resource() directly in wined3d_texture_create().
by Józef Kucia 18 Oct '18

18 Oct '18

Fixes a regression introduced by commit 490c6d548abab55ea0a3913d55eecd26f01d1949. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45996 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/texture.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2244db5cb6f6..b8e7ef034891 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3645,6 +3645,8 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct if (data) { unsigned int sub_count = level_count * layer_count; + unsigned int level, width, height, depth; + struct wined3d_box box; unsigned int i; for (i = 0; i < sub_count; ++i) @@ -3660,8 +3662,14 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct for (i = 0; i < sub_count; ++i) { - wined3d_device_update_sub_resource(device, &object->resource, - i, NULL, data[i].data, data[i].row_pitch, data[i].slice_pitch, 0); + level = i % object->level_count; + width = wined3d_texture_get_level_width(object, level); + height = wined3d_texture_get_level_height(object, level); + depth = wined3d_texture_get_level_depth(object, level); + wined3d_box_set(&box, 0, 0, width, height, 0, depth); + + wined3d_cs_emit_update_sub_resource(device->cs, &object->resource, + i, &box, data[i].data, data[i].row_pitch, data[i].slice_pitch); } } -- 2.18.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Implement early depth/stencil tests.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 2f72c5c05d79..bb70dd5935a4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3503,10 +3503,18 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - if (instruction->flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) - FIXME("Unhandled global flags %#x.\n", instruction->flags); + unsigned int flags = instruction->flags; + + if (flags & VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL) + { + vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeEarlyFragmentTests, NULL, 0); + flags &= ~VKD3DSGF_FORCE_EARLY_DEPTH_STENCIL; + } + + if (flags & ~(VKD3DSGF_REFACTORING_ALLOWED | VKD3DSGF_ENABLE_RAW_AND_STRUCTURED_BUFFERS)) + FIXME("Unhandled global flags %#x.\n", flags); else - WARN("Unhandled global flags %#x.\n", instruction->flags); + WARN("Unhandled global flags %#x.\n", flags); } static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compiler, -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Fix f32tof16 instruction.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 ++++++++----- tests/d3d12.c | 25 +++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9c51df14316e..41c49acd9270 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4760,12 +4760,13 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t instr_set_id, type_id, scalar_type_id, src_id, zero_id, constituents[2], result_id; + uint32_t instr_set_id, type_id, scalar_type_id, src_id, zero_id, constituents[2]; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, j; DWORD write_mask; - unsigned int i; instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); @@ -4773,7 +4774,7 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil zero_id = vkd3d_dxbc_compiler_get_constant_float(compiler, 0.0f); /* FIXME: Consider a single PackHalf2x16 intruction per 2 components. */ - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; @@ -4783,10 +4784,12 @@ static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compil constituents[1] = zero_id; src_id = vkd3d_spirv_build_op_composite_construct(builder, type_id, constituents, ARRAY_SIZE(constituents)); - result_id = vkd3d_spirv_build_op_ext_inst(builder, scalar_type_id, + components[j++] = vkd3d_spirv_build_op_ext_inst(builder, scalar_type_id, instr_set_id, GLSLstd450PackHalf2x16, &src_id, 1); - vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, write_mask, result_id); } + + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, + dst, vkd3d_component_type_from_data_type(dst->reg.data_type), components); } static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_compiler *compiler, diff --git a/tests/d3d12.c b/tests/d3d12.c index 0ef382f46103..a63e122f7232 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6608,6 +6608,29 @@ static void test_shader_instructions(void) 0x06000082, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_f32tof16 = {ps_f32tof16_code, sizeof(ps_f32tof16_code)}; + static const DWORD ps_f32tof16_2_code[] = + { +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + f32tof16 r0.xyzw, r0.wzyx + mov o0.xyzw, r0.xyzw + ret +#endif + 0x43425844, 0x607c82d2, 0x940cc7c2, 0xe9de23c6, 0x696beb90, 0x00000001, 0x000000ec, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x05000082, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_f32tof16_2 = {ps_f32tof16_2_code, sizeof(ps_f32tof16_2_code)}; static const DWORD ps_imad_code[] = { #if 0 @@ -7355,6 +7378,8 @@ static void test_shader_instructions(void) {&ps_f32tof16, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0, 0x3c00, 0xbc00, 0x6134}}}, + {&ps_f32tof16_2, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0x6134, 0xbc00, 0x3c00, 0}}}, + {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}, {{ 0, 0, 0, 0}}}, {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {1, 2, 0, 0}}}, {{ 1, 2, 0, 0}}}, {&ps_imad, {{{2, 3, 4, 5}, {5, 5, 5, 5}, {0, 0, 0, 0}}}, {{10, 15, 20, 25}}}, -- 2.18.1

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Translate ld2dms instructions.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ac95bd3b343e..2f72c5c05d79 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5423,6 +5423,9 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, struct vkd3d_shader_image image; uint32_t image_operands[2]; DWORD coordinate_mask; + bool multisample; + + multisample = instruction->handler_idx == VKD3DSIH_LD2DMS; /* OpImageFetch must be used with a sampled image. */ vkd3d_dxbc_compiler_prepare_dummy_sampled_image(compiler, &image, &src[1].reg); @@ -5431,7 +5434,7 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, VKD3D_VEC4_SIZE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - if (image.resource_type_info->resource_type != VKD3D_SHADER_RESOURCE_BUFFER) + if (image.resource_type_info->resource_type != VKD3D_SHADER_RESOURCE_BUFFER && !multisample) { operands_mask |= SpvImageOperandsLodMask; image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, @@ -5443,6 +5446,13 @@ static void vkd3d_dxbc_compiler_emit_ld(struct vkd3d_dxbc_compiler *compiler, image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, instruction, image.resource_type_info); } + if (multisample) + { + operands_mask |= SpvImageOperandsSampleMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_load_src(compiler, + &src[2], VKD3DSP_WRITEMASK_0); + } + assert(image_operand_count <= ARRAY_SIZE(image_operands)); val_id = vkd3d_spirv_build_op_image_fetch(builder, type_id, image_id, coordinate_id, operands_mask, image_operands, image_operand_count); @@ -6490,6 +6500,7 @@ void vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler case VKD3DSIH_DSY_FINE: vkd3d_dxbc_compiler_emit_deriv_instruction(compiler, instruction); break; + case VKD3DSIH_LD2DMS: case VKD3DSIH_LD: vkd3d_dxbc_compiler_emit_ld(compiler, instruction); break; -- 2.18.1

2 1

[PATCH vkd3d 4/6] vkd3d-shader: Fix resinfo for multisample textures.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 41c49acd9270..ac95bd3b343e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6115,6 +6115,7 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile uint32_t constituents[VKD3D_VEC4_SIZE]; unsigned int i, size_component_count; struct vkd3d_shader_image image; + bool supports_mipmaps; vkd3d_spirv_enable_capability(builder, SpvCapabilityImageQuery); @@ -6122,24 +6123,20 @@ static void vkd3d_dxbc_compiler_emit_resinfo(struct vkd3d_dxbc_compiler *compile size_component_count = image.resource_type_info->coordinate_component_count; type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, size_component_count); - if (src[1].reg.type == VKD3DSPR_RESOURCE) + supports_mipmaps = src[1].reg.type != VKD3DSPR_UAV && !image.resource_type_info->ms; + if (supports_mipmaps) { lod_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_0); val_id = vkd3d_spirv_build_op_image_query_size_lod(builder, type_id, image.image_id, lod_id); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); miplevel_count_id = vkd3d_spirv_build_op_image_query_levels(builder, type_id, image.image_id); } - else if (src[1].reg.type == VKD3DSPR_UAV) + else { val_id = vkd3d_spirv_build_op_image_query_size(builder, type_id, image.image_id); /* For UAVs the returned miplevel count is always 1. */ miplevel_count_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 1); } - else - { - ERR("Unexpected register type %#x.\n", src[1].reg.type); - return; - } constituents[0] = val_id; for (i = 0; i < 3 - size_component_count; ++i) -- 2.18.1

2 1

[PATCH vkd3d 2/6] vkd3d-shader: Fix f16tof32 instruction.
by Józef Kucia 18 Oct '18

18 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 11 +++++++---- tests/d3d12.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1d97a98c2e80..9c51df14316e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4732,15 +4732,16 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; + uint32_t components[VKD3D_VEC4_SIZE]; + unsigned int i, j; DWORD write_mask; - unsigned int i; instr_set_id = vkd3d_spirv_get_glsl_std450_instr_set(builder); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 2); scalar_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, 1); /* FIXME: Consider a single UnpackHalf2x16 intruction per 2 components. */ - for (i = 0; i < VKD3D_VEC4_SIZE; ++i) + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) { if (!(write_mask = dst->write_mask & (VKD3DSP_WRITEMASK_0 << i))) continue; @@ -4748,10 +4749,12 @@ static void vkd3d_dxbc_compiler_emit_f16tof32(struct vkd3d_dxbc_compiler *compil src_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, write_mask); result_id = vkd3d_spirv_build_op_ext_inst(builder, type_id, instr_set_id, GLSLstd450UnpackHalf2x16, &src_id, 1); - result_id = vkd3d_spirv_build_op_composite_extract1(builder, + components[j++] = vkd3d_spirv_build_op_composite_extract1(builder, scalar_type_id, result_id, 0); - vkd3d_dxbc_compiler_emit_store_reg(compiler, &dst->reg, write_mask, result_id); } + + vkd3d_dxbc_compiler_emit_store_dst_components(compiler, + dst, vkd3d_component_type_from_data_type(dst->reg.data_type), components); } static void vkd3d_dxbc_compiler_emit_f32tof16(struct vkd3d_dxbc_compiler *compiler, diff --git a/tests/d3d12.c b/tests/d3d12.c index 34c4802f7fde..0ef382f46103 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -6567,6 +6567,29 @@ static void test_shader_instructions(void) 0x0500001c, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_f16tof32 = {ps_f16tof32_code, sizeof(ps_f16tof32_code)}; + static const DWORD ps_f16tof32_2_code[] = + { +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + dcl_temps 1 + mov r0.xyzw, cb0[0].xyzw + f16tof32 r0.xyzw, r0.wzyx + ftou o0.xyzw, r0.xyzw + ret +#endif + 0x43425844, 0x38472f03, 0x2c49b7dd, 0xc2d76bbf, 0xfc093e1d, 0x00000001, 0x000000ec, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000074, 0x00000050, 0x0000001d, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x06000036, 0x001000f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, + 0x05000083, 0x001000f2, 0x00000000, 0x001001b6, 0x00000000, 0x0500001c, 0x001020f2, 0x00000000, + 0x00100e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_f16tof32_2 = {ps_f16tof32_2_code, sizeof(ps_f16tof32_2_code)}; static const DWORD ps_f32tof16_code[] = { #if 0 @@ -7325,6 +7348,11 @@ static void test_shader_instructions(void) {&ps_f16tof32, {{{0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}}}, {{0, 1, 100, 250}}}, {&ps_f16tof32, {{{0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}}}, {{0, 1, 100, 250}}}, + {&ps_f16tof32_2, {{{0x00000000, 0x00003c00, 0x00005640, 0x00005bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f16tof32_2, {{{0x00010000, 0x00013c00, 0x00015640, 0x00015bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f16tof32_2, {{{0x000f0000, 0x000f3c00, 0x000f5640, 0x000f5bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f16tof32_2, {{{0xffff0000, 0xffff3c00, 0xffff5640, 0xffff5bd0}}}, {{250, 100, 1, 0}}}, + {&ps_f32tof16, {.f = {{0.0f, 1.0f, -1.0f, 666.0f}}}, {{0, 0x3c00, 0xbc00, 0x6134}}}, {&ps_imad, {{{0, 0, 0, 0}, {0, 0, 0, 0}, {0, 0, 0, 0}}}, {{ 0, 0, 0, 0}}}, -- 2.18.1

2 1

← Newer
1
...
27
28
29
30
31
32
33
...
61
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 October 2018