September 2020 - Wine-commits

Michael Stefaniuc : dmime: Reimplement the segment item parser.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 0bda3a3d690221c566a1a2d54e56610336a09de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0bda3a3d690221c566a1a2d5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:03:56 2020 +0200 dmime: Reimplement the segment item parser. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/segtriggertrack.c | 134 +++++++++++++++---------------------------- 1 file changed, 47 insertions(+), 87 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3159916ccd..ec1da7e1ed 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -24,7 +24,6 @@ #include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); -WINE_DECLARE_DEBUG_CHANNEL(dmfile); /***************************************************************************** * IDirectMusicSegTriggerTrack implementation @@ -259,94 +258,55 @@ static inline IDirectMusicSegTriggerTrack *impl_from_IPersistStream(IPersistStre return CONTAINING_RECORD(iface, IDirectMusicSegTriggerTrack, dmobj.IPersistStream_iface); } -static HRESULT parse_segment(IDirectMusicSegTriggerTrack *This, DWORD size, IStream *pStm) +static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *stream, + const struct chunk_entry *lseg) { - DMUS_PRIVATE_CHUNK Chunk; - DWORD ListSize[3], ListCount[3]; - LARGE_INTEGER liMove; /* used when skipping chunks */ - HRESULT hr; - - IDirectMusicObject* pObject = NULL; - LPDMUS_PRIVATE_SEGMENT_ITEM pNewItem = NULL; - - ListSize[0] = size - sizeof(FOURCC); - ListCount[0] = 0; - - do { - IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_SEGMENTITEM_CHUNK: { - TRACE_(dmfile)(": segment item chunk\n"); - /** alloc new item entry */ - pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_SEGMENT_ITEM)); - if (!pNewItem) - return E_OUTOFMEMORY; - - IStream_Read (pStm, &pNewItem->header, sizeof(DMUS_IO_SEGMENT_ITEM_HEADER), NULL); - TRACE_(dmfile)(" - lTimePhysical: %u\n", pNewItem->header.lTimeLogical); - TRACE_(dmfile)(" - lTimePhysical: %u\n", pNewItem->header.lTimePhysical); - TRACE_(dmfile)(" - dwPlayFlags: 0x%08x\n", pNewItem->header.dwPlayFlags); - TRACE_(dmfile)(" - dwFlags: 0x%08x\n", pNewItem->header.dwFlags); - list_add_tail (&This->Items, &pNewItem->entry); - break; - } - case DMUS_FOURCC_SEGMENTITEMNAME_CHUNK: { - TRACE_(dmfile)(": segment item name chunk\n"); - if (!pNewItem) { - ERR(": pNewItem not allocated, bad chunk order?\n"); - return E_FAIL; - } - IStream_Read (pStm, pNewItem->wszName, Chunk.dwSize, NULL); - TRACE_(dmfile)(" - name: %s\n", debugstr_w(pNewItem->wszName)); - break; - } - case FOURCC_LIST: { - struct chunk_entry list = {.id = FOURCC_LIST, .size = Chunk.dwSize}; - static const LARGE_INTEGER zero; - IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &list.offset); - list.offset.QuadPart -= sizeof(FOURCC) + sizeof(DWORD); - IStream_Read (pStm, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - list.type = Chunk.fccID; - ListSize[1] = Chunk.dwSize - sizeof(FOURCC); - ListCount[1] = 0; - switch (Chunk.fccID) { - case DMUS_FOURCC_REF_LIST: { - TRACE_(dmfile)(": DMRF (DM References) list\n"); - hr = dmobj_parsereference(pStm, &list, &pObject); - if (FAILED(hr)) { - ERR(": could not load Reference\n"); - return hr; - } - if (!pNewItem) { - ERR(": pNewItem not allocated, bad chunk order?\n"); - return E_FAIL; - } - pNewItem->pObject = pObject; - 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; + struct chunk_entry chunk = {.parent = lseg}; + DMUS_PRIVATE_SEGMENT_ITEM *item; + HRESULT hr; + + /* First chunk is a header */ + if (stream_get_chunk(stream, &chunk) != S_OK || chunk.id != DMUS_FOURCC_SEGMENTITEM_CHUNK) + return DMUS_E_TRACK_HDR_NOT_FIRST_CK; + if (!(item = heap_alloc_zero(sizeof(*item)))) + return E_OUTOFMEMORY; + hr = stream_chunk_get_data(stream, &chunk, &item->header, sizeof(DMUS_IO_SEGMENT_ITEM_HEADER)); + if (FAILED(hr)) + goto error; + + TRACE("Found DMUS_IO_SEGMENT_ITEM_HEADER\n"); + TRACE("\tlTimePhysical: %u\n", item->header.lTimeLogical); + TRACE("\tlTimePhysical: %u\n", item->header.lTimePhysical); + TRACE("\tdwPlayFlags: %#08x\n", item->header.dwPlayFlags); + TRACE("\tdwFlags: %#08x\n", item->header.dwFlags); + + /* Second chunk is a reference list */ + if (stream_next_chunk(stream, &chunk) != S_OK || chunk.id != FOURCC_LIST || + chunk.type != DMUS_FOURCC_REF_LIST) { + hr = DMUS_E_INVALID_SEGMENTTRIGGERTRACK; + goto error; } + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->pObject))) + goto error; + + /* Optional third chunk if the reference is a motif */ + if (item->header.dwFlags & DMUS_SEGMENTTRACKF_MOTIF) { + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + goto error; + if (chunk.id == DMUS_FOURCC_SEGMENTITEMNAME_CHUNK) + if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->wszName, DMUS_MAX_NAME))) + goto error; + + TRACE("Found motif name: %s\n", debugstr_w(item->wszName)); } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - - return S_OK; + + list_add_tail(&This->Items, &item->entry); + + return S_OK; + +error: + heap_free(item); + return hr; } static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, IStream *stream, @@ -359,7 +319,7 @@ static HRESULT parse_segments_list(IDirectMusicSegTriggerTrack *This, IStream *s while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_SEGMENT_LIST) - if (FAILED(hr = parse_segment(This, stream, &chunk))) + if (FAILED(hr = parse_segment_item(This, stream, &chunk))) break; return SUCCEEDED(hr) ? S_OK : hr;

