wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Zebediah Figura : strmbase: Determine the pin count using the GetPin() callback.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 89242d8b9401dbd0f709a4a3602194f2a9923ad7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89242d8b9401dbd0f709a4a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:56 2019 -0500 strmbase: Determine the pin count using the GetPin() callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 7aa6611..15d6cab 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -27,7 +27,7 @@ typedef struct IEnumPinsImpl { IEnumPins IEnumPins_iface; LONG refCount; - ULONG uIndex; + unsigned int uIndex, count; BaseFilter *base; DWORD Version; } IEnumPinsImpl; @@ -42,6 +42,7 @@ static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) { IEnumPinsImpl * pEnumPins; + IPin *pin; if (!ppEnum) return E_POINTER; @@ -59,6 +60,13 @@ HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; pEnumPins->Version = base->pin_version; + pEnumPins->count = 0; + + while ((pin = base->pFuncsTable->pfnGetPin(base, pEnumPins->count))) + { + IPin_Release(pin); + ++pEnumPins->count; + } TRACE("Created new enumerator (%p)\n", *ppEnum); return S_OK; @@ -161,7 +169,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) if (enum_pins->Version != enum_pins->base->pin_version) return VFW_E_ENUM_OUT_OF_SYNC; - if (enum_pins->uIndex + count > enum_pins->base->pFuncsTable->pfnGetPinCount(enum_pins->base)) + if (enum_pins->uIndex + count > enum_pins->count) return S_FALSE; enum_pins->uIndex += count; @@ -171,9 +179,20 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) { IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); + IPin *pin; TRACE("iface %p.\n", iface); + if (enum_pins->Version != enum_pins->base->pin_version) + { + enum_pins->count = 0; + while ((pin = enum_pins->base->pFuncsTable->pfnGetPin(enum_pins->base, enum_pins->count))) + { + IPin_Release(pin); + ++enum_pins->count; + } + } + enum_pins->Version = enum_pins->base->pin_version; enum_pins->uIndex = 0;

1 0

Zebediah Figura : wineqtdecoder: Fix implementation of QT_GetPin().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 42b6b85ec01756105a0027451e5b8b160677e793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42b6b85ec01756105a002745… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:55 2019 -0500 wineqtdecoder: Fix implementation of QT_GetPin(). strmbase assumes that pins are consecutive. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 44 +++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 4855069..614b891 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,29 +202,35 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */ -static IPin* WINAPI QT_GetPin(BaseFilter *iface, int pos) +static IPin * WINAPI QT_GetPin(BaseFilter *base, int index) { - QTSplitter *This = impl_from_BaseFilter(iface); - TRACE("Asking for pos %x\n", pos); + QTSplitter *filter = impl_from_BaseFilter(base); - if (pos > 2 || pos < 0) - return NULL; - switch (pos) + if (index == 0) { - case 0: - IPin_AddRef(&This->pInputPin.pin.IPin_iface); - return &This->pInputPin.pin.IPin_iface; - case 1: - if (This->pVideo_Pin) - IPin_AddRef(&This->pVideo_Pin->pin.pin.IPin_iface); - return &This->pVideo_Pin->pin.pin.IPin_iface; - case 2: - if (This->pAudio_Pin) - IPin_AddRef(&This->pAudio_Pin->pin.pin.IPin_iface); - return &This->pAudio_Pin->pin.pin.IPin_iface; - default: - return NULL; + IPin_AddRef(&filter->pInputPin.pin.IPin_iface); + return &filter->pInputPin.pin.IPin_iface; } + else if (index == 1) + { + if (filter->pVideo_Pin) + { + IPin_AddRef(&filter->pVideo_Pin->pin.pin.IPin_iface); + return &filter->pVideo_Pin->pin.pin.IPin_iface; + } + else if (filter->pAudio_Pin) + { + IPin_AddRef(&filter->pAudio_Pin->pin.pin.IPin_iface); + return &filter->pAudio_Pin->pin.pin.IPin_iface; + } + } + else if (index == 2 && filter->pVideo_Pin && filter->pAudio_Pin) + { + IPin_AddRef(&filter->pAudio_Pin->pin.pin.IPin_iface); + return &filter->pAudio_Pin->pin.pin.IPin_iface; + } + + return NULL; } static LONG WINAPI QT_GetPinCount(BaseFilter *iface)

