- Wine-Devel - list.winehq.org

[v2 PATCH] d3dx9: Implement ID3DXTextureShader::GetFunction().
by Matteo Bruni Oct. 15, 2021

Oct. 15, 2021

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Slightly improved a couple of tests. dlls/d3dx9_36/shader.c | 28 ++++++++++++++++++++++++---- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fe0f99180ac..d5b58222ca2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2349,6 +2349,8 @@ struct d3dx9_texture_shader { ID3DXTextureShader ID3DXTextureShader_iface; LONG ref; + + ID3DXBuffer *byte_code; }; static inline struct d3dx9_texture_shader *impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) @@ -2392,6 +2394,8 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) if (!refcount) { + if (texture_shader->byte_code) + ID3DXBuffer_Release(texture_shader->byte_code); HeapFree(GetProcessHeap(), 0, texture_shader); } @@ -2400,9 +2404,14 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) static HRESULT WINAPI d3dx9_texture_shader_GetFunction(ID3DXTextureShader *iface, struct ID3DXBuffer **function) { - FIXME("iface %p, function %p stub.\n", iface, function); + struct d3dx9_texture_shader *texture_shader = impl_from_ID3DXTextureShader(iface); - return E_NOTIMPL; + TRACE("iface %p, function %p.\n", iface, function); + + *function = texture_shader->byte_code; + ID3DXBuffer_AddRef(*function); + + return S_OK; } static HRESULT WINAPI d3dx9_texture_shader_GetConstantBuffer(ID3DXTextureShader *iface, struct ID3DXBuffer **constant_buffer) @@ -2594,19 +2603,30 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; + unsigned int size; + HRESULT hr; TRACE("function %p, texture_shader %p.\n", function, texture_shader); if (!function || !texture_shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!object) + if (!(size = D3DXGetShaderSize(function))) + return D3DXERR_INVALIDDATA; + + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; object->ref = 1; + if (FAILED(hr = D3DXCreateBuffer(size, &object->byte_code))) + { + IUnknown_Release(&object->ID3DXTextureShader_iface); + return hr; + } + memcpy(ID3DXBuffer_GetBufferPointer(object->byte_code), function, size); + *texture_shader = &object->ID3DXTextureShader_iface; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bec7ba48279..26e5aa3dbb6 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2353,17 +2353,20 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; + D3DXCONSTANTTABLE_DESC ctab_desc; + ID3DXBuffer *buffer, *buffer2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; unsigned int x, y, z; - ID3DXBuffer *buffer; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; D3DCAPS9 caps; + D3DXHANDLE h; + DWORD size; HRESULT hr; HWND wnd; @@ -2386,15 +2389,42 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetFunction(tx, &buffer); - todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + + hr = tx->lpVtbl->GetFunction(tx, &buffer2); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + ok(buffer2 == buffer, "Unexpected buffer object.\n"); + ID3DXBuffer_Release(buffer2); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 224, "Unexpected buffer size %u.\n", size); + + ID3DXBuffer_Release(buffer); + + /* Constant buffer */ + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { skip("Texture shaders not supported, skipping further tests.\n"); IUnknown_Release(tx); return; } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "Unexpected buffer size %u.\n", size); + ID3DXBuffer_Release(buffer); + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(!ctab_desc.Constants, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + /* Constant table access calls, without constant table. */ + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!h, "Unexpected handle %p.\n", h); + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) { -- 2.26.3

1 0

[PATCH] wbemprox: Implement Win32_OperatingSystem.Status.
by Hans Leidekker Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index d76602f4930..58b5ed76dfa 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -251,6 +251,7 @@ static const struct column col_operatingsystem[] = { L"SerialNumber", CIM_STRING|COL_FLAG_DYNAMIC }, { L"ServicePackMajorVersion", CIM_UINT16 }, { L"ServicePackMinorVersion", CIM_UINT16 }, + { L"Status", CIM_STRING }, { L"SuiteMask", CIM_UINT32 }, { L"SystemDirectory", CIM_STRING|COL_FLAG_DYNAMIC }, { L"SystemDrive", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -667,6 +668,7 @@ struct record_operatingsystem const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; + const WCHAR *status; UINT32 suitemask; const WCHAR *systemdirectory; const WCHAR *systemdrive; @@ -3598,6 +3600,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct rec->serialnumber = get_osserialnumber(); rec->servicepackmajor = ver.wServicePackMajor; rec->servicepackminor = ver.wServicePackMinor; + rec->status = L"OK"; rec->suitemask = 272; /* Single User + Terminal */ rec->systemdirectory = get_systemdirectory(); rec->systemdrive = get_systemdrive(); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 5ca61cff825..b3a0e3c4534 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1424,6 +1424,7 @@ static void test_Win32_OperatingSystem( IWbemServices *services ) check_property( obj, L"Version", VT_BSTR, CIM_STRING ); check_property( obj, L"TotalVisibleMemorySize", VT_BSTR, CIM_UINT64 ); check_property( obj, L"TotalVirtualMemorySize", VT_BSTR, CIM_UINT64 ); + check_property( obj, L"Status", VT_BSTR, CIM_STRING ); check_property( obj, L"SystemDrive", VT_BSTR, CIM_STRING ); IWbemClassObject_Release( obj ); -- 2.30.2

1 0

[PATCH] powrprof: Add PowerRegisterSuspendResumeNotification stub
by Alistair Leslie-Hughes Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/powrprof/powrprof.c | 6 ++++++ dlls/powrprof/powrprof.spec | 1 + include/powrprof.h | 2 ++ 3 files changed, 9 insertions(+) diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index fc6f5706f87..0fd20b9f29b 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -330,6 +330,12 @@ DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) +{ + FIXME("(0x%08x,%p,%p) stub!\n", flags, recipient, handle); + return ERROR_SUCCESS; +} + BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) { diff --git a/dlls/powrprof/powrprof.spec b/dlls/powrprof/powrprof.spec index 611e03de3b2..bf12e14a323 100644 --- a/dlls/powrprof/powrprof.spec +++ b/dlls/powrprof/powrprof.spec @@ -17,6 +17,7 @@ @ stdcall PowerSetActiveScheme (ptr ptr) @ stdcall PowerReadDCValue (ptr ptr ptr ptr ptr ptr ptr) @ stdcall PowerReadFriendlyName (ptr ptr ptr ptr ptr ptr) +@ stdcall PowerRegisterSuspendResumeNotification(long ptr ptr) @ stdcall ReadGlobalPwrPolicy (ptr) @ stdcall ReadProcessorPwrScheme (long ptr) @ stdcall ReadPwrScheme (long ptr) diff --git a/include/powrprof.h b/include/powrprof.h index 318188e465e..cd8c4eec066 100644 --- a/include/powrprof.h +++ b/include/powrprof.h @@ -145,6 +145,7 @@ extern "C" { #endif typedef BOOLEAN (CALLBACK* PWRSCHEMESENUMPROC)(UINT, DWORD, LPWSTR, DWORD, LPWSTR, PPOWER_POLICY, LPARAM); +typedef PVOID HPOWERNOTIFY, *PHPOWERNOTIFY; NTSTATUS WINAPI CallNtPowerInformation(POWER_INFORMATION_LEVEL, PVOID, ULONG, PVOID, ULONG); BOOLEAN WINAPI CanUserWritePwrScheme(VOID); @@ -159,6 +160,7 @@ BOOLEAN WINAPI IsPwrHibernateAllowed(VOID); BOOLEAN WINAPI IsPwrShutdownAllowed(VOID); BOOLEAN WINAPI IsPwrSuspendAllowed(VOID); DWORD WINAPI PowerEnumerate(HKEY, const GUID *, const GUID *, POWER_DATA_ACCESSOR, ULONG, UCHAR *, DWORD *); +DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle); BOOLEAN WINAPI ReadGlobalPwrPolicy(PGLOBAL_POWER_POLICY); BOOLEAN WINAPI ReadProcessorPwrScheme(UINT, PMACHINE_PROCESSOR_POWER_POLICY); BOOLEAN WINAPI ReadPwrScheme(UINT, PPOWER_POLICY); -- 2.33.0

1 0

[PATCH] d3dx9: Implement ID3DXTextureShader::GetFunction().
by Nikolay Sivov Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3dx9_36/shader.c | 28 ++++++++++++++++++++++++---- dlls/d3dx9_36/tests/texture.c | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index fe0f99180ac..d5b58222ca2 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -2349,6 +2349,8 @@ struct d3dx9_texture_shader { ID3DXTextureShader ID3DXTextureShader_iface; LONG ref; + + ID3DXBuffer *byte_code; }; static inline struct d3dx9_texture_shader *impl_from_ID3DXTextureShader(ID3DXTextureShader *iface) @@ -2392,6 +2394,8 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) if (!refcount) { + if (texture_shader->byte_code) + ID3DXBuffer_Release(texture_shader->byte_code); HeapFree(GetProcessHeap(), 0, texture_shader); } @@ -2400,9 +2404,14 @@ static ULONG WINAPI d3dx9_texture_shader_Release(ID3DXTextureShader *iface) static HRESULT WINAPI d3dx9_texture_shader_GetFunction(ID3DXTextureShader *iface, struct ID3DXBuffer **function) { - FIXME("iface %p, function %p stub.\n", iface, function); + struct d3dx9_texture_shader *texture_shader = impl_from_ID3DXTextureShader(iface); - return E_NOTIMPL; + TRACE("iface %p, function %p.\n", iface, function); + + *function = texture_shader->byte_code; + ID3DXBuffer_AddRef(*function); + + return S_OK; } static HRESULT WINAPI d3dx9_texture_shader_GetConstantBuffer(ID3DXTextureShader *iface, struct ID3DXBuffer **constant_buffer) @@ -2594,19 +2603,30 @@ static const struct ID3DXTextureShaderVtbl d3dx9_texture_shader_vtbl = HRESULT WINAPI D3DXCreateTextureShader(const DWORD *function, ID3DXTextureShader **texture_shader) { struct d3dx9_texture_shader *object; + unsigned int size; + HRESULT hr; TRACE("function %p, texture_shader %p.\n", function, texture_shader); if (!function || !texture_shader) return D3DERR_INVALIDCALL; - object = HeapAlloc(GetProcessHeap(), 0, sizeof(*object)); - if (!object) + if (!(size = D3DXGetShaderSize(function))) + return D3DXERR_INVALIDDATA; + + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; object->ID3DXTextureShader_iface.lpVtbl = &d3dx9_texture_shader_vtbl; object->ref = 1; + if (FAILED(hr = D3DXCreateBuffer(size, &object->byte_code))) + { + IUnknown_Release(&object->ID3DXTextureShader_iface); + return hr; + } + memcpy(ID3DXBuffer_GetBufferPointer(object->byte_code), function, size); + *texture_shader = &object->ID3DXTextureShader_iface; return D3D_OK; diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index bec7ba48279..27bfc0a7de4 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -2353,17 +2353,20 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR }; IDirect3DVolumeTexture9 *volume_texture; IDirect3DCubeTexture9 *cube_texture; + D3DXCONSTANTTABLE_DESC ctab_desc; + ID3DXBuffer *buffer, *buffer2; D3DPRESENT_PARAMETERS d3dpp; IDirect3DTexture9 *texture; IDirect3DDevice9 *device; ID3DXTextureShader *tx; unsigned int x, y, z; - ID3DXBuffer *buffer; unsigned int *data; D3DLOCKED_RECT lr; D3DLOCKED_BOX lb; IDirect3D9 *d3d; D3DCAPS9 caps; + D3DXHANDLE h; + DWORD size; HRESULT hr; HWND wnd; @@ -2386,15 +2389,42 @@ float4 main(float3 pos : POSITION, float3 size : PSIZE) : COLOR ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); hr = tx->lpVtbl->GetFunction(tx, &buffer); - todo_wine ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + + hr = tx->lpVtbl->GetFunction(tx, &buffer2); + ok(SUCCEEDED(hr), "Failed to get texture shader bytecode.\n"); + ok(buffer2 == buffer, "Unexpected buffer object.\n"); + ID3DXBuffer_Release(buffer2); + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(size == 224, "Unexpected buffer size %u.\n", size); + + ID3DXBuffer_Release(buffer); + + /* Constant buffer */ + hr = tx->lpVtbl->GetConstantBuffer(tx, &buffer); +todo_wine + ok(SUCCEEDED(hr), "Failed to get texture shader constant buffer.\n"); if (FAILED(hr)) { skip("Texture shaders not supported, skipping further tests.\n"); IUnknown_Release(tx); return; } + + size = ID3DXBuffer_GetBufferSize(buffer); + ok(!size, "Unexpected buffer size %u.\n", size); + ID3DXBuffer_Release(buffer); + hr = tx->lpVtbl->GetDesc(tx, &ctab_desc); + ok(hr == S_OK, "Failed to get constant description, hr %#x.\n", hr); + ok(!ctab_desc.Constants, "Unexpected number of constants %u.\n", ctab_desc.Constants); + + /* Constant table access calls, without constant table. */ + h = tx->lpVtbl->GetConstant(tx, NULL, 0); + ok(!h, "Unexpected handle %p.\n", h); + if (!(wnd = CreateWindowA("static", "d3dx9_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, NULL, NULL, NULL, NULL))) { -- 2.33.0

1 0

[PATCH v2] win32u: Fix crash when charmap is null.
by Chao Long Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Chao Long <longchao(a)uniontech.com> --- dlls/win32u/freetype.c | 39 ++++++++++++++++++++++++++------------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/win32u/freetype.c b/dlls/win32u/freetype.c index b2ca2f545fe..91f97c056e4 100644 --- a/dlls/win32u/freetype.c +++ b/dlls/win32u/freetype.c @@ -2463,6 +2463,7 @@ static BOOL CDECL freetype_load_font( struct gdi_font *font ) if (pFT_New_Memory_Face( library, data_ptr, data_size, font->face_index, &ft_face )) return FALSE; + TRACE("face: %p, charmaps count: %d\n", ft_face, ft_face->num_charmaps); data->ft_face = ft_face; font->scalable = FT_IS_SCALABLE( ft_face ); if (!font->fs.fsCsb[0]) get_fontsig( ft_face, &font->fs ); @@ -2565,20 +2566,24 @@ static BOOL CDECL freetype_get_glyph_index( struct gdi_font *font, UINT *glyph, { FT_Face ft_face = get_ft_face( font ); - if (!use_encoding ^ (ft_face->charmap->encoding == FT_ENCODING_NONE)) return FALSE; - - if (ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) + TRACE("face: %p, charmaps count: %d\n", ft_face, ft_face->num_charmaps); + if (ft_face->num_charmaps > 0) { - if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + if (!use_encoding ^ (ft_face->charmap->encoding == FT_ENCODING_NONE)) return FALSE; + + if (ft_face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { - WCHAR wc = *glyph; - DWORD len; - char ch; + if (!(*glyph = get_glyph_index_symbol( font, *glyph ))) + { + WCHAR wc = *glyph; + DWORD len; + char ch; - len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); - if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + len = win32u_wctomb( NULL, &ch, 1, &wc, sizeof(wc) ); + if (len) *glyph = get_glyph_index_symbol( font, (unsigned char)ch ); + } + return TRUE; } - return TRUE; } *glyph = pFT_Get_Char_Index( ft_face, *glyph ); return TRUE; @@ -4002,6 +4007,9 @@ static DWORD CDECL freetype_get_unicode_ranges( struct gdi_font *font, GLYPHSET FT_Face ft_face = get_ft_face( font ); DWORD num_ranges = 0; + if (ft_face->num_charmaps <= 0) + return num_ranges; + if (ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; @@ -4187,7 +4195,7 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI return 0; } - if (ft_face->charmap->encoding == FT_ENCODING_UNICODE) + if (ft_face->num_charmaps > 0 && ft_face->charmap->encoding == FT_ENCODING_UNICODE) { FT_UInt glyph_code; FT_ULong char_code; @@ -4214,10 +4222,15 @@ static DWORD CDECL freetype_get_kerning_pairs( struct gdi_font *font, KERNINGPAI } else { - DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); ULONG n; - FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + if (ft_face->num_charmaps > 0) + { + DWORD encoding = RtlUlongByteSwap(ft_face->charmap->encoding); + + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + } + for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; } -- 2.20.1

3 2

[PATCH vkd3d 10/10] vkd3d: Pass descriptor offset info to vkd3d-shader for graphics pipelines.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Rebase of patch 216997. libs/vkd3d/state.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e27c98ed..ef74d7f8 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2403,6 +2403,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s struct vkd3d_shader_transform_feedback_info xfb_info; struct vkd3d_shader_spirv_target_info ps_target_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_shader_spirv_target_info *target_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_signature input_signature; @@ -2643,6 +2644,15 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&shader_interface, &offset_info); + } + for (i = 0; i < ARRAY_SIZE(shader_stages); ++i) { struct vkd3d_shader_scan_descriptor_info shader_info = -- 2.20.1

1 0

[PATCH vkd3d 09/10] vkd3d: Pass descriptor offset info to vkd3d-shader for compute pipelines.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Rebase of patch 216996. libs/vkd3d/state.c | 30 ++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + tests/d3d12.c | 1 - 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 29d8618e..e27c98ed 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -91,6 +91,7 @@ static void d3d12_root_signature_cleanup(struct d3d12_root_signature *root_signa if (root_signature->descriptor_mapping) vkd3d_free(root_signature->descriptor_mapping); + vkd3d_free(root_signature->descriptor_offsets); if (root_signature->root_constants) vkd3d_free(root_signature->root_constants); @@ -713,10 +714,11 @@ static HRESULT d3d12_root_signature_init_descriptor_array_binding(struct d3d12_r } static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_signature *root_signature, - const struct d3d12_root_descriptor_table_range *range, bool buffer_descriptor, + const struct d3d12_root_descriptor_table_range *range, unsigned int descriptor_offset, bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { - struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index++]; + struct vkd3d_shader_resource_binding *mapping = &root_signature->descriptor_mapping[context->descriptor_index]; + unsigned int *offset = &root_signature->descriptor_offsets[context->descriptor_index++]; mapping->type = range->type; mapping->register_space = range->register_space; @@ -727,18 +729,21 @@ static void d3d12_root_signature_map_vk_unbounded_binding(struct d3d12_root_sign || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) && !buffer_descriptor); mapping->binding.binding = range->binding; mapping->binding.count = range->vk_binding_count; + *offset = descriptor_offset; } static void d3d12_root_signature_map_descriptor_unbounded_binding(struct d3d12_root_signature *root_signature, - const struct d3d12_root_descriptor_table_range *range, + const struct d3d12_root_descriptor_table_range *range, unsigned int descriptor_offset, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { bool is_buffer = range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_CBV; if (range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_SRV || range->type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV) - d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, true, shader_visibility, context); + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, + descriptor_offset, true, shader_visibility, context); - d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, is_buffer, shader_visibility, context); + d3d12_root_signature_map_vk_unbounded_binding(root_signature, range, + descriptor_offset, is_buffer, shader_visibility, context); } static int compare_register_range(const void *a, const void *b) @@ -882,7 +887,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo range->binding = base_range->binding; range->vk_binding_count = base_range->vk_binding_count - rel_offset; d3d12_root_signature_map_descriptor_unbounded_binding(root_signature, range, - shader_visibility, context); + rel_offset, shader_visibility, context); continue; } else if (range->descriptor_count == UINT_MAX) @@ -1165,6 +1170,9 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->binding_count, sizeof(*root_signature->descriptor_mapping)))) goto fail; + if (!(root_signature->descriptor_offsets = vkd3d_calloc(root_signature->binding_count, + sizeof(*root_signature->descriptor_offsets)))) + goto fail; root_signature->root_constant_count = info.root_constant_count; if (!(root_signature->root_constants = vkd3d_calloc(root_signature->root_constant_count, sizeof(*root_signature->root_constants)))) @@ -1878,6 +1886,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; struct vkd3d_shader_scan_descriptor_info shader_info; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; const struct d3d12_root_signature *root_signature; struct vkd3d_shader_spirv_target_info target_info; VkPipelineLayout vk_pipeline_layout; @@ -1917,6 +1926,15 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st target_info.extensions = device->vk_info.shader_extensions; target_info.extension_count = device->vk_info.shader_extension_count; + if (root_signature->descriptor_offsets) + { + offset_info.type = VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO; + offset_info.next = NULL; + offset_info.binding_offsets = root_signature->descriptor_offsets; + offset_info.uav_counter_offsets = NULL; + vkd3d_prepend_struct(&target_info, &offset_info); + } + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_INTERFACE_INFO; shader_interface.next = &target_info; shader_interface.bindings = root_signature->descriptor_mapping; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 0594eea2..496372ef 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -736,6 +736,7 @@ struct d3d12_root_signature unsigned int binding_count; struct vkd3d_shader_resource_binding *descriptor_mapping; + unsigned int *descriptor_offsets; unsigned int root_constant_count; struct vkd3d_shader_push_constant_buffer *root_constants; diff --git a/tests/d3d12.c b/tests/d3d12.c index c73e15bc..460445b1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -35105,7 +35105,6 @@ static void test_unbounded_resource_arrays(void) D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(output_buffers[i], DXGI_FORMAT_R32_UINT, &rb, queue, command_list); /* Buffers at index >= 64 are aliased. */ - todo_if(i != 74 && i > 63) check_readback_data_uint(&rb, NULL, (i < 64 ? 63 - i : 127 - i) ^ 0x35, 0); release_resource_readback(&rb); reset_command_list(command_list, context.allocator); -- 2.20.1

