September 2023 - Wine-Commits

Rémi Bernon : dmband: Rewrite band track IPersistStream_Load.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: wine Branch: master Commit: a955339b3c00012f799ad53bdcaed6ee0491c2da URL: https://gitlab.winehq.org/wine/wine/-/commit/a955339b3c00012f799ad53bdcaed6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 19:29:56 2023 +0200 dmband: Rewrite band track IPersistStream_Load. --- dlls/dmband/Makefile.in | 3 +- dlls/dmband/bandtrack.c | 85 ++++++++--------- dlls/dmband/dmband_main.c | 1 + dlls/dmband/dmband_private.h | 6 -- dlls/dmband/dmutils.c | 219 ------------------------------------------- dlls/dmband/dmutils.h | 37 -------- 6 files changed, 45 insertions(+), 306 deletions(-)

1 0

Rémi Bernon : dmband: Rewrite band track DBMT chunk parsing.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: wine Branch: master Commit: 48f276f8360afaf4fd80a8ca432b500d1feaac94 URL: https://gitlab.winehq.org/wine/wine/-/commit/48f276f8360afaf4fd80a8ca432b50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 19:28:15 2023 +0200 dmband: Rewrite band track DBMT chunk parsing. --- dlls/dmband/bandtrack.c | 122 ++++++++++++++---------------------------------- 1 file changed, 35 insertions(+), 87 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 4bcf6cd8bfe..ae240ee448f 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -421,99 +421,43 @@ static HRESULT parse_lbdl_list(struct band_track *This, IStream *stream, struct return S_OK; } -static HRESULT parse_bandtrack_form(struct band_track *This, DMUS_PRIVATE_CHUNK *pChunk, - IStream *pStm) +static HRESULT parse_dmbt_chunk(struct band_track *This, IStream *stream, struct chunk_entry *parent) { - HRESULT hr = E_FAIL; - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry chunk = {.parent = parent}; + HRESULT hr; - if (pChunk->fccID != DMUS_FOURCC_BANDTRACK_FORM) { - ERR_(dmfile)(": %s chunk should be a BANDTRACK form\n", debugstr_fourcc (pChunk->fccID)); - return E_FAIL; - } + if (FAILED(hr = dmobj_parsedescriptor(stream, parent, &This->dmobj.desc, + DMUS_OBJ_OBJECT|DMUS_OBJ_NAME|DMUS_OBJ_NAME_INAM|DMUS_OBJ_VERSION)) + || FAILED(hr = stream_reset_chunk_data(stream, parent))) + return hr; - StreamSize = pChunk->dwSize - sizeof(FOURCC); - StreamCount = 0; + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case DMUS_FOURCC_GUID_CHUNK: + case DMUS_FOURCC_VERSION_CHUNK: + case MAKE_IDTYPE(FOURCC_LIST, DMUS_FOURCC_UNFO_LIST): + /* already parsed by dmobj_parsedescriptor */ + break; - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); - if (FAILED(hr)) return hr; + case DMUS_FOURCC_BANDTRACK_CHUNK: + hr = stream_chunk_get_data(stream, &chunk, &This->header, sizeof(This->header)); + break; - if (hr == S_FALSE) { - switch (Chunk.fccID) { - case DMUS_FOURCC_BANDTRACK_CHUNK: { - TRACE_(dmfile)(": BandTrack chunk\n"); - IStream_Read (pStm, &This->header, sizeof(DMUS_IO_BAND_TRACK_HEADER), NULL); - TRACE_(dmfile)(" - bAutoDownload: %u\n", This->header.bAutoDownload); - break; - } - case FOURCC_LIST: { - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); - if (FAILED(hr)) return hr; - - if (hr == S_FALSE) { - switch (Chunk.fccID) { - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - } - TRACE_(dmfile)(": ListCount[0] = %ld < ListSize[0] = %ld\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } - case DMUS_FOURCC_BANDS_LIST: { - static const LARGE_INTEGER zero = {0}; - struct chunk_entry chunk = {FOURCC_LIST, .size = Chunk.dwSize, .type = Chunk.fccID}; - TRACE_(dmfile)(": TRACK list\n"); - IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &chunk.offset); - chunk.offset.QuadPart -= 12; - hr = parse_lbdl_list(This, pStm, &chunk); - if (FAILED(hr)) return hr; - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } + case MAKE_IDTYPE(FOURCC_LIST, DMUS_FOURCC_BANDS_LIST): + hr = parse_lbdl_list(This, stream, &chunk); + break; + + default: + FIXME("Ignoring chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + break; + } + + if (FAILED(hr)) break; } - TRACE_(dmfile)(": StreamCount[0] = %ld < StreamSize[0] = %ld\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - return S_OK; + return hr; } static inline struct band_track *impl_from_IPersistStream(IPersistStream *iface) @@ -538,8 +482,12 @@ static HRESULT WINAPI band_track_persist_stream_Load(IPersistStream *iface, IStr TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_BANDTRACK_FORM: { + static const LARGE_INTEGER zero = {0}; + struct chunk_entry chunk = {FOURCC_LIST, .size = Chunk.dwSize, .type = Chunk.fccID}; TRACE_(dmfile)(": Band track form\n"); - hr = parse_bandtrack_form(This, &Chunk, pStm); + IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &chunk.offset); + chunk.offset.QuadPart -= 12; + hr = parse_dmbt_chunk(This, pStm, &chunk); if (FAILED(hr)) return hr; break; }

