winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2023
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
920 discussions
Start a n
N
ew thread
Rémi Bernon : dmband: Rewrite band track IPersistStream_Load.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Rémi Bernon : dmband: Rewrite band track DBMT chunk parsing.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Rémi Bernon : dmband: Rewrite band track lbdl/lbnd lists parsing.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Alistair Leslie-Hughes : msado15: Recordset::Open - Correctly update count/index values.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Brendan Shanks : winecoreaudio: Stop using the deprecated kAudioObjectPropertyElementMaster constant.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Tag vkd3d-1.9 : Alexandre Julliard : Release 1.9
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Henri Verbeet : Release 1.9.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Zebediah Figura : vkd3d-shader/d3dbc: Translate sm1 fragment outputs to system values.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Zebediah Figura : vkd3d-shader/dxbc: Map sm4 fragment outputs to system values based on their name.
by Alexandre Julliard
21 Sep '23
21 Sep '23
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
0
0
Zebediah Figura : vkd3d-shader: Add definitions for more fragment output system values.
by Alexandre Julliard
21 Sep '23
21 Sep '23
Module: vkd3d Branch: master Commit: 8c112709409589f9f70d674ac84186f5f7df1c84 URL:
https://gitlab.winehq.org/wine/vkd3d/-/commit/8c112709409589f9f70d674ac8418…
Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 20 13:06:23 2023 -0500 vkd3d-shader: Add definitions for more fragment output system values. --- include/vkd3d_shader.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7c45d410..892d4440 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -1464,8 +1464,24 @@ enum vkd3d_shader_sysval_semantic VKD3D_SHADER_SV_TESS_FACTOR_TRIINT = 0x0e, VKD3D_SHADER_SV_TESS_FACTOR_LINEDET = 0x0f, VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN = 0x10, - /** Render target; SV_Target in Direct3D shader model 6 shaders. \since 1.9 */ + /** Render target; SV_Target in Direct3D. \since 1.9 */ VKD3D_SHADER_SV_TARGET = 0x40, + /** Depth; SV_Depth in Direct3D. \since 1.9 */ + VKD3D_SHADER_SV_DEPTH = 0x41, + /** Sample mask; SV_Coverage in Direct3D. \since 1.9 */ + VKD3D_SHADER_SV_COVERAGE = 0x42, + /** + * Depth, which is guaranteed to be greater than or equal to the current + * depth; SV_DepthGreaterEqual in Direct3D. \since 1.9 + */ + VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL = 0x43, + /** + * Depth, which is guaranteed to be less than or equal to the current + * depth; SV_DepthLessEqual in Direct3D. \since 1.9 + */ + VKD3D_SHADER_SV_DEPTH_LESS_EQUAL = 0x44, + /** Stencil reference; SV_StencilRef in Direct3D. \since 1.9 */ + VKD3D_SHADER_SV_STENCIL_REF = 0x45, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SYSVAL_SEMANTIC), };
1
0
0
0
← Newer
1
...
22
23
24
25
26
27
28
...
92
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
Results per page:
10
25
50
100
200