1 0

Zebediah Figura : strmbase: Remove function pointers from the IEnumPinsImpl structure.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: a95c1f300e29f9d575ca60a677c76b3d22ac1b2a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a95c1f300e29f9d575ca60a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 13 22:17:54 2019 -0500 strmbase: Remove function pointers from the IEnumPinsImpl structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 39 ++++++++++++++++----------------------- dlls/strmbase/filter.c | 21 +++++++-------------- dlls/strmbase/strmbase_private.h | 4 +--- include/wine/strmbase.h | 4 +--- 4 files changed, 25 insertions(+), 43 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 65a11bd..7aa6611 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -29,9 +29,6 @@ typedef struct IEnumPinsImpl LONG refCount; ULONG uIndex; BaseFilter *base; - BaseFilter_GetPin receive_pin; - BaseFilter_GetPinCount receive_pincount; - BaseFilter_GetPinVersion receive_version; DWORD Version; } IEnumPinsImpl; @@ -42,7 +39,7 @@ static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; -HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum) +HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum) { IEnumPinsImpl * pEnumPins; @@ -58,13 +55,10 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; - pEnumPins->receive_pin = receive_pin; - pEnumPins->receive_pincount = receive_pincount; - pEnumPins->receive_version = receive_version; pEnumPins->base = base; IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; - pEnumPins->Version = receive_version(base); + pEnumPins->Version = base->pin_version; TRACE("Created new enumerator (%p)\n", *ppEnum); return S_OK; @@ -134,13 +128,13 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** if (pcFetched) *pcFetched = 0; - if (This->Version != This->receive_version(This->base)) + if (This->Version != This->base->pin_version) return VFW_E_ENUM_OUT_OF_SYNC; while (i < cPins) { IPin *pin; - pin = This->receive_pin(This->base, This->uIndex + i); + pin = This->base->pFuncsTable->pfnGetPin(This->base, This->uIndex + i); if (!pin) break; @@ -164,39 +158,38 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins *iface, ULONG count) TRACE("enum_pins %p, count %u.\n", enum_pins, count); - if (enum_pins->Version != enum_pins->receive_version(enum_pins->base)) + if (enum_pins->Version != enum_pins->base->pin_version) return VFW_E_ENUM_OUT_OF_SYNC; - if (enum_pins->uIndex + count > enum_pins->receive_pincount(enum_pins->base)) + if (enum_pins->uIndex + count > enum_pins->base->pFuncsTable->pfnGetPinCount(enum_pins->base)) return S_FALSE; enum_pins->uIndex += count; return S_OK; } -static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) +static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) { - IEnumPinsImpl *This = impl_from_IEnumPins(iface); + IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); - TRACE("(%p)->()\n", iface); + TRACE("iface %p.\n", iface); - This->Version = This->receive_version(This->base); + enum_pins->Version = enum_pins->base->pin_version; + enum_pins->uIndex = 0; - This->uIndex = 0; return S_OK; } -static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) +static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins *iface, IEnumPins **out) { + IEnumPinsImpl *enum_pins = impl_from_IEnumPins(iface); HRESULT hr; - IEnumPinsImpl *This = impl_from_IEnumPins(iface); - TRACE("(%p)->(%p)\n", iface, ppEnum); + TRACE("iface %p, out %p.\n", iface, out); - hr = EnumPins_Construct(This->base, This->receive_pin, This->receive_pincount, This->receive_version, ppEnum); - if (FAILED(hr)) + if (FAILED(hr = enum_pins_create(enum_pins->base, out))) return hr; - return IEnumPins_Skip(*ppEnum, This->uIndex); + return IEnumPins_Skip(*out, enum_pins->uIndex); } static const IEnumPinsVtbl IEnumPinsImpl_Vtbl = diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 50340cd..ed0039f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -125,13 +125,13 @@ HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock return S_OK; } -HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) +HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter *iface, IEnumPins **enum_pins) { - BaseFilter *This = impl_from_IBaseFilter(iface); + BaseFilter *filter = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%p)\n", iface, ppEnum); + TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - return EnumPins_Construct(This, This->pFuncsTable->pfnGetPin, This->pFuncsTable->pfnGetPinCount, BaseFilterImpl_GetPinVersion, ppEnum); + return enum_pins_create(filter, enum_pins); } HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin **ret) @@ -206,16 +206,9 @@ HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVend return E_NOTIMPL; } -LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter * This) -{ - TRACE("(%p)\n", This); - return This->pinVersion; -} - -VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter * This) +VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter *filter) { - InterlockedIncrement(&This->pinVersion); - TRACE("(%p) -> New pinVersion %i\n", This,This->pinVersion); + InterlockedIncrement(&filter->pin_version); } HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable) @@ -229,7 +222,7 @@ HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, c ZeroMemory(&This->filterInfo, sizeof(FILTER_INFO)); This->clsid = *pClsid; This->csFilter.DebugInfo->Spare[0] = DebugInfo; - This->pinVersion = 1; + This->pin_version = 1; This->pFuncsTable = pBaseFuncsTable; diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index f3367f8..de13a53 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -63,9 +63,7 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv); void QualityControlRender_BeginRender(QualityControlImpl *This); void QualityControlRender_EndRender(QualityControlImpl *This); -HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin pfn_get_pin, - BaseFilter_GetPinCount pfn_get_pin_count, BaseFilter_GetPinVersion pfn_get_pin_version, - IEnumPins **enum_pins); +HRESULT enum_pins_create(BaseFilter *base, IEnumPins **enum_pins); HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_TIME start); HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 120642c..477f162 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -163,14 +163,13 @@ typedef struct BaseFilter IReferenceClock * pClock; FILTER_INFO filterInfo; CLSID clsid; - LONG pinVersion; + LONG pin_version; const struct BaseFilterFuncTable* pFuncsTable; } BaseFilter; typedef IPin* (WINAPI *BaseFilter_GetPin)(BaseFilter* iface, int iPosition); typedef LONG (WINAPI *BaseFilter_GetPinCount)(BaseFilter* iface); -typedef LONG (WINAPI *BaseFilter_GetPinVersion)(BaseFilter* iface); typedef struct BaseFilterFuncTable { /* Required */ @@ -191,7 +190,6 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ); HRESULT WINAPI BaseFilterImpl_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo); -LONG WINAPI BaseFilterImpl_GetPinVersion(BaseFilter* This); VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable);

