June 2021 - Wine-devel - list.winehq.org

[PATCH] wined3d: Add decompression information for BC4_UNORM.
by Henri Verbeet 22 Jun '21

22 Jun '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 153 ++++++++++++++++++++++++++++++ dlls/d3d11/tests/d3d11.c | 155 +++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 81 +++++++++++++++- 3 files changed, 387 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index cc30b439d2b..1eee482cc8f 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -18935,6 +18935,158 @@ static void test_unbound_streams(void) release_test_context(&test_context); } +static void test_texture_compressed_3d(void) +{ + struct d3d10core_test_context test_context; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE3D_DESC texture_desc; + ID3D10SamplerState *sampler_state; + unsigned int idx, r0, r1, x, y, z; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10ShaderResourceView *srv; + struct resource_readback rb; + ID3D10Texture3D *texture; + DWORD colour, expected; + ID3D10PixelShader *ps; + ID3D10Device *device; + DWORD *texture_data; + BOOL equal = TRUE; + 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 unsigned int block_indices[] = + { + 0, 1, 3, 2, + 6, 7, 5, 4, + 0, 1, 3, 2, + 6, 7, 5, 4, + }; + + 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, "Got unexpected hr %#x.\n", hr); + + /* Simply test all combinations of r0 and r1. */ + texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + for (r1 = 0; r1 < 256; ++r1) + { + for (r0 = 0; r0 < 256; ++r0) + { + /* bits = block_indices[] */ + texture_data[(r1 * 256 + r0) * 2 + 0] = 0xe4c80000 | (r1 << 8) | r0; + texture_data[(r1 * 256 + r0) * 2 + 1] = 0x97e4c897; + } + } + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = 64 * sizeof(UINT64); + resource_data.SysMemSlicePitch = 64 * resource_data.SysMemPitch; + + texture_desc.Width = 256; + texture_desc.Height = 256; + texture_desc.Depth = 16; + texture_desc.MipLevels = 1; + texture_desc.Format = DXGI_FORMAT_BC4_UNORM; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D10Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + heap_free(texture_data); + + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Got unexpected 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, "Got unexpected hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler_state); + + for (z = 0; z < 16; ++z) + { + draw_quad_z(&test_context, (z * 2.0f + 1.0f) / 32.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + idx = z * 64 * 64 + (y / 4) * 64 + (x / 4); + r0 = idx % 256; + r1 = idx / 256; + + switch (block_indices[(y % 4) * 4 + (x % 4)]) + { + case 0: expected = r0; break; + case 1: expected = r1; break; + case 2: expected = r0 > r1 ? (12 * r0 + 2 * r1 + 7) / 14 : (8 * r0 + 2 * r1 + 5) / 10; break; + case 3: expected = r0 > r1 ? (10 * r0 + 4 * r1 + 7) / 14 : (6 * r0 + 4 * r1 + 5) / 10; break; + case 4: expected = r0 > r1 ? ( 8 * r0 + 6 * r1 + 7) / 14 : (4 * r0 + 6 * r1 + 5) / 10; break; + case 5: expected = r0 > r1 ? ( 6 * r0 + 8 * r1 + 7) / 14 : (2 * r0 + 8 * r1 + 5) / 10; break; + case 6: expected = r0 > r1 ? ( 4 * r0 + 10 * r1 + 7) / 14 : 0x00; break; + case 7: expected = r0 > r1 ? ( 2 * r0 + 12 * r1 + 7) / 14 : 0xff; break; + default: expected = ~0u; break; + } + expected |= 0xff000000; + colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256); + if (!(equal = compare_color(colour, expected, 2))) + break; + } + if (!equal) + break; + } + release_resource_readback(&rb); + if (!equal) + break; + } + ok(equal, "Got unexpected colour 0x%08x at (%u, %u, %u), expected 0x%08x.\n", colour, x, y, z, expected); + + ID3D10PixelShader_Release(ps); + ID3D10SamplerState_Release(sampler_state); + ID3D10ShaderResourceView_Release(srv); + ID3D10Texture3D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d10core) { unsigned int argc, i; @@ -19060,6 +19212,7 @@ START_TEST(d3d10core) queue_test(test_independent_blend); queue_test(test_dual_source_blend); queue_test(test_unbound_streams); + queue_test(test_texture_compressed_3d); run_queued_tests(); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ae48e9748c9..2d66f9bde73 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -33285,6 +33285,160 @@ static void test_deferred_context_map(void) release_test_context(&test_context); } +static void test_texture_compressed_3d(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + D3D11_TEXTURE3D_DESC texture_desc; + ID3D11SamplerState *sampler_state; + unsigned int idx, r0, r1, x, y, z; + D3D11_SAMPLER_DESC sampler_desc; + ID3D11ShaderResourceView *srv; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Texture3D *texture; + DWORD colour, expected; + ID3D11PixelShader *ps; + ID3D11Device *device; + DWORD *texture_data; + BOOL equal = TRUE; + 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 unsigned int block_indices[] = + { + 0, 1, 3, 2, + 6, 7, 5, 4, + 0, 1, 3, 2, + 6, 7, 5, 4, + }; + + if (!init_test_context(&test_context, NULL)) + return; + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + /* Simply test all combinations of r0 and r1. */ + texture_data = heap_alloc(256 * 256 * sizeof(UINT64)); + for (r1 = 0; r1 < 256; ++r1) + { + for (r0 = 0; r0 < 256; ++r0) + { + /* bits = block_indices[] */ + texture_data[(r1 * 256 + r0) * 2 + 0] = 0xe4c80000 | (r1 << 8) | r0; + texture_data[(r1 * 256 + r0) * 2 + 1] = 0x97e4c897; + } + } + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = 64 * sizeof(UINT64); + resource_data.SysMemSlicePitch = 64 * resource_data.SysMemPitch; + + texture_desc.Width = 256; + texture_desc.Height = 256; + texture_desc.Depth = 16; + texture_desc.MipLevels = 1; + texture_desc.Format = DXGI_FORMAT_BC4_UNORM; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture3D(device, &texture_desc, &resource_data, &texture); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + heap_free(texture_data); + + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(hr == S_OK, "Got unexpected 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, "Got unexpected hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetSamplers(context, 0, 1, &sampler_state); + + for (z = 0; z < 16; ++z) + { + draw_quad_z(&test_context, (z * 2.0f + 1.0f) / 32.0f); + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 256; ++y) + { + for (x = 0; x < 256; ++x) + { + idx = z * 64 * 64 + (y / 4) * 64 + (x / 4); + r0 = idx % 256; + r1 = idx / 256; + + switch (block_indices[(y % 4) * 4 + (x % 4)]) + { + case 0: expected = r0; break; + case 1: expected = r1; break; + case 2: expected = r0 > r1 ? (12 * r0 + 2 * r1 + 7) / 14 : (8 * r0 + 2 * r1 + 5) / 10; break; + case 3: expected = r0 > r1 ? (10 * r0 + 4 * r1 + 7) / 14 : (6 * r0 + 4 * r1 + 5) / 10; break; + case 4: expected = r0 > r1 ? ( 8 * r0 + 6 * r1 + 7) / 14 : (4 * r0 + 6 * r1 + 5) / 10; break; + case 5: expected = r0 > r1 ? ( 6 * r0 + 8 * r1 + 7) / 14 : (2 * r0 + 8 * r1 + 5) / 10; break; + case 6: expected = r0 > r1 ? ( 4 * r0 + 10 * r1 + 7) / 14 : 0x00; break; + case 7: expected = r0 > r1 ? ( 2 * r0 + 12 * r1 + 7) / 14 : 0xff; break; + default: expected = ~0u; break; + } + expected |= 0xff000000; + colour = get_readback_color(&rb, (x * 640 + 128) / 256, (y * 480 + 128) / 256, 0); + if (!(equal = compare_color(colour, expected, 2))) + break; + } + if (!equal) + break; + } + release_resource_readback(&rb); + if (!equal) + break; + } + ok(equal, "Got unexpected colour 0x%08x at (%u, %u, %u), expected 0x%08x.\n", colour, x, y, z, expected); + + ID3D11PixelShader_Release(ps); + ID3D11SamplerState_Release(sampler_state); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture3D_Release(texture); + release_test_context(&test_context); +} + START_TEST(d3d11) { unsigned int argc, i; @@ -33457,6 +33611,7 @@ START_TEST(d3d11) queue_test(test_deferred_context_rendering); queue_test(test_deferred_context_map); queue_test(test_unbound_streams); + queue_test(test_texture_compressed_3d); run_queued_tests(); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 6e388e66862..4019dd4d812 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -568,6 +568,84 @@ static void decompress_bc1(const BYTE *src, BYTE *dst, unsigned int src_row_pitc dst_slice_pitch, width, height, depth, WINED3DFMT_BC1_UNORM); } +static void build_rgtc_colour_table(uint8_t red0, uint8_t red1, uint8_t colour_table[8]) +{ + unsigned int i; + + colour_table[0] = red0; + colour_table[1] = red1; + if (red0 <= red1) + { + for (i = 0; i < 4; ++i) + { + colour_table[i + 2] = ((8 - 2 * i) * red0 + (2 + 2 * i) * red1 + 5) / 10; + } + colour_table[6] = 0x00; + colour_table[7] = 0xff; + } + else + { + for (i = 0; i < 6; ++i) + { + colour_table[i + 2] = ((12 - 2 * i) * red0 + (2 + 2 * i) * red1 + 7) / 14; + } + } +} + +static void decompress_rgtc_block(const uint8_t *src, uint8_t *dst, + unsigned int width, unsigned int height, unsigned int dst_row_pitch) +{ + const uint64_t *s = (const uint64_t *)src; + uint8_t red0, red1, red_idx; + uint8_t colour_table[8]; + unsigned int x, y; + uint32_t *dst_row; + uint64_t bits; + + red0 = s[0] & 0xff; + red1 = (s[0] >> 8) & 0xff; + bits = s[0] >> 16; + build_rgtc_colour_table(red0, red1, colour_table); + + for (y = 0; y < height; ++y) + { + dst_row = (uint32_t *)&dst[y * dst_row_pitch]; + for (x = 0; x < width; ++x) + { + red_idx = (bits >> (y * 12 + x * 3)) & 0x7; + /* Decompressing to bgra32 is perhaps not ideal for RGTC formats. + * It's convenient though. */ + dst_row[x] = 0xff000000 | (colour_table[red_idx] << 16); + } + } +} + +static void decompress_bc4(const uint8_t *src, uint8_t *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + unsigned int block_w, block_h, x, y, z; + const uint8_t *src_row, *src_slice; + uint8_t *dst_row, *dst_slice; + + for (z = 0; z < depth; ++z) + { + src_slice = &src[z * src_slice_pitch]; + dst_slice = &dst[z * dst_slice_pitch]; + for (y = 0; y < height; y += 4) + { + src_row = &src_slice[(y / 4) * src_row_pitch]; + dst_row = &dst_slice[y * dst_row_pitch]; + for (x = 0; x < width; x += 4) + { + block_w = min(width - x, 4); + block_h = min(height - y, 4); + decompress_rgtc_block(&src_row[(x / 4) * 8], &dst_row[x * 4], block_w, block_h, dst_row_pitch); + } + } + } +} + static const struct wined3d_format_decompress_info { enum wined3d_format_id id; @@ -585,6 +663,7 @@ format_decompress_info[] = {WINED3DFMT_BC1_UNORM, decompress_bc1}, {WINED3DFMT_BC2_UNORM, decompress_bc2}, {WINED3DFMT_BC3_UNORM, decompress_bc3}, + {WINED3DFMT_BC4_UNORM, decompress_bc4}, }; struct wined3d_format_block_info @@ -3683,8 +3762,6 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; format = get_format_gl_internal(adapter, WINED3DFMT_ATI2N); format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - format = get_format_gl_internal(adapter, WINED3DFMT_BC4_UNORM); - format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; format = get_format_gl_internal(adapter, WINED3DFMT_BC4_SNORM); format->f.flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; format = get_format_gl_internal(adapter, WINED3DFMT_BC5_UNORM); -- 2.20.1