1 0

Michael Stefaniuc : dmime: dmutils.h is no longer needed.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 59aa29cd1db00bb09b6faa1d7a65de00ae827ff1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59aa29cd1db00bb09b6faa1d… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:03:57 2020 +0200 dmime: dmutils.h is no longer needed. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 2 -- dlls/dmime/dmutils.h | 30 ------------------------------ 2 files changed, 32 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 9759039a03..69067fca55 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -114,6 +114,4 @@ static inline void DMIME_UnlockModule(void) { InterlockedDecrement( &DMIME_refCo * Misc. */ -#include "dmutils.h" - #endif /* __WINE_DMIME_PRIVATE_H */ diff --git a/dlls/dmime/dmutils.h b/dlls/dmime/dmutils.h deleted file mode 100644 index 521b148604..0000000000 --- a/dlls/dmime/dmutils.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Debug and Helper Functions - * - * Copyright (C) 2003-2004 Rok Mandeljc - * Copyright (C) 2003-2004 Raphael Junqueira - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_DMUTILS_H -#define __WINE_DMUTILS_H - -/* for simpler reading */ -typedef struct _DMUS_PRIVATE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; - -#endif /* __WINE_DMUTILS_H */

1 0

Michael Stefaniuc : dmime: Get rid of the DMUS_PRIVATE_SEGMENT_ITEM typedef.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: ee2e44f790a4c070b7916a619ed147d6ab15fcc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2e44f790a4c070b7916a61… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:03:58 2020 +0200 dmime: Get rid of the DMUS_PRIVATE_SEGMENT_ITEM typedef. Also move the struct to its only user. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/dmime_private.h | 7 ------- dlls/dmime/segtriggertrack.c | 23 +++++++++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index 69067fca55..c2221a15fd 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -86,13 +86,6 @@ typedef struct _DMUS_PRIVATE_TEMPO_ITEM { DMUS_IO_TEMPO_ITEM item; } DMUS_PRIVATE_TEMPO_ITEM, *LPDMUS_PRIVATE_TEMPO_ITEM; -typedef struct _DMUS_PRIVATE_SEGMENT_ITEM { - struct list entry; /* for listing elements */ - DMUS_IO_SEGMENT_ITEM_HEADER header; - IDirectMusicObject* pObject; - WCHAR wszName[DMUS_MAX_NAME]; -} DMUS_PRIVATE_SEGMENT_ITEM, *LPDMUS_PRIVATE_SEGMENT_ITEM; - typedef struct _DMUS_PRIVATE_GRAPH_TOOL { struct list entry; /* for listing elements */ DWORD dwIndex; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index ec1da7e1ed..9a7602f58d 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -28,6 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); /***************************************************************************** * IDirectMusicSegTriggerTrack implementation */ +struct segment_item { + struct list entry; + DMUS_IO_SEGMENT_ITEM_HEADER header; + IDirectMusicObject *dmobj; + WCHAR name[DMUS_MAX_NAME]; +}; + typedef struct IDirectMusicSegTriggerTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; struct dmobject dmobj;/* IPersistStream only */ @@ -83,14 +90,14 @@ static ULONG WINAPI segment_track_Release(IDirectMusicTrack8 *iface) if (!ref) { struct list *cursor, *cursor2; - DMUS_PRIVATE_SEGMENT_ITEM *item; + struct segment_item *item; LIST_FOR_EACH_SAFE(cursor, cursor2, &This->Items) { - item = LIST_ENTRY(cursor, DMUS_PRIVATE_SEGMENT_ITEM, entry); + item = LIST_ENTRY(cursor, struct segment_item, entry); list_remove(cursor); - if (item->pObject) - IDirectMusicObject_Release(item->pObject); + if (item->dmobj) + IDirectMusicObject_Release(item->dmobj); heap_free(item); } @@ -262,7 +269,7 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st const struct chunk_entry *lseg) { struct chunk_entry chunk = {.parent = lseg}; - DMUS_PRIVATE_SEGMENT_ITEM *item; + struct segment_item *item; HRESULT hr; /* First chunk is a header */ @@ -286,7 +293,7 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st hr = DMUS_E_INVALID_SEGMENTTRIGGERTRACK; goto error; } - if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->pObject))) + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->dmobj))) goto error; /* Optional third chunk if the reference is a motif */ @@ -294,10 +301,10 @@ static HRESULT parse_segment_item(IDirectMusicSegTriggerTrack *This, IStream *st if (FAILED(hr = stream_next_chunk(stream, &chunk))) goto error; if (chunk.id == DMUS_FOURCC_SEGMENTITEMNAME_CHUNK) - if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->wszName, DMUS_MAX_NAME))) + if (FAILED(hr = stream_chunk_get_wstr(stream, &chunk, item->name, DMUS_MAX_NAME))) goto error; - TRACE("Found motif name: %s\n", debugstr_w(item->wszName)); + TRACE("Found motif name: %s\n", debugstr_w(item->name)); } list_add_tail(&This->Items, &item->entry);