1 0

Józef Kucia : tests: Test eval attribute instructions with packed inputs.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 49ba93066e5a3ca4ec5b8b77d080cf554ff8a58a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=49ba93066e5a3ca4ec5b8b7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:43 2019 +0200 tests: Test eval attribute instructions with packed inputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 58 +++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 13 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 842939b..82264c0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -27961,26 +27961,57 @@ static void test_shader_eval_attribute(void) 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_eval_sample_index = {ps_eval_sample_index_code, sizeof(ps_eval_sample_index_code)}; + static const DWORD vs_eval_centroid_code[] = + { +#if 0 + void main(uint id : SV_VertexID, out float4 position : SV_Position, + out float2 attr : ATTR, out float2 attr2 : ATTR2, out centroid float2 ref : REF) + { + float2 coords = float2((id << 1) & 2, id & 2); + position = float4(coords * float2(2, -2) + float2(-1, 1), 0, 1); + attr = attr2 = ref = position.xy; + } +#endif + 0x43425844, 0xed41033d, 0xa2906698, 0x319dcb84, 0x41750935, 0x00000001, 0x00000240, 0x00000003, + 0x0000002c, 0x00000060, 0x000000e8, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000006, 0x00000001, 0x00000000, 0x00000101, 0x565f5653, 0x65747265, 0x00444978, + 0x4e47534f, 0x00000080, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x00000001, 0x00000003, + 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x00000c03, + 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000001, 0x0000030c, 0x00000079, 0x00000000, + 0x00000000, 0x00000003, 0x00000002, 0x00000c03, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, + 0x46455200, 0xababab00, 0x58454853, 0x00000150, 0x00010050, 0x00000054, 0x0100086a, 0x04000060, + 0x00101012, 0x00000000, 0x00000006, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x03000065, + 0x00102032, 0x00000001, 0x03000065, 0x001020c2, 0x00000001, 0x03000065, 0x00102032, 0x00000002, + 0x02000068, 0x00000001, 0x0b00008c, 0x00100012, 0x00000000, 0x00004001, 0x00000001, 0x00004001, + 0x00000001, 0x0010100a, 0x00000000, 0x00004001, 0x00000000, 0x07000001, 0x00100042, 0x00000000, + 0x0010100a, 0x00000000, 0x00004001, 0x00000002, 0x05000056, 0x00100032, 0x00000000, 0x00100086, + 0x00000000, 0x0f000032, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, 0x40000000, + 0xc0000000, 0x00000000, 0x00000000, 0x00004002, 0xbf800000, 0x3f800000, 0x00000000, 0x00000000, + 0x05000036, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x08000036, 0x001020c2, 0x00000000, + 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x05000036, 0x001020f2, 0x00000001, + 0x00100446, 0x00000000, 0x05000036, 0x00102032, 0x00000002, 0x00100046, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs_eval_centroid = {vs_eval_centroid_code, sizeof(vs_eval_centroid_code)}; static const DWORD ps_eval_centroid_code[] = { #if 0 - float4 main(float4 p : SV_Position, float2 attr : ATTR, centroid float2 ref : REF) : SV_Target + float4 main(float4 p : SV_Position, float2 attr : ATTR, float2 attr2 : ATTR2, centroid float2 ref : REF) : SV_Target { return float4(EvaluateAttributeCentroid(attr) - ref, 0, 1); } #endif - 0x43425844, 0x77f3381c, 0x9cf9ef7c, 0xefc86041, 0x1ab6e047, 0x00000001, 0x00000168, 0x00000003, - 0x0000002c, 0x0000009c, 0x000000d0, 0x4e475349, 0x00000068, 0x00000003, 0x00000008, 0x00000050, - 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x0000005c, 0x00000000, 0x00000000, - 0x00000003, 0x00000001, 0x00000303, 0x00000061, 0x00000000, 0x00000000, 0x00000003, 0x00000002, - 0x00000303, 0x505f5653, 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x4e47534f, - 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024, - 0x0100086a, 0x03001062, 0x00101032, 0x00000001, 0x03001862, 0x00101032, 0x00000002, 0x03000065, - 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x050000cd, 0x00100032, 0x00000000, 0x00101046, - 0x00000001, 0x08000000, 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, - 0x00000002, 0x08000036, 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, - 0x3f800000, 0x0100003e, + 0x43425844, 0x8ec53803, 0xdfd9505b, 0x8d4ce8ad, 0xbbefe3d4, 0x00000001, 0x00000180, 0x00000003, + 0x0000002c, 0x000000b4, 0x000000e8, 0x4e475349, 0x00000080, 0x00000004, 0x00000008, 0x00000068, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x00000074, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000303, 0x00000074, 0x00000002, 0x00000000, 0x00000003, 0x00000001, + 0x0000000c, 0x00000079, 0x00000000, 0x00000000, 0x00000003, 0x00000002, 0x00000303, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x52545441, 0x46455200, 0xababab00, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, + 0x65677261, 0xabab0074, 0x58454853, 0x00000090, 0x00000050, 0x00000024, 0x0100086a, 0x03001062, + 0x00101032, 0x00000001, 0x03001862, 0x00101032, 0x00000002, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x050000cd, 0x00100032, 0x00000000, 0x00101046, 0x00000001, 0x08000000, + 0x00102032, 0x00000000, 0x00100046, 0x00000000, 0x80101046, 0x00000041, 0x00000002, 0x08000036, + 0x001020c2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_eval_centroid = {ps_eval_centroid_code, sizeof(ps_eval_centroid_code)}; static const struct vec4 expected_vec4 = {0.0f, 0.0f, 0.0f, 1.0f}; @@ -28027,6 +28058,7 @@ static void test_shader_eval_attribute(void) D3D12_RESOURCE_STATE_RESOLVE_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.VS = vs_eval_centroid; pso_desc.PS = ps_eval_centroid; hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, &IID_ID3D12PipelineState, (void **)&context.pipeline_state);

1 0

Józef Kucia : vkd3d-shader: Try to avoid private IO variables even harder.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 91820630cb49ef645ca6251f63ce2ff63e0c568d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=91820630cb49ef645ca6251… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:42 2019 +0200 vkd3d-shader: Try to avoid private IO variables even harder. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 111 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f85db11..e308ef3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3784,17 +3784,63 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp return id; } -static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, unsigned int reg_idx) +static bool vkd3d_write_mask_is_contiguous(unsigned int mask) { + unsigned int i, j; + + assert(mask); + for (i = 0, j = 0; i < VKD3D_VEC4_SIZE; ++i) + { + if (mask & (1u << i)) + ++j; + else if (j) + break; + } + + return vkd3d_write_mask_component_count(mask) == j; +} + +static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, + unsigned int reg_idx, const struct vkd3d_spirv_builtin *builtin, + unsigned int *component_count, unsigned int *out_write_mask) +{ + unsigned int write_mask = 0; + bool have_sysval = false; unsigned int i, count; - count = 0; - for (i = 0; i < signature->element_count; ++i) + if (*component_count == VKD3D_VEC4_SIZE) + return false; + + for (i = 0, count = 0; i < signature->element_count; ++i) { - if (signature->elements[i].register_index == reg_idx) - ++count; + const struct vkd3d_shader_signature_element *current = &signature->elements[i]; + + if (current->register_index != reg_idx) + continue; + + write_mask |= current->mask & 0xff; + ++count; + + if (current->sysval_semantic) + have_sysval = true; } - return count > 1; + + if (count == 1) + return false; + + if (builtin || have_sysval) + return true; + + if (!vkd3d_write_mask_is_contiguous(write_mask)) + { + FIXME("Write mask %#x is non-contiguous.\n", write_mask); + return true; + } + + assert(vkd3d_write_mask_component_count(write_mask) >= *component_count); + *component_count = vkd3d_write_mask_component_count(write_mask); + *out_write_mask = write_mask; + return false; } static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, @@ -3865,9 +3911,11 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } if ((use_private_var = builtin && builtin->fixup_pfn)) - write_mask = dst->write_mask; - - if (input_component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, reg_idx)) + { + component_count = VKD3D_VEC4_SIZE; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + else if (needs_private_io_variable(shader_signature, reg_idx, builtin, &input_component_count, &write_mask)) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; @@ -3876,9 +3924,16 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi storage_class = SpvStorageClassInput; + vkd3d_symbol_make_register(&reg_symbol, reg); + if (builtin) { input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); + entry = rb_get(&compiler->symbol_table, &reg_symbol); + } + else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + input_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; } else { @@ -3895,18 +3950,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if (reg->type == VKD3DSPR_PATCHCONST) vkd3d_spirv_build_op_decorate(builder, input_id, SpvDecorationPatch, NULL, 0); - vkd3d_symbol_make_register(&reg_symbol, reg); - - if (!use_private_var) + if (entry || !use_private_var) { var_id = input_id; } - else if (!(entry = rb_get(&compiler->symbol_table, &reg_symbol))) + else { storage_class = SpvStorageClassPrivate; var_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, storage_class, VKD3D_TYPE_FLOAT, component_count, array_size); } + if (!entry) { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, @@ -4159,11 +4213,11 @@ static void vkd3d_dxbc_compiler_emit_output_register(struct vkd3d_dxbc_compiler static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { - unsigned int component_idx, component_count, output_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_signature_element *signature_element; const struct vkd3d_shader_signature *shader_signature; const struct vkd3d_shader_register *reg = &dst->reg; + unsigned int component_idx, output_component_count; const struct vkd3d_spirv_builtin *builtin; enum vkd3d_component_type component_type; const struct vkd3d_shader_phase *phase; @@ -4196,7 +4250,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler write_mask = signature_element->mask & 0xff; component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); - component_count = vkd3d_write_mask_component_count(dst->write_mask); output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); if (builtin) { @@ -4208,25 +4261,34 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler { component_type = signature_element->component_type; } - assert(component_count <= output_component_count); storage_class = SpvStorageClassOutput; if ((use_private_variable = builtin && builtin->spirv_array_size)) write_mask = dst->write_mask; - - if ((component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, signature_element->register_index)) - || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE) + else if (get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE + || needs_private_io_variable(shader_signature, signature_element->register_index, + builtin, &output_component_count, &write_mask)) { use_private_variable = true; write_mask = VKD3DSP_WRITEMASK_ALL; } + vkd3d_symbol_make_register(&reg_symbol, reg); + if (compiler->output_info[signature_idx].id) { id = compiler->output_info[signature_idx].id; - use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; + if (compiler->output_info[signature_idx].array_element_mask) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + entry = rb_get(&compiler->symbol_table, &reg_symbol); + } + } + else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + { + id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; } else { @@ -4269,11 +4331,10 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (use_private_variable) storage_class = SpvStorageClassPrivate; - vkd3d_symbol_make_register(&reg_symbol, reg); - if (!use_private_variable) - var_id = id; - else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if (entry) var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + else if (!use_private_variable) + var_id = id; else var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, storage_class, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE);