2 1

[PATCH 1/5] wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
by Zebediah Figura 22 Jun '21

22 Jun '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This is scuffed, but ultimately this code path should go away anyway, and be replaced by an unconditional update_sub_resource. dlls/wined3d/buffer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12d038c0120..6cfeb4f510d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address bo; struct wined3d_box box; if (buffer->flags & WINED3D_BUFFER_USE_BO) @@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, } else { - wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); - memcpy(bo.addr, data->data, resource->size); + memcpy(buffer->resource.heap_memory, data->data, resource->size); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); } -- 2.30.2

2 9

[PATCH 1/2] mf/sar: Query for current padding before requesting sample buffer.
by Giovanni Mascellani 22 Jun '21

22 Jun '21

According to both MSDN and our impementation, GetBufferSize returns the size of the buffer, but it doesn't guarantee that all of it is available. In order to know how much of it is available, the caller must also call GetCurrentPadding and subtract that number to the buffer size. Failing to do so might result in GetBuffer returning an error. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/mf/sar.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77cbfcb21da..eba822ae0fe 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1751,7 +1751,7 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; @@ -1775,20 +1775,24 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul { if (SUCCEEDED(IAudioClient_GetBufferSize(renderer->audio_client, &max_frames))) { - src_frames -= obj->u.sample.frame_offset; - dst_frames = min(src_frames, max_frames); - - if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + if (SUCCEEDED(IAudioClient_GetCurrentPadding(renderer->audio_client, &pad_frames))) { - memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, - dst_frames * renderer->frame_size); + max_frames -= pad_frames; + src_frames -= obj->u.sample.frame_offset; + dst_frames = min(src_frames, max_frames); - IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); + if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + { + memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, + dst_frames * renderer->frame_size); - obj->u.sample.frame_offset += dst_frames; - } + IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); - keep_sample = FAILED(hr) || src_frames > max_frames; + obj->u.sample.frame_offset += dst_frames; + } + + keep_sample = FAILED(hr) || src_frames > max_frames; + } } } IMFMediaBuffer_Unlock(buffer); -- 2.32.0