1 0

[PATCH vkd3d 08/10] vkd3d: Introduce a helper function to chain vkd3d structures.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Analogous to vk_prepend_struct(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Initialise shader_interface.next to NULL inside the loop. This avoids chained structures from previous loop iterations hanging around. - Do not add the vkd3d_shader_base_in_structure structure to the public interface. This supersedes patches 216994 and 216995. libs/vkd3d/state.c | 9 ++++----- libs/vkd3d/vkd3d_private.h | 13 +++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 277afe42..29d8618e 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2689,12 +2689,11 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s goto fail; } - shader_interface.next = shader_stages[i].stage == xfb_stage ? &xfb_info : NULL; + shader_interface.next = NULL; + if (shader_stages[i].stage == xfb_stage) + vkd3d_prepend_struct(&shader_interface, &xfb_info); if (target_info) - { - target_info->next = shader_interface.next; - shader_interface.next = target_info; - } + vkd3d_prepend_struct(&shader_interface, target_info); if (FAILED(hr = create_shader_stage(device, &graphics->stages[graphics->stage_count], shader_stages[i].stage, b, &shader_interface))) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index f8474caa..0594eea2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -1395,4 +1395,17 @@ static inline void vk_prepend_struct(void *header, void *structure) vk_header->pNext = vk_structure; } +static inline void vkd3d_prepend_struct(void *header, void *structure) +{ + struct + { + unsigned int type; + const void *next; + } *vkd3d_header = header, *vkd3d_structure = structure; + + assert(!vkd3d_structure->next); + vkd3d_structure->next = vkd3d_header->next; + vkd3d_header->next = vkd3d_structure; +} + #endif /* __VKD3D_PRIVATE_H */ -- 2.20.1