1 0

Michael Stefaniuc : dmcompos: Remove the unused DMUS_PRIVATE_CHUNK struct.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: 657a78f1a6f6429ccfc905e8f44bf64d15fae1de URL: https://source.winehq.org/git/wine.git/?a=commit;h=657a78f1a6f6429ccfc905e8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Sep 24 22:17:45 2020 +0200 dmcompos: Remove the unused DMUS_PRIVATE_CHUNK struct. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmcompos/dmcompos_private.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 98796875b8..bfee61e5be 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -56,13 +56,4 @@ extern LONG DMCOMPOS_refCount DECLSPEC_HIDDEN; static inline void DMCOMPOS_LockModule(void) { InterlockedIncrement( &DMCOMPOS_refCount ); } static inline void DMCOMPOS_UnlockModule(void) { InterlockedDecrement( &DMCOMPOS_refCount ); } -/***************************************************************************** - * Misc. - */ -/* for simpler reading */ -typedef struct _DMUS_PRIVATE_CHUNK { - FOURCC fccID; /* FOURCC ID of the chunk */ - DWORD dwSize; /* size of the chunk */ -} DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; - #endif /* __WINE_DMCOMPOS_PRIVATE_H */

1 0

Alexandre Julliard : makefiles: Don't build Unix object files on Windows.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: wine Branch: master Commit: f691bdb6bfee6b3b9fb849b17b70a730dc5eefcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=f691bdb6bfee6b3b9fb849b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 25 12:02:56 2020 +0200 makefiles: Don't build Unix object files on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index b3dd03645f..df3805591e 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3081,7 +3081,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour ((source->file->flags & FLAG_C_IMPLIB) && (needs_cross_lib( make ) || needs_delay_lib( make ))) || (make->staticlib && needs_cross_lib( make )))); - int need_obj = ((*dll_ext || !make->staticlib || !(source->file->flags & FLAG_C_UNIX)) && + int need_obj = ((*dll_ext || !(source->file->flags & FLAG_C_UNIX)) && (!need_cross || (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib)));

1 0

Isabella Bosia : vkd3d-shader: Change use of strstr to strchr.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: vkd3d Branch: master Commit: 0808058edefff961344e24419032ff242abe7d34 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0808058edefff961344e244… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:34 2020 +0100 vkd3d-shader: Change use of strstr to strchr. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 16d895f..ea1a700 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -110,7 +110,7 @@ static void vkd3d_string_buffer_trace_(const struct vkd3d_string_buffer *buffer, for (p = buffer->buffer; *p; p = q) { - if (!(q = strstr(p, "\n"))) + if (!(q = strchr(p, '\n'))) q = p + strlen(p); else ++q;

1 0

Isabella Bosia : vkd3d-shader: Add vkd3d_dxbc_binary_to_text() helper function.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: vkd3d Branch: master Commit: a0d469b20e319cdffcc57adf64f4c00da9d5f2b0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a0d469b20e319cdffcc57ad… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:36 2020 +0100 vkd3d-shader: Add vkd3d_dxbc_binary_to_text() helper function. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 37 ++++++++++++++++++++++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index d7495ee..2d758b6 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -1557,17 +1557,18 @@ static void shader_dump_instruction(struct vkd3d_string_buffer *buffer, shader_addline(buffer, "\n"); } -void vkd3d_shader_trace(void *data) +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) { struct vkd3d_shader_version shader_version; - struct vkd3d_string_buffer buffer; - const char *p, *q; const DWORD *ptr; + struct vkd3d_string_buffer buffer; + enum vkd3d_result result = VKD3D_OK; + void *code; if (!vkd3d_string_buffer_init(&buffer)) { ERR("Failed to initialize string buffer.\n"); - return; + return VKD3D_ERROR; } shader_sm4_read_header(data, &ptr, &shader_version); @@ -1583,13 +1584,37 @@ void vkd3d_shader_trace(void *data) { WARN("Skipping unrecognized instruction.\n"); shader_addline(&buffer, "<unrecognized instruction>\n"); + result = VKD3D_ERROR; continue; } shader_dump_instruction(&buffer, &ins, &shader_version); } - for (p = buffer.buffer; *p; p = q) + code = vkd3d_malloc(buffer.content_size); + if (code) + { + memcpy(code, buffer.buffer, buffer.content_size); + out->size = buffer.content_size; + out->code = code; + } + else + result = VKD3D_ERROR_OUT_OF_MEMORY; + + vkd3d_string_buffer_cleanup(&buffer); + + return result; +} + +void vkd3d_shader_trace(void *data) +{ + const char *p, *q; + struct vkd3d_shader_code code; + + if (vkd3d_dxbc_binary_to_text(data, &code) != VKD3D_OK) + return; + + for (p = code.code; *p; p = q) { if (!(q = strstr(p, "\n"))) q = p + strlen(p); @@ -1598,5 +1623,5 @@ void vkd3d_shader_trace(void *data) TRACE(" %.*s", (int)(q - p), p); } - vkd3d_string_buffer_cleanup(&buffer); + vkd3d_shader_free_shader_code(&code); } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 00b2441..ec0014e 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -830,6 +830,7 @@ struct vkd3d_string_buffer unsigned int content_size; }; +enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, struct vkd3d_shader_code *out) DECLSPEC_HIDDEN; void vkd3d_string_buffer_cleanup(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; bool vkd3d_string_buffer_init(struct vkd3d_string_buffer *buffer) DECLSPEC_HIDDEN; int vkd3d_string_buffer_vprintf(struct vkd3d_string_buffer *buffer, const char *format, va_list args) DECLSPEC_HIDDEN;

1 0

Isabella Bosia : vkd3d-shader: Implement target type d3d asm.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: vkd3d Branch: master Commit: f494abde8999acb849879eeeaede458a19a933d8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f494abde8999acb849879ee… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:38 2020 +0100 vkd3d-shader: Implement target type d3d asm. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/vkd3d_shader_main.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 3efd355..0eead7c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -466,6 +466,7 @@ enum vkd3d_shader_target_type */ VKD3D_SHADER_TARGET_SPIRV_BINARY, VKD3D_SHADER_TARGET_SPIRV_TEXT, + VKD3D_SHADER_TARGET_D3D_ASM, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_TARGET_TYPE), }; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index ea1a700..0839cae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -338,6 +338,13 @@ int vkd3d_shader_compile(const struct vkd3d_shader_compile_info *compile_info, vkd3d_shader_dump_shader(parser.shader_version.type, &compile_info->source); + if (compile_info->target_type == VKD3D_SHADER_TARGET_D3D_ASM) + { + ret = vkd3d_dxbc_binary_to_text(parser.data, out); + vkd3d_shader_parser_destroy(&parser); + goto done; + } + if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, &parser.shader_desc, compile_info, &scan_descriptor_info, &message_context))) { @@ -1074,6 +1081,7 @@ const enum vkd3d_shader_target_type *vkd3d_shader_get_supported_target_types( #ifdef HAVE_SPIRV_TOOLS VKD3D_SHADER_TARGET_SPIRV_TEXT, #endif + VKD3D_SHADER_TARGET_D3D_ASM, }; TRACE("source_type %#x, count %p.\n", source_type, count);

1 0

Isabella Bosia : vkd3d-compiler: Add d3d-asm target type.
by Alexandre Julliard 25 Sep '20

25 Sep '20

Module: vkd3d Branch: master Commit: b0153f8054716c26fab5da373536fcd85dcd4469 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b0153f8054716c26fab5da3… Author: Isabella Bosia <ibosia(a)codeweavers.com> Date: Fri Sep 25 02:26:40 2020 +0100 vkd3d-compiler: Add d3d-asm target type. Signed-off-by: Isabella Bosia <ibosia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5f4f9db..fdf3faf 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -72,6 +72,9 @@ target_type_info[] = {VKD3D_SHADER_TARGET_SPIRV_TEXT, "spirv-text", "A SPIR-V shader in text form.\n", false}, + {VKD3D_SHADER_TARGET_D3D_ASM, + "d3d-asm", "A shader in Direct3D assembly form.\n", + false}, }; static bool read_shader(struct vkd3d_shader_code *shader, FILE *f)

1 0

Henri Verbeet : wined3d: Implement sample masks for the Vulkan adapter.
by Alexandre Julliard 24 Sep '20

24 Sep '20

Module: wine Branch: master Commit: 69ba059dcb352c3316f5cc1917b2e4e8e5648f47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69ba059dcb352c3316f5cc19… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 24 16:19:25 2020 +0330 wined3d: Implement sample masks for the Vulkan adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 12 +++++++++--- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index aef2430208..a4f5f317f1 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -1635,8 +1635,12 @@ static int wined3d_graphics_pipeline_vk_compare(const void *key, const struct wi if ((ret = memcmp(&a->rs_desc, &b->rs_desc, sizeof(a->rs_desc)))) return ret; - if ((ret = memcmp(&a->ms_desc, &b->ms_desc, sizeof(a->ms_desc)))) - return ret; + if (a->ms_desc.rasterizationSamples != b->ms_desc.rasterizationSamples) + return a->ms_desc.rasterizationSamples - b->ms_desc.rasterizationSamples; + if (a->ms_desc.alphaToCoverageEnable != b->ms_desc.alphaToCoverageEnable) + return a->ms_desc.alphaToCoverageEnable - b->ms_desc.alphaToCoverageEnable; + if (a->sample_mask != b->sample_mask) + return a->sample_mask - b->sample_mask; if ((ret = memcmp(&a->ds_desc, &b->ds_desc, sizeof(a->ds_desc)))) return ret; @@ -1710,6 +1714,7 @@ static void wined3d_context_vk_init_graphics_pipeline_key(struct wined3d_context key->rs_desc.lineWidth = 1.0f; key->ms_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO; + key->ms_desc.pSampleMask = &key->sample_mask; key->ds_desc.sType = VK_STRUCTURE_TYPE_PIPELINE_DEPTH_STENCIL_STATE_CREATE_INFO; key->ds_desc.maxDepthBounds = 1.0f; @@ -2020,10 +2025,11 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte } if (key->ms_desc.rasterizationSamples != context_vk->sample_count - || isStateDirty(&context_vk->c, STATE_BLEND)) + || isStateDirty(&context_vk->c, STATE_BLEND) || isStateDirty(&context_vk->c, STATE_SAMPLE_MASK)) { key->ms_desc.rasterizationSamples = context_vk->sample_count; key->ms_desc.alphaToCoverageEnable = state->blend_state && state->blend_state->desc.alpha_to_coverage; + key->sample_mask = state->sample_mask; update = true; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 24a9212ae0..b0bf863d21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,6 +2386,7 @@ struct wined3d_graphics_pipeline_key_vk VkVertexInputBindingDescription bindings[MAX_ATTRIBS]; VkViewport viewport; VkRect2D scissor; + VkSampleMask sample_mask; VkPipelineColorBlendAttachmentState blend_attachments[WINED3D_MAX_RENDER_TARGETS]; VkPipelineVertexInputDivisorStateCreateInfoEXT divisor_desc;

1 0