2 5

[PATCH v3 2/2] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 40 +++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 6f4f118257f..a200e40451e 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1055,8 +1055,44 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.2

1 0

[PATCH v3 1/2] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

I've already sent them once, some feedback would be appreciated. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 55 +++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 231ef753f22..6f4f118257f 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -1066,8 +1066,59 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to CreateWave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + ERR("Failed to allocate XACT3WaveImpl!"); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.30.2

1 0

[PATCH v2 2/2 resend] xactengine3_7: Implement IXACT3Engine PrepareInMemoryWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 39 +++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 913cabe1e48..a3a0e490024 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -974,8 +974,43 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareInMemoryWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %p, %d, %d, %p)\n", This, dwFlags, &entry, pdwSeekTable, + pbWaveData, dwPlayOffset, nLoopCount, ppWave); + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + ret = FACTAudioEngine_PrepareInMemoryWave(This->fact_engine, dwFlags, fact_wavebank, + pdwSeekTable, pbWaveData, dwPlayOffset, nLoopCount, &fwave); + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, -- 2.30.0

2 1

[PATCH v2 1/2 resend] xactengine3_7: Implement IXACT3Engine PrepareStreamingWave
by Alistair Leslie-Hughes 22 Jun '21

22 Jun '21

I've already sent them once, some feedback would be appreciated. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xactengine3_7/xact_dll.c | 54 +++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 8b9ee33ab5c..913cabe1e48 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -985,8 +985,58 @@ static HRESULT WINAPI IXACT3EngineImpl_PrepareStreamingWave(IXACT3Engine *iface, IXACT3Wave **ppWave) { XACT3EngineImpl *This = impl_from_IXACT3Engine(iface); - FIXME("(%p): stub!\n", This); - return E_NOTIMPL; + XACT3WaveImpl *wave; + FACTWave *fwave = NULL; + FACTStreamingParameters fakeParms; + wrap_readfile_struct *fake; + FACTWaveBankEntry fact_wavebank; + UINT ret; + + TRACE("(%p)->(0x%08x, %p, %p, %d, %p, %d, %d, %p)\n", This, dwFlags, &entry, &streamingParams, + dwAlignment, pdwSeekTable, dwPlayOffset, nLoopCount, ppWave); + + fake = (wrap_readfile_struct*) CoTaskMemAlloc( + sizeof(wrap_readfile_struct)); + fake->engine = This; + fake->file = streamingParams.file; + fakeParms.file = fake; + fakeParms.flags = streamingParams.flags; + fakeParms.offset = streamingParams.offset; + fakeParms.packetSize = streamingParams.packetSize; + + fact_wavebank.dwFlagsAndDuration = entry.u.dwFlagsAndDuration; + fact_wavebank.Format.dwValue = entry.Format.dwValue; + fact_wavebank.PlayRegion.dwOffset = entry.PlayRegion.dwOffset; + fact_wavebank.PlayRegion.dwLength = entry.PlayRegion.dwLength; + fact_wavebank.LoopRegion.dwStartSample = entry.LoopRegion.dwStartSample; + fact_wavebank.LoopRegion.dwTotalSamples = entry.LoopRegion.dwTotalSamples; + + /* FAudio Prototype is incorrect and shouldn't take a buffer as an parameter, + * passing through NULL to ensure it's not used. + */ + ret = FACTAudioEngine_PrepareStreamingWave(This->fact_engine, dwFlags, fact_wavebank, fakeParms, + dwAlignment, pdwSeekTable, NULL, dwPlayOffset, nLoopCount, &fwave); + + if(ret != 0 || !fwave) + { + ERR("Failed to create a wave: %d (%p)\n", ret, fwave); + return E_FAIL; + } + + wave = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*wave)); + if (!wave) + { + FACTWave_Destroy(fwave); + return E_OUTOFMEMORY; + } + + wave->IXACT3Wave_iface.lpVtbl = &XACT3Wave_Vtbl; + wave->fact_wave = fwave; + *ppWave = &wave->IXACT3Wave_iface; + + TRACE("Created Wave: %p\n", wave); + + return S_OK; } static HRESULT WINAPI IXACT3EngineImpl_PrepareWave(IXACT3Engine *iface, -- 2.30.0