1 0

[PATCH vkd3d 07/10] vkd3d-shader/spirv: Implement support for descriptor array offsets.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Some tweaks to the API documentation. This supersedes patch 216993. include/vkd3d_shader.h | 72 +++++++++++++++++++++++++++++++++++++-- libs/vkd3d-shader/spirv.c | 12 ++++++- 2 files changed, 81 insertions(+), 3 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 37b5936d..3ba84a52 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -64,6 +64,11 @@ enum vkd3d_shader_structure_type * \since 1.3 */ VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + /** + * The structure is a vkd3d_shader_descriptor_offset_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -208,8 +213,9 @@ struct vkd3d_shader_descriptor_binding /** The binding index of the descriptor. */ unsigned int binding; /** - * The size of this descriptor array. Descriptor arrays are not supported in - * this version of vkd3d-shader, and therefore this value must be 1. + * The size of this descriptor array. If an offset is specified for this + * binding by the vkd3d_shader_descriptor_offset_info structure, counting + * starts at that offset. */ unsigned int count; }; @@ -452,6 +458,68 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/** + * A chained structure containing descriptor offsets. + * + * This structure is optional. + * + * This structure extends vkd3d_shader_interface_info. + * + * This structure contains only input parameters. + * + * \since 1.3 + */ +struct vkd3d_shader_descriptor_offset_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of offsets into the descriptor arrays referenced by + * the 'bindings' array in struct vkd3d_shader_interface_info. This allows + * mapping multiple shader resource arrays to a single binding point in + * the target environment. + * + * For example, to map Direct3D constant buffer registers 'cb0[0:3]' and + * 'cb1[6:7]' to descriptors 8-12 and 4-5 in the Vulkan descriptor array in + * descriptor set 3 and with binding 2, set the following values in the + * 'bindings' array in struct vkd3d_shader_interface_info: + * + * \code + * type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV + * register_space = 0 + * register_index = 0 + * binding.set = 3 + * binding.binding = 2 + * binding.count = 4 + * + * type = VKD3D_SHADER_DESCRIPTOR_TYPE_CBV + * register_space = 0 + * register_index = 6 + * binding.set = 3 + * binding.binding = 2 + * binding.count = 2 + * \endcode + * + * and then pass \c {8, \c 4} as \a binding_offsets here. + * + * This field may be NULL, in which case the corresponding offsets are + * specified to be 0. + */ + const unsigned int *binding_offsets; + + /** + * Pointer to an array of offsets into the descriptor arrays referenced by + * the 'uav_counters' array in struct vkd3d_shader_interface_info. This + * works the same way as \ref binding_offsets above. UAV counter arrays are + * not supported in this version of vkd3d-shader, and therefore this field + * must either be NULL or specify 0 offsets. + */ + const unsigned int *uav_counter_offsets; +}; + /** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f9124fc4..6cf438d9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,6 +2231,7 @@ struct vkd3d_dxbc_compiler size_t control_flow_info_size; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; @@ -2292,6 +2293,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_descriptor_offset_info *offset_info; const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; @@ -2385,6 +2387,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader for (i = 0; i < shader_interface->push_constant_buffer_count; ++i) compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } + + if ((offset_info = vkd3d_find_struct(shader_interface->next, DESCRIPTOR_OFFSET_INFO))) + { + compiler->offset_info = *offset_info; + if (offset_info->uav_counter_offsets) + WARN("Ignoring UAV counter offsets %p.\n", offset_info->uav_counter_offsets); + } } compiler->scan_descriptor_info = scan_descriptor_info; @@ -2546,6 +2555,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; + const unsigned int *binding_offsets = compiler->offset_info.binding_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2626,7 +2636,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor || current->binding.count <= register_last - current->register_index) continue; - *binding_base_idx = current->register_index; + *binding_base_idx = current->register_index - (binding_offsets ? binding_offsets[i] : 0); return current->binding; } if (shader_interface->binding_count) -- 2.20.1

1 0

[PATCH vkd3d 06/10] vkd3d-shader/spirv: Implement texel offset support for sample_c instructions.
by Henri Verbeet Oct. 14, 2021

Oct. 14, 2021

From: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Rebase of patch 215486. libs/vkd3d-shader/spirv.c | 13 +++++++++---- tests/d3d12.c | 3 +-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 58bf3d9c..f9124fc4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -8235,12 +8235,9 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil SpvImageOperandsMask operands_mask = 0; unsigned int image_operand_count = 0; struct vkd3d_shader_image image; - uint32_t image_operands[1]; + uint32_t image_operands[2]; SpvOp op; - if (vkd3d_shader_instruction_has_texel_offset(instruction)) - FIXME("Texel offset not supported.\n"); - if (instruction->handler_idx == VKD3DSIH_SAMPLE_C_LZ) { op = SpvOpImageSampleDrefExplicitLod; @@ -8255,6 +8252,14 @@ static void vkd3d_dxbc_compiler_emit_sample_c(struct vkd3d_dxbc_compiler *compil vkd3d_dxbc_compiler_prepare_image(compiler, &image, &src[1].reg, &src[2].reg, VKD3D_IMAGE_FLAG_SAMPLED | VKD3D_IMAGE_FLAG_DEPTH); + + if (vkd3d_shader_instruction_has_texel_offset(instruction)) + { + operands_mask |= SpvImageOperandsConstOffsetMask; + image_operands[image_operand_count++] = vkd3d_dxbc_compiler_emit_texel_offset(compiler, + instruction, image.resource_type_info); + } + sampled_type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], VKD3DSP_WRITEMASK_ALL); dref_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[3], VKD3DSP_WRITEMASK_0); diff --git a/tests/d3d12.c b/tests/d3d12.c index 93cd56db..c73e15bc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14784,8 +14784,7 @@ static void test_sample_c_lz(void) transition_resource_state(command_list, context.render_target, D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - todo_if(j && tests[i].d_ref > 0.0f) - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, context.render_target, -- 2.20.1

1 0