April 2020 - Wine-Devel - list.winehq.org

[PATCH 5/5] d3dcompiler: Set the x-dimension for struct types.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 11 ++++++++++- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index a33ea588ccf..9ef0b130d3d 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -839,6 +839,13 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s return list; } +static DWORD get_array_size(const struct hlsl_type *type) +{ + if (type->type == HLSL_CLASS_ARRAY) + return get_array_size(type->e.array.type) * type->e.array.elements_count; + return 1; +} + static struct hlsl_type *new_struct_type(const char *name, struct list *fields) { struct hlsl_type *type = d3dcompiler_alloc(sizeof(*type)); @@ -853,13 +860,15 @@ static struct hlsl_type *new_struct_type(const char *name, struct list *fields) type->type = HLSL_CLASS_STRUCT; type->base_type = HLSL_TYPE_VOID; type->name = name; - type->dimx = type->dimy = 1; + type->dimx = 0; + type->dimy = 1; type->e.elements = fields; LIST_FOR_EACH_ENTRY(field, fields, struct hlsl_struct_field, entry) { field->reg_offset = reg_size; reg_size += field->type->reg_size; + type->dimx += field->type->dimx * field->type->dimy * get_array_size(field->type); } type->reg_size = reg_size; diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 093e6b3010d..c8cf86d05c4 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -889,7 +889,7 @@ static void test_constant_table(void) "uniform struct\n" "{\n" " float2x2 a;\n" - " float b;\n" + " float b[2];\n" " float c;\n" "#pragma pack_matrix(row_major)\n" " float2x2 d;\n" @@ -919,7 +919,7 @@ static void test_constant_table(void) {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, - {"f", D3DXRS_FLOAT4, 0, 6, D3DXPC_STRUCT, D3DXPT_VOID, 1, 10, 1, 4, 40}, + {"f", D3DXRS_FLOAT4, 0, 7, D3DXPC_STRUCT, D3DXPT_VOID, 1, 11, 1, 4, 44}, {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40}, {"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36}, {"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36}, @@ -928,7 +928,7 @@ static void test_constant_table(void) static const D3DXCONSTANT_DESC expect_fields_f[] = { {"a", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_COLUMNS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, - {"b", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, + {"b", D3DXRS_FLOAT4, 0, 2, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 2, 0, 8}, {"c", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 1, 0, 4}, {"d", D3DXRS_FLOAT4, 0, 2, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 2, 2, 1, 0, 16}, }; -- 2.26.2

April 30, 2020

[PATCH 4/5] d3dcompiler: Set the dimensions for array types.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/tests/hlsl_d3d9.c | 6 +++--- dlls/d3dcompiler_43/utils.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c index 9ebc42147e3..093e6b3010d 100644 --- a/dlls/d3dcompiler_43/tests/hlsl_d3d9.c +++ b/dlls/d3dcompiler_43/tests/hlsl_d3d9.c @@ -894,12 +894,12 @@ static void test_constant_table(void) "#pragma pack_matrix(row_major)\n" " float2x2 d;\n" "} f;\n" - "uniform float g[5];\n" + "uniform float2 g[5];\n" "uniform matrix_t i;\n" "uniform struct matrix_record j;\n" "float4 main(uniform float4 h) : COLOR\n" "{\n" - " return a + b + c._31 + d._31 + f.d._22 + g[e] + h + i._33 + j.a._33;\n" + " return a + b + c._31 + d._31 + f.d._22 + g[e].x + h + i._33 + j.a._33;\n" "}"; D3DXCONSTANTTABLE_DESC table_desc; @@ -920,7 +920,7 @@ static void test_constant_table(void) {"d", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 1, 1, 0, 12}, {"e", D3DXRS_FLOAT4, 0, 1, D3DXPC_SCALAR, D3DXPT_INT, 1, 1, 1, 0, 4}, {"f", D3DXRS_FLOAT4, 0, 6, D3DXPC_STRUCT, D3DXPT_VOID, 1, 10, 1, 4, 40}, - {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_SCALAR, D3DXPT_FLOAT, 1, 1, 5, 0, 20}, + {"g", D3DXRS_FLOAT4, 0, 5, D3DXPC_VECTOR, D3DXPT_FLOAT, 1, 2, 5, 0, 40}, {"i", D3DXRS_FLOAT4, 0, 3, D3DXPC_MATRIX_ROWS, D3DXPT_FLOAT, 3, 3, 1, 0, 36}, {"j", D3DXRS_FLOAT4, 0, 3, D3DXPC_STRUCT, D3DXPT_VOID, 1, 9, 1, 1, 36}, }; diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 8537e193db4..c1bd51dcba0 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -841,6 +841,8 @@ struct hlsl_type *new_array_type(struct hlsl_type *basic_type, unsigned int arra type->e.array.elements_count = array_size; type->e.array.type = basic_type; type->reg_size = basic_type->reg_size * array_size; + type->dimx = basic_type->dimx; + type->dimy = basic_type->dimy; return type; } -- 2.26.2

April 30, 2020

[PATCH 3/5] d3dcompiler: Respect arrays in struct fields.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 47889704edc..a33ea588ccf 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -820,7 +820,10 @@ static struct list *gen_struct_fields(struct hlsl_type *type, DWORD modifiers, s d3dcompiler_free(v); return list; } - field->type = type; + if (v->array_size) + field->type = new_array_type(type, v->array_size); + else + field->type = type; field->name = v->name; field->modifiers = modifiers; field->semantic = v->semantic; -- 2.26.2

April 30, 2020

[PATCH 2/5] d3dcompiler: Set the struct base type to HLSL_TYPE_VOID.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5a4e9077d5f..47889704edc 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -848,6 +848,7 @@ static struct hlsl_type *new_struct_type(const char *name, struct list *fields) return NULL; } type->type = HLSL_CLASS_STRUCT; + type->base_type = HLSL_TYPE_VOID; type->name = name; type->dimx = type->dimy = 1; type->e.elements = fields; -- 2.26.2

April 30, 2020

[PATCH 1/5] d3dcompiler: Fix matrix dimension declaration and access.

by Zebediah Figura

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3dcompiler_43/hlsl.y | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 1b6e31e4964..5a4e9077d5f 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -214,7 +214,7 @@ static void declare_predefined_types(struct hlsl_scope *scope) { for (x = 1; x <= 4; ++x) { - sprintf(name, "%s%ux%u", names[bt], x, y); + sprintf(name, "%s%ux%u", names[bt], y, x); type = new_hlsl_type(d3dcompiler_strdup(name), HLSL_CLASS_MATRIX, bt, x, y); add_type_to_scope(scope, type); @@ -425,13 +425,13 @@ static struct hlsl_ir_swizzle *get_swizzle(struct hlsl_ir_node *value, const cha { if (swizzle[i + 1] != 'm') return NULL; - x = swizzle[i + 2] - '0'; - y = swizzle[i + 3] - '0'; + y = swizzle[i + 2] - '0'; + x = swizzle[i + 3] - '0'; } else { - x = swizzle[i + 1] - '1'; - y = swizzle[i + 2] - '1'; + y = swizzle[i + 1] - '1'; + x = swizzle[i + 2] - '1'; } if (x >= value->data_type->dimx || y >= value->data_type->dimy) -- 2.26.2

April 30, 2020

Re: [PATCH 3/4] quartz/vmr9: Retrieve a default format if none is given in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelpe

by Zebediah Figura

On 4/29/20 8:51 PM, Marvin wrote: > Hi, > > While running your changed tests, I think I found new failures. > Being a bot and all I'm not very good at pattern recognition, so I might be > wrong, but could you please double-check? > > Full results can be found at: > https://testbot.winehq.org/JobDetails.pl?Key=70889 > > Your paranoid android. > > > === w1064v1809 (32 bit report) === > > quartz: > vmr9.c:2134: Test failed: Got unexpected status 0. > vmr9.c:2137: Test failed: Wait timed out. > vmr9.c:2145: Test failed: Got unexpected status 0x400040. > This seems to be an unrelated failure. Looks like I need to increase more timeouts...

April 30, 2020

Re: [PATCH 3/4] quartz/vmr9: Retrieve a default format if none is given in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelpe

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=70889 Your paranoid android. === w1064v1809 (32 bit report) === quartz: vmr9.c:2134: Test failed: Got unexpected status 0. vmr9.c:2137: Test failed: Wait timed out. vmr9.c:2145: Test failed: Got unexpected status 0x400040.

April 30, 2020

[PATCH 4/4] quartz/vmr9: Improve tracing in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index f4faf2f97a8..f611a3a7cf0 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2107,11 +2107,15 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa DWORD i; HRESULT hr = S_OK; - FIXME("(%p/%p)->(%p, %p => %u, %p) semi-stub\n", iface, This, allocinfo, numbuffers, (numbuffers ? *numbuffers : 0), surface); + TRACE("filter %p, allocinfo %p, numbuffers %p, surface %p.\n", This, numbuffers, allocinfo, surface); if (!allocinfo || !numbuffers || !surface) return E_POINTER; + TRACE("Flags %#x, size %ux%u, format %u (%#x), pool %u, minimum buffers %u.\n", + allocinfo->dwFlags, allocinfo->dwWidth, allocinfo->dwHeight, + allocinfo->Format, allocinfo->Format, allocinfo->Pool, allocinfo->MinBuffers); + if (!allocinfo->Format) { IDirect3DSurface9 *backbuffer; @@ -2126,19 +2130,19 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa if (!*numbuffers || *numbuffers < allocinfo->MinBuffers) { - ERR("Invalid number of buffers?\n"); + WARN("%u surfaces requested (minimum %u); returning E_INVALIDARG.\n", + *numbuffers, allocinfo->MinBuffers); return E_INVALIDARG; } if (!This->allocator_d3d9_dev) { - ERR("No direct3d device when requested to allocate a surface!\n"); + WARN("No Direct3D device; returning VFW_E_WRONG_STATE.\n"); return VFW_E_WRONG_STATE; } if (allocinfo->dwFlags == VMR9AllocFlag_OffscreenSurface) { - ERR("Creating offscreen surface\n"); for (i = 0; i < *numbuffers; ++i) { hr = IDirect3DDevice9_CreateOffscreenPlainSurface(This->allocator_d3d9_dev, allocinfo->dwWidth, allocinfo->dwHeight, @@ -2149,7 +2153,6 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa } else if (allocinfo->dwFlags == VMR9AllocFlag_TextureSurface) { - TRACE("Creating texture surface\n"); for (i = 0; i < *numbuffers; ++i) { IDirect3DTexture9 *texture; @@ -2178,6 +2181,9 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa return E_NOTIMPL; } + if (FAILED(hr)) + WARN("%u/%u surfaces allocated, hr %#x.\n", i, *numbuffers, hr); + if (i >= allocinfo->MinBuffers) { hr = S_OK; -- 2.26.2

April 30, 2020

[PATCH 3/4] quartz/vmr9: Retrieve a default format if none is given in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 22 ++++++++++++++++++++++ dlls/quartz/vmr9.c | 12 ++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index e01e9ad5572..dc9aeec834c 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2731,6 +2731,28 @@ static void test_allocate_surface_helper(void) ok(!surfaces[0], "Surface 0 was allocated.\n"); ok(!surfaces[1], "Surface 1 was allocated.\n"); + info.Format = 0; + info.dwFlags = VMR9AllocFlag_3DRenderTarget; + count = 1; + hr = IVMRSurfaceAllocatorNotify9_AllocateSurfaceHelper(notify, &info, &count, surfaces); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + ok(!!surfaces[0], "Surface 0 was not allocated.\n"); + ok(info.Format != 0, "Expected a format.\n"); + + hr = IDirect3DSurface9_GetDesc(surfaces[0], &desc); + ok(hr == D3D_OK, "Got hr %#x.\n", hr); + ok(desc.Format == info.Format, "Expected format %#x, got %#x.\n", info.Format, desc.Format); + ok(desc.Type == D3DRTYPE_SURFACE, "Got type %u.\n", desc.Type); + ok(desc.Usage == D3DUSAGE_RENDERTARGET, "Got usage %#x.\n", desc.Usage); + ok(desc.Pool == D3DPOOL_DEFAULT, "Got pool %u.\n", desc.Pool); + ok(desc.MultiSampleType == D3DMULTISAMPLE_NONE, "Got multisample type %u.\n", desc.MultiSampleType); + ok(!desc.MultiSampleQuality, "Got multisample quality %u.\n", desc.MultiSampleQuality); + ok(desc.Width == 32, "Got width %u.\n", desc.Width); + ok(desc.Height == 16, "Got height %u.\n", desc.Height); + + IDirect3DSurface9_Release(surfaces[0]); + out: IVMRSurfaceAllocatorNotify9_Release(notify); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 888f9e17510..f4faf2f97a8 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2112,6 +2112,18 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa if (!allocinfo || !numbuffers || !surface) return E_POINTER; + if (!allocinfo->Format) + { + IDirect3DSurface9 *backbuffer; + D3DSURFACE_DESC desc; + + IDirect3DDevice9_GetBackBuffer(This->allocator_d3d9_dev, 0, 0, + D3DBACKBUFFER_TYPE_MONO, &backbuffer); + IDirect3DSurface9_GetDesc(backbuffer, &desc); + IDirect3DSurface9_Release(backbuffer); + allocinfo->Format = desc.Format; + } + if (!*numbuffers || *numbuffers < allocinfo->MinBuffers) { ERR("Invalid number of buffers?\n"); -- 2.26.2

April 30, 2020

[PATCH 2/4] quartz/vmr9: Support VMR9AllocFlag_3DRenderTarget in IVMRSurfaceAllocatorNotify9::AllocateSurfaceHelper().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 652705e8430..888f9e17510 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2124,7 +2124,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa return VFW_E_WRONG_STATE; } - if (allocinfo->dwFlags & VMR9AllocFlag_OffscreenSurface) + if (allocinfo->dwFlags == VMR9AllocFlag_OffscreenSurface) { ERR("Creating offscreen surface\n"); for (i = 0; i < *numbuffers; ++i) @@ -2135,7 +2135,7 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa break; } } - else if (allocinfo->dwFlags & VMR9AllocFlag_TextureSurface) + else if (allocinfo->dwFlags == VMR9AllocFlag_TextureSurface) { TRACE("Creating texture surface\n"); for (i = 0; i < *numbuffers; ++i) @@ -2150,10 +2150,20 @@ static HRESULT WINAPI VMR9SurfaceAllocatorNotify_AllocateSurfaceHelper(IVMRSurfa IDirect3DTexture9_Release(texture); } } + else if (allocinfo->dwFlags == VMR9AllocFlag_3DRenderTarget) + { + for (i = 0; i < *numbuffers; ++i) + { + if (FAILED(hr = IDirect3DDevice9_CreateRenderTarget(This->allocator_d3d9_dev, + allocinfo->dwWidth, allocinfo->dwHeight, allocinfo->Format, + D3DMULTISAMPLE_NONE, 0, FALSE, &surface[i], NULL))) + break; + } + } else { - FIXME("Could not allocate for type %08x\n", allocinfo->dwFlags); - return E_NOTIMPL; + FIXME("Unhandled flags %#x.\n", allocinfo->dwFlags); + return E_NOTIMPL; } if (i >= allocinfo->MinBuffers) -- 2.26.2

April 30, 2020