2 1

[PATCH v2] mf/sar: Process the queue as soon as a sample is available.
by Giovanni Mascellani 22 Jun '21

22 Jun '21

The IAudioClient implementation from both Windows and winepulse.drv never sets the event more than once per period, which is usually around 10 ms long. Some codecs produce audio samples shorter than 10 ms, which currently result into the SAR not being able to keep up with the audio client, because the SAR never requests more than a sample per event cycle. This patch causes the event to be set each time a sample is received; this way the queue is immediately processed, and if required a new sample is immediately requested, instead of having to wait for the next IAudioClient period. Of course it would be even better if the codecs didn't generate too short samples, because they uselessly require more CPU cycles, but we should handle them properly anyway. This patch fixes audio stuttering problems in the logo videos of Borderlands 3, Deep Rock Galactic and Mutant Year Zero. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- v2: Remove some changes that didn't really help the solution and update the description accordingly. dlls/mf/sar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index eba822ae0fe..6218eec54bb 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1360,6 +1360,7 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, if (renderer->state == STREAM_STATE_RUNNING) hr = stream_queue_sample(renderer, sample); renderer->flags &= ~SAR_SAMPLE_REQUESTED; + SetEvent(renderer->buffer_ready_event); LeaveCriticalSection(&renderer->cs); return hr; -- 2.32.0