1 0

Rémi Bernon : dmband: Rewrite band track lbdl/lbnd lists parsing.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: wine Branch: master Commit: 9276aec695b59ace9ea0ed2491e138593158e255 URL: https://gitlab.winehq.org/wine/wine/-/commit/9276aec695b59ace9ea0ed2491e138… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 10 19:23:22 2023 +0200 dmband: Rewrite band track lbdl/lbnd lists parsing. --- dlls/dmband/bandtrack.c | 238 +++++++++++++++---------------------------- dlls/dmband/dmband_private.h | 14 --- 2 files changed, 83 insertions(+), 169 deletions(-)

1 0

Alistair Leslie-Hughes : msado15: Recordset::Open - Correctly update count/index values.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: wine Branch: master Commit: 8e9bea371de31b649aa20a3f617885fca2db7c16 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e9bea371de31b649aa20a3f617885… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Sep 21 17:47:01 2023 +1000 msado15: Recordset::Open - Correctly update count/index values. ADO can return a RecordCount of -1. --- dlls/msado15/recordset.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 84db7fc581d..a70fc2b33ac 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -2104,8 +2104,8 @@ static HRESULT WINAPI recordset_Open( _Recordset *iface, VARIANT source, VARIANT return hr; } - recordset->count = affected; - recordset->index = affected ? 0 : -1; + recordset->count = affected > 0 ? affected : 0; + recordset->index = affected > 0 ? 0 : -1; /* * We can safely just return with an empty recordset here

1 0

Brendan Shanks : winecoreaudio: Stop using the deprecated kAudioObjectPropertyElementMaster constant.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: wine Branch: master Commit: d9e1d419d552ae562456a310d010b0a0bc9c183f URL: https://gitlab.winehq.org/wine/wine/-/commit/d9e1d419d552ae562456a310d010b0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 15 16:10:40 2023 -0700 winecoreaudio: Stop using the deprecated kAudioObjectPropertyElementMaster constant. --- dlls/winecoreaudio.drv/coreaudio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 5cdb3a4f676..0b2f9a1e114 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -70,6 +70,10 @@ #include "unixlib.h" +#if !defined(MAC_OS_VERSION_12_0) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_VERSION_12_0 +#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster +#endif + WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); #define MAX_DEV_NAME_LEN 10 /* Max 32 bit digits */ @@ -239,7 +243,7 @@ static NTSTATUS unix_get_endpoint_ids(void *args) params->default_idx = 0; addr.mScope = kAudioObjectPropertyScopeGlobal; - addr.mElement = kAudioObjectPropertyElementMaster; + addr.mElement = kAudioObjectPropertyElementMain; if(params->flow == eRender) addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice; else if(params->flow == eCapture) addr.mSelector = kAudioHardwarePropertyDefaultInputDevice; else{ @@ -1752,7 +1756,7 @@ static NTSTATUS unix_set_volumes(void *args) AudioObjectPropertyAddress prop_addr = { kAudioDevicePropertyVolumeScalar, kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; sc = AudioObjectSetPropertyData(stream->dev_id, &prop_addr, 0, NULL, sizeof(float), &level);

1 0

Tag vkd3d-1.9 : Alexandre Julliard : Release 1.9
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: vkd3d Branch: refs/tags/vkd3d-1.9 Tag: 07ba86d6c324833334952a0770b88c9293c64f85 URL: https://gitlab.winehq.org/wine/vkd3d/-/tags/07ba86d6c324833334952a0770b88c9… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 21 22:03:25 2023 +0200 Release 1.9

1 0

Zebediah Figura : vkd3d-shader/d3dbc: Translate sm1 fragment outputs to system values.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: vkd3d Branch: master Commit: 9417c7cfb713e291dd81541c8a1e4fd40413b426 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9417c7cfb713e291dd81541c8a1e4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 20 13:19:04 2023 -0500 vkd3d-shader/d3dbc: Translate sm1 fragment outputs to system values. --- libs/vkd3d-shader/d3dbc.c | 6 +++--- tests/vkd3d_shader_api.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index d5104ae9..1fd5ab24 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -597,7 +597,7 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser * case VKD3DSPR_TEMP: if (sm1->p.shader_version.type == VKD3D_SHADER_TYPE_PIXEL && sm1->p.shader_version.major == 1 && !register_index) - return add_signature_element(sm1, true, "COLOR", 0, VKD3D_SHADER_SV_NONE, 0, is_dcl, mask); + return add_signature_element(sm1, true, "COLOR", 0, VKD3D_SHADER_SV_TARGET, 0, is_dcl, mask); return true; case VKD3DSPR_INPUT: @@ -641,11 +641,11 @@ static bool add_signature_element_from_register(struct vkd3d_shader_sm1_parser * case VKD3DSPR_COLOROUT: return add_signature_element(sm1, true, "COLOR", register_index, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, mask); + VKD3D_SHADER_SV_TARGET, register_index, is_dcl, mask); case VKD3DSPR_DEPTHOUT: return add_signature_element(sm1, true, "DEPTH", 0, - VKD3D_SHADER_SV_NONE, register_index, is_dcl, 0x1); + VKD3D_SHADER_SV_DEPTH, register_index, is_dcl, 0x1); case VKD3DSPR_RASTOUT: switch (register_index) diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 3182fe0d..106bc21c 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -587,7 +587,7 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element ps2_outputs[] = { - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_TARGET, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, }; static const char ps3_source[] = @@ -609,8 +609,8 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element ps3_outputs[] = { - {"COLOR", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, - {"DEPTH", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0x1, 0x1}, + {"COLOR", 0, 0, VKD3D_SHADER_SV_TARGET, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0xf, 0xf}, + {"DEPTH", 0, 0, VKD3D_SHADER_SV_DEPTH, VKD3D_SHADER_COMPONENT_FLOAT, 0, 0x1, 0x1}, }; static const char ps4_source[] =

1 0

Henri Verbeet : Release 1.9.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: vkd3d Branch: master Commit: 90d4529f27b477bf54e3a8657db2fa78c3af5eec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/90d4529f27b477bf54e3a8657db2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 20 12:00:00 2023 +0200 Release 1.9. --- ANNOUNCE | 136 +++++++++++++++++++----------------- AUTHORS | 2 + Makefile.am | 6 +- configure.ac | 2 +- demos/demo_xcb.h | 2 +- include/vkd3d.h | 1 + include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 2 +- libs/vkd3d-utils/vkd3d_utils_main.c | 4 +- libs/vkd3d/state.c | 4 +- programs/vkd3d-compiler/main.c | 2 +- 11 files changed, 88 insertions(+), 74 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/dxbc: Map sm4 fragment outputs to system values based on their name.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: vkd3d Branch: master Commit: 1615e5a76b97bfe4014e27fc51a2d66b579973b5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1615e5a76b97bfe4014e27fc51a2d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 20 13:15:55 2023 -0500 vkd3d-shader/dxbc: Map sm4 fragment outputs to system values based on their name. --- libs/vkd3d-shader/dxbc.c | 23 +++++++++++++++++++++++ tests/vkd3d_shader_api.c | 4 ++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index cedc3da4..1cb00688 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -321,6 +321,26 @@ int vkd3d_shader_parse_dxbc(const struct vkd3d_shader_code *dxbc, return ret; } +/* Shader Model 6 shaders use these special values in the output signature, + * but Shader Model 4/5 just use VKD3D_SHADER_SV_NONE. Normalize to SM6. */ +static enum vkd3d_shader_sysval_semantic map_fragment_output_sysval(const char *name) +{ + if (!ascii_strcasecmp(name, "sv_target")) + return VKD3D_SHADER_SV_TARGET; + if (!ascii_strcasecmp(name, "sv_depth")) + return VKD3D_SHADER_SV_DEPTH; + if (!ascii_strcasecmp(name, "sv_coverage")) + return VKD3D_SHADER_SV_COVERAGE; + if (!ascii_strcasecmp(name, "sv_depthgreaterequal")) + return VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL; + if (!ascii_strcasecmp(name, "sv_depthlessequal")) + return VKD3D_SHADER_SV_DEPTH_LESS_EQUAL; + if (!ascii_strcasecmp(name, "sv_stencilref")) + return VKD3D_SHADER_SV_STENCIL_REF; + + return VKD3D_SHADER_SV_NONE; +} + static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *section, struct vkd3d_shader_message_context *message_context, struct shader_signature *s) { @@ -401,6 +421,9 @@ static int shader_parse_signature(const struct vkd3d_shader_dxbc_section_desc *s case TAG_OSGN: case TAG_OSG1: case TAG_OSG5: + if (e[i].sysval_semantic == VKD3D_SHADER_SV_NONE) + e[i].sysval_semantic = map_fragment_output_sysval(e[i].semantic_name); + /* Fall through. */ case TAG_PCSG: case TAG_PSG1: e[i].used_mask = e[i].mask & ~e[i].used_mask; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index ea53c81d..3182fe0d 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -566,8 +566,8 @@ static void test_scan_signatures(void) static const struct vkd3d_shader_signature_element ps1_outputs[] = { - {"sv_target", 2, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, - {"sv_depth", 0, 0, VKD3D_SHADER_SV_NONE, VKD3D_SHADER_COMPONENT_FLOAT, ~0u, 0x1, 0x1}, + {"sv_target", 2, 0, VKD3D_SHADER_SV_TARGET, VKD3D_SHADER_COMPONENT_FLOAT, 2, 0xf, 0xf}, + {"sv_depth", 0, 0, VKD3D_SHADER_SV_DEPTH, VKD3D_SHADER_COMPONENT_FLOAT, ~0u, 0x1, 0x1}, }; static const char ps2_source[] =

1 0

Zebediah Figura : vkd3d-shader: Rename vkd3d_shader_next_stage_info to vkd3d_shader_varying_map_info.
by Alexandre Julliard Sept. 21, 2023

Sept. 21, 2023

Module: vkd3d Branch: master Commit: fd120d8f2d63061d8420cad6786f8667e9ba4783 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fd120d8f2d63061d8420cad6786f8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 19 16:04:53 2023 -0500 vkd3d-shader: Rename vkd3d_shader_next_stage_info to vkd3d_shader_varying_map_info. It was originally intended that this structure could hold other information about the next stage which compilation might depend on. For example, compilation to GLSL needs to know the type of the next shader in some circumstances. That was never actualized, and since the API is fixed at this point for 1.9, it makes the most sense to rename the structure to match its actual scope. The documentation was written and arranged to imply that the structure would hold other information about the next shader than the varying map; this is changed accordingly as well. --- include/vkd3d_shader.h | 40 +++++++++++++++++++--------------------- libs/vkd3d-shader/ir.c | 18 +++++++++--------- 2 files changed, 28 insertions(+), 30 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fc2c1257..7c45d410 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -91,10 +91,10 @@ enum vkd3d_shader_structure_type */ VKD3D_SHADER_STRUCTURE_TYPE_SCAN_SIGNATURE_INFO, /** - * The structure is a vkd3d_shader_next_stage_info structure. + * The structure is a vkd3d_shader_varying_map_info structure. * \since 1.9 */ - VKD3D_SHADER_STRUCTURE_TYPE_NEXT_STAGE_INFO, + VKD3D_SHADER_STRUCTURE_TYPE_VARYING_MAP_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -1690,7 +1690,7 @@ struct vkd3d_shader_scan_signature_info * Describes the mapping of a output varying register in a shader stage, * to an input varying register in the following shader stage. * - * This structure is used in struct vkd3d_shader_next_stage_info. + * This structure is used in struct vkd3d_shader_varying_map_info. */ struct vkd3d_shader_varying_map { @@ -1708,15 +1708,21 @@ struct vkd3d_shader_varying_map }; /** - * A chained structure which describes the next shader in the pipeline. + * A chained structure which describes how output varyings in this shader stage + * should be mapped to input varyings in the next stage. * - * This structure is optional, and should only be provided if there is in fact - * another shader in the pipeline. + * This structure is optional. It should not be provided if there is no shader + * stage. * However, depending on the input and output formats, this structure may be * necessary in order to generate shaders which correctly match each other. - * If the structure or its individual fields are not provided, vkd3d-shader - * will generate shaders which may be correct in isolation, but are not - * guaranteed to correctly match each other. + * + * If this structure is absent, vkd3d-shader will map varyings from one stage + * to another based on their register index. + * For Direct3D shader model 3.0, such a default mapping will be incorrect + * unless the registers are allocated in the same order, and hence this + * field is necessary to correctly match inter-stage varyings. + * This mapping may also be necessary under other circumstances where the + * varying interface does not match exactly. * * This structure is passed to vkd3d_shader_compile() and extends * vkd3d_shader_compile_info. @@ -1725,9 +1731,9 @@ struct vkd3d_shader_varying_map * * \since 1.9 */ -struct vkd3d_shader_next_stage_info +struct vkd3d_shader_varying_map_info { - /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_NEXT_STAGE_INFO. */ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_VARYING_MAP_INFO. */ enum vkd3d_shader_structure_type type; /** Optional pointer to a structure containing further parameters. */ const void *next; @@ -1741,14 +1747,6 @@ struct vkd3d_shader_next_stage_info * If this shader stage outputs a varying that is not consumed by the next * shader stage, that varying should be absent from this array. * - * If this field is absent, vkd3d-shader will map varyings from one stage - * to another based on their register index. - * For Direct3D shader model 3.0, such a default mapping will be incorrect - * unless the registers are allocated in the same order, and hence this - * field is necessary to correctly match inter-stage varyings. - * This mapping may also be necessary under other circumstances where the - * varying interface does not match exactly. - * * This mapping may be constructed by vkd3d_shader_build_varying_map(). */ const struct vkd3d_shader_varying_map *varying_map; @@ -1830,7 +1828,7 @@ VKD3D_SHADER_API const enum vkd3d_shader_target_type *vkd3d_shader_get_supported * following chained structures: * - vkd3d_shader_hlsl_source_info * - vkd3d_shader_interface_info - * - vkd3d_shader_next_stage_info + * - vkd3d_shader_varying_map_info * - vkd3d_shader_scan_descriptor_info * - vkd3d_shader_scan_signature_info * - vkd3d_shader_spirv_domain_shader_target_info @@ -2273,7 +2271,7 @@ VKD3D_SHADER_API void vkd3d_shader_free_scan_signature_info(struct vkd3d_shader_ * Build a mapping of output varyings in a shader stage to input varyings in * the following shader stage. * - * This mapping should be used in struct vkd3d_shader_next_stage_info to + * This mapping should be used in struct vkd3d_shader_varying_map_info to * compile the first shader. * * \param output_signature The output signature of the first shader. diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 6d7c8965..d2bfb933 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -86,14 +86,14 @@ static void shader_instruction_eliminate_phase_instance_id(struct vkd3d_shader_i } static const struct vkd3d_shader_varying_map *find_varying_map( - const struct vkd3d_shader_next_stage_info *next_stage, unsigned int signature_idx) + const struct vkd3d_shader_varying_map_info *varying_map, unsigned int signature_idx) { unsigned int i; - for (i = 0; i < next_stage->varying_count; ++i) + for (i = 0; i < varying_map->varying_count; ++i) { - if (next_stage->varying_map[i].output_signature_index == signature_idx) - return &next_stage->varying_map[i]; + if (varying_map->varying_map[i].output_signature_index == signature_idx) + return &varying_map->varying_map[i]; } return NULL; @@ -103,15 +103,15 @@ static enum vkd3d_result remap_output_signature(struct vkd3d_shader_parser *pars const struct vkd3d_shader_compile_info *compile_info) { struct shader_signature *signature = &parser->shader_desc.output_signature; - const struct vkd3d_shader_next_stage_info *next_stage; + const struct vkd3d_shader_varying_map_info *varying_map; unsigned int i; - if (!(next_stage = vkd3d_find_struct(compile_info->next, NEXT_STAGE_INFO))) + if (!(varying_map = vkd3d_find_struct(compile_info->next, VARYING_MAP_INFO))) return VKD3D_OK; for (i = 0; i < signature->element_count; ++i) { - const struct vkd3d_shader_varying_map *map = find_varying_map(next_stage, i); + const struct vkd3d_shader_varying_map *map = find_varying_map(varying_map, i); struct signature_element *e = &signature->elements[i]; if (map) @@ -137,9 +137,9 @@ static enum vkd3d_result remap_output_signature(struct vkd3d_shader_parser *pars } } - for (i = 0; i < next_stage->varying_count; ++i) + for (i = 0; i < varying_map->varying_count; ++i) { - if (next_stage->varying_map[i].output_signature_index >= signature->element_count) + if (varying_map->varying_map[i].output_signature_index >= signature->element_count) { vkd3d_shader_parser_error(parser, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED, "Aborting due to not yet implemented feature: "

1 0