1 0

Józef Kucia : vkd3d-shader: Handle interpolation mode in vkd3d_dxbc_compiler_emit_input().
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 267f10df8b0b541893c013215ee26c95a7447c1b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=267f10df8b0b541893c0132… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:41 2019 +0200 vkd3d-shader: Handle interpolation mode in vkd3d_dxbc_compiler_emit_input(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 79 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 5477efd..f85db11 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3330,6 +3330,36 @@ static void vkd3d_dxbc_compiler_decorate_builtin(struct vkd3d_dxbc_compiler *com vkd3d_spirv_build_op_decorate1(builder, target_id, SpvDecorationBuiltIn, builtin); } +static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, + uint32_t id, enum vkd3d_shader_interpolation_mode mode) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + switch (mode) + { + case VKD3DSIM_NONE: + break; + case VKD3DSIM_CONSTANT: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); + break; + case VKD3DSIM_LINEAR: + break; + case VKD3DSIM_LINEAR_CENTROID: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); + break; + case VKD3DSIM_LINEAR_NOPERSPECTIVE: + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); + break; + case VKD3DSIM_LINEAR_SAMPLE: + vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); + vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); + break; + default: + FIXME("Unhandled interpolation mode %#x.\n", mode); + break; + } +} + static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler *compiler, enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) { @@ -3768,7 +3798,8 @@ static bool needs_private_io_variable(const struct vkd3d_shader_signature *signa } static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, - const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) + const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval, + enum vkd3d_shader_interpolation_mode interpolation_mode) { unsigned int component_idx, component_count, input_component_count; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -3857,6 +3888,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, reg_idx); if (component_idx) vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); + + vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, interpolation_mode); } if (reg->type == VKD3DSPR_PATCHCONST) @@ -3961,7 +3994,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_INPUT: - vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; case VKD3DSPR_OUTPOINTID: case VKD3DSPR_PRIMID: @@ -5089,64 +5122,30 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); else if (vkd3d_shader_register_is_input(&dst->reg) || dst->reg.type == VKD3DSPR_PATCHCONST) - vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); + vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst); } -static void vkd3d_dxbc_compiler_emit_interpolation_decorations(struct vkd3d_dxbc_compiler *compiler, - uint32_t id, enum vkd3d_shader_interpolation_mode mode) -{ - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - - switch (mode) - { - case VKD3DSIM_CONSTANT: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationFlat, NULL, 0); - break; - case VKD3DSIM_LINEAR: - break; - case VKD3DSIM_LINEAR_CENTROID: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationCentroid, NULL, 0); - break; - case VKD3DSIM_LINEAR_NOPERSPECTIVE: - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationNoPerspective, NULL, 0); - break; - case VKD3DSIM_LINEAR_SAMPLE: - vkd3d_spirv_enable_capability(builder, SpvCapabilitySampleRateShading); - vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationSample, NULL, 0); - break; - default: - FIXME("Unhandled interpolation mode %#x.\n", mode); - break; - } -} - static void vkd3d_dxbc_compiler_emit_dcl_input_ps(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - uint32_t input_id; - - if ((input_id = vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE))) - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.dst, VKD3D_SIV_NONE, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_ps_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_register_semantic *semantic = &instruction->declaration.register_semantic; - uint32_t input_id; - input_id = vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic); - if (input_id && !semantic->sysval_semantic) - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, instruction->flags); + vkd3d_dxbc_compiler_emit_input(compiler, &semantic->reg, semantic->sysval_semantic, instruction->flags); } static void vkd3d_dxbc_compiler_emit_dcl_input_sysval(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_input(compiler, &instruction->declaration.register_semantic.reg, - instruction->declaration.register_semantic.sysval_semantic); + instruction->declaration.register_semantic.sysval_semantic, VKD3DSIM_NONE); } static void vkd3d_dxbc_compiler_emit_dcl_output(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 54d0705..47764e5 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -430,6 +430,7 @@ enum vkd3d_shader_dst_modifier enum vkd3d_shader_interpolation_mode { + VKD3DSIM_NONE = 0, VKD3DSIM_CONSTANT = 1, VKD3DSIM_LINEAR = 2, VKD3DSIM_LINEAR_CENTROID = 3,

1 0

Józef Kucia : vkd3d-shader: Clear output register status while leaving control point phase.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: f0530d92b82c727e82a6781f3d9d7d04693ccd0f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0530d92b82c727e82a6781… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:40 2019 +0200 vkd3d-shader: Clear output register status while leaving control point phase. We need to clear output register status when epilogue function isn't used. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 18e10ad..5477efd 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4474,10 +4474,6 @@ static void vkd3d_dxbc_compiler_emit_shader_epilogue_function(struct vkd3d_dxbc_ vkd3d_spirv_build_op_return(&compiler->spirv_builder); vkd3d_spirv_build_op_function_end(builder); - /* Fork and join phases share output registers (patch constants). */ - if (!phase || is_control_point_phase(phase)) - memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); - memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); compiler->epilogue_function_id = 0; @@ -5443,6 +5439,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c memset(&reg, 0, sizeof(reg)); reg.idx[1].offset = ~0u; + /* Fork and join phases share output registers (patch constants). + * Control point phase has separate output registers. */ + memset(compiler->output_info, 0, signature->element_count * sizeof(*compiler->output_info)); + memset(compiler->private_output_variable, 0, sizeof(compiler->private_output_variable)); + memset(compiler->private_output_variable_write_mask, 0, sizeof(compiler->private_output_variable_write_mask)); + for (i = 0; i < signature->element_count; ++i) { const struct vkd3d_shader_signature_element *e = &signature->elements[i];

1 0

Józef Kucia : vkd3d-shader: Do not assume destination is 4 component vector in vkd3d_dxbc_compiler_emit_store ().
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 68a4b89d6160c97ac2acc0e502f9524f6b115cc8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68a4b89d6160c97ac2acc0e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:39 2019 +0200 vkd3d-shader: Do not assume destination is 4 component vector in vkd3d_dxbc_compiler_emit_store(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e3adc5a..18e10ad 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3179,7 +3179,7 @@ static void vkd3d_dxbc_compiler_emit_store(struct vkd3d_dxbc_compiler *compiler, for (i = 0, component_idx = 0; i < dst_component_count; ++i) { if (write_mask & (VKD3DSP_WRITEMASK_0 << i)) - components[i] = VKD3D_VEC4_SIZE + component_idx++; + components[i] = dst_component_count + component_idx++; else components[i] = i; }

1 0

Józef Kucia : vkd3d-shader: Try harder to avoid private variables for shader outputs.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: f650b2f6ac2f5372d45e6e58f263d02b2cfe2127 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f650b2f6ac2f5372d45e6e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:38 2019 +0200 vkd3d-shader: Try harder to avoid private variables for shader outputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 51 ++++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 84fcb6a..e3adc5a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3600,20 +3600,6 @@ static const struct vkd3d_shader_signature_element *vkd3d_find_signature_element return NULL; } -static unsigned int vkd3d_count_signature_elements_for_reg( - const struct vkd3d_shader_signature *signature, unsigned int reg_idx) -{ - unsigned int i, count; - - count = 0; - for (i = 0; i < signature->element_count; ++i) - { - if (signature->elements[i].register_index == reg_idx) - ++count; - } - return count; -} - static void vkd3d_dxbc_compiler_emit_shader_phase_name(struct vkd3d_dxbc_compiler *compiler, uint32_t id, const struct vkd3d_shader_phase *phase, const char *suffix) { @@ -3768,6 +3754,19 @@ static uint32_t vkd3d_dxbc_compiler_emit_builtin_variable(struct vkd3d_dxbc_comp return id; } +static bool needs_private_io_variable(const struct vkd3d_shader_signature *signature, unsigned int reg_idx) +{ + unsigned int i, count; + + count = 0; + for (i = 0; i < signature->element_count; ++i) + { + if (signature->elements[i].register_index == reg_idx) + ++count; + } + return count > 1; +} + static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_dst_param *dst, enum vkd3d_shader_input_sysval_semantic sysval) { @@ -3836,8 +3835,8 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi if ((use_private_var = builtin && builtin->fixup_pfn)) write_mask = dst->write_mask; - if (input_component_count != VKD3D_VEC4_SIZE - && vkd3d_count_signature_elements_for_reg(shader_signature, reg_idx) > 1) + + if (input_component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, reg_idx)) { use_private_var = true; component_count = VKD3D_VEC4_SIZE; @@ -4140,6 +4139,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler struct rb_entry *entry = NULL; unsigned int signature_idx; bool use_private_variable; + unsigned int write_mask; unsigned int array_size; bool is_patch_constant; uint32_t id, var_id; @@ -4160,6 +4160,8 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler builtin = vkd3d_get_spirv_builtin(compiler, dst->reg.type, sysval); + write_mask = signature_element->mask & 0xff; + component_idx = vkd3d_write_mask_get_component_idx(dst->write_mask); component_count = vkd3d_write_mask_component_count(dst->write_mask); output_component_count = vkd3d_write_mask_component_count(signature_element->mask & 0xff); @@ -4177,9 +4179,21 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler storage_class = SpvStorageClassOutput; + if ((use_private_variable = builtin && builtin->spirv_array_size)) + write_mask = dst->write_mask; + + if ((component_count != VKD3D_VEC4_SIZE && needs_private_io_variable(shader_signature, signature_element->register_index)) + || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + if (compiler->output_info[signature_idx].id) { id = compiler->output_info[signature_idx].id; + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; } else { @@ -4219,9 +4233,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler compiler->output_info[signature_idx].id = id; compiler->output_info[signature_idx].component_type = component_type; - use_private_variable = component_count != VKD3D_VEC4_SIZE - || get_shader_output_swizzle(compiler, signature_element->register_index) != VKD3D_NO_SWIZZLE - || (builtin && builtin->spirv_array_size); if (use_private_variable) storage_class = SpvStorageClassPrivate; @@ -4236,7 +4247,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (!entry) { vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, - use_private_variable ? VKD3D_TYPE_FLOAT : component_type, VKD3DSP_WRITEMASK_ALL); + use_private_variable ? VKD3D_TYPE_FLOAT : component_type, write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? false : array_size; if (!use_private_variable && is_control_point_phase(phase)) {

1 0

Józef Kucia : vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins.
by Alexandre Julliard 14 May '19

14 May '19

Module: vkd3d Branch: master Commit: 1f8cde763a565c1c973f96edf14b6e98cd0e3b1e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1f8cde763a565c1c973f96e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 14 13:27:37 2019 +0200 vkd3d-shader: Avoid generating debug names for hull shader SPIR-V built-ins. SPIRV Tools disassembler generates pretty names for SPIR-V built-ins. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f0b7c5b..84fcb6a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2436,17 +2436,11 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_COLOROUT: snprintf(buffer, buffer_size, "o%u", idx); break; - case VKD3DSPR_OUTPOINTID: - snprintf(buffer, buffer_size, "vOutputControlPointID"); - break; case VKD3DSPR_DEPTHOUT: case VKD3DSPR_DEPTHOUTGE: case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; - case VKD3DSPR_PRIMID: - snprintf(buffer, buffer_size, "vPrim"); - break; case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; @@ -2483,6 +2477,10 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_SAMPLEMASK: snprintf(buffer, buffer_size, "oMask"); break; + case VKD3DSPR_OUTPOINTID: + case VKD3DSPR_PRIMID: + /* SPIRV-Tools disassembler generates names for SPIR-V built-ins. */ + return false; default: FIXME("Unhandled register %#x.\n", reg->type); snprintf(buffer, buffer_size, "unrecognized_%#x", reg->type);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2019