1 1

[PATCH resend v2] winevulkan: Fix bit field struct members.
by Georg Lehmann 22 Jun '21

22 Jun '21

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b7d57b8218d..e8534cbd5f5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1078,7 +1078,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None): + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -1090,6 +1090,7 @@ class VkMember(object): self.optional = optional self.values = values self.object_type = object_type + self.bit_width = bit_width def __eq__(self, other): """ Compare member based on name against a string. @@ -1116,6 +1117,7 @@ class VkMember(object): member_type = None pointer = None array_len = None + bit_width = None values = member.get("values") @@ -1161,8 +1163,14 @@ class VkMember(object): object_type = member.get("objecttype", None) + # Some members are bit field values: + # <member><type>uint32_t</type> <name>mask</name>:8</member> + if name_elem.tail and name_elem.tail[0] == ':': + LOGGER.debug("Found bit field") + bit_width = int(name_elem.tail[1:]) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type, bit_width=bit_width) def copy(self, input, output, direction, conv): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1267,6 +1275,9 @@ class VkMember(object): if self.is_static_array(): text += "[{0}]".format(self.array_len) + if self.is_bit_field(): + text += ":{}".format(self.bit_width) + return text def get_conversions(self): @@ -1344,6 +1355,9 @@ class VkMember(object): return self.object_type != None and self.type == "uint64_t" + def is_bit_field(self): + return self.bit_width is not None + def needs_alignment(self): """ Check if this member needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due -- 2.32.0

1 0

[PATCH] pdh/tests: Skip a test that crashes on Windows 10 >= 2004.
by Francois Gouget 22 Jun '21

22 Jun '21

Starting with Windows 10 2004 PdhMakeCounterPathA() does not check the query handle before using it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the crashes on Windows 10 >= 2004. https://test.winehq.org/data/patterns.html#pdh:pdh I have kept the PdhMakeCounterPathA/W() handle check in Wine for backward compatibility though I doubt applications actually depend on that. Let me know if the check should be removed. --- dlls/pdh/tests/pdh.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/pdh/tests/pdh.c b/dlls/pdh/tests/pdh.c index 8165f32f50a..928714475bb 100644 --- a/dlls/pdh/tests/pdh.c +++ b/dlls/pdh/tests/pdh.c @@ -867,9 +867,11 @@ static void test_PdhMakeCounterPathA(void) ret = PdhMakeCounterPathA(NULL, NULL, &buflen, 0); ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); + if (0) { /* Crashes on Windows 10 >= 2004 */ buflen = 0; ret = PdhMakeCounterPathA(NULL, buffer, &buflen, 0); ok(ret == PDH_INVALID_ARGUMENT, "PdhMakeCounterPathA failed 0x%08x\n", ret); + } buflen = sizeof(buffer); memset(&e, 0, sizeof(e)); -- 2.20.1

1 0