February 2021 - Wine-Devel - list.winehq.org

[PATCH v4 1/2] windowscodecs: Use IWICImagingFactory_CreatePalette in write_source.
by Rémi Bernon Feb. 4, 2021

Feb. 4, 2021

Instead of PaletteImpl_Create. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v4: As an alternative to v3, with unix_lib.c copied to wmphoto instead, as it seems to be preferred it over the #ifdef. I don't mind either. dlls/windowscodecs/wincodecs_common.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/wincodecs_common.c b/dlls/windowscodecs/wincodecs_common.c index 37ad7128f10..1b146908be9 100644 --- a/dlls/windowscodecs/wincodecs_common.c +++ b/dlls/windowscodecs/wincodecs_common.c @@ -121,9 +121,17 @@ HRESULT write_source(IWICBitmapFrameEncode *iface, if (need_palette) { + IWICImagingFactory *factory; IWICPalette *palette; - hr = PaletteImpl_Create(&palette); + hr = create_instance(&CLSID_WICImagingFactory, &IID_IWICImagingFactory, (void**)&factory); + + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreatePalette(factory, &palette); + IWICImagingFactory_Release(factory); + } + if (SUCCEEDED(hr)) { hr = IWICBitmapSource_CopyPalette(converted_source, palette); -- 2.30.0

2 4

[PATCH 1/4] kernel32: Add sr-Latn-RS locale definition.
by Zebediah Figura Feb. 3, 2021

Feb. 3, 2021

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/locale_rc.rc | 1 + dlls/kernel32/nls/srm.nls | 174 +++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+) create mode 100644 dlls/kernel32/nls/srm.nls diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index c6bb407b1c5..86ababd0900 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -143,6 +143,7 @@ #include "nls/hrv.nls" /* 0x041a LANG_SERBIAN, SUBLANG_DEFAULT */ #include "nls/srl.nls" /* 0x081a LANG_SERBIAN, SUBLANG_SERBIAN_LATIN */ #include "nls/srb.nls" /* 0x0c1a LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC */ +#include "nls/srm.nls" /* 0x241a LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN */ #include "nls/sky.nls" /* 0x041b LANG_SLOVAK, SUBLANG_DEFAULT */ diff --git a/dlls/kernel32/nls/srm.nls b/dlls/kernel32/nls/srm.nls new file mode 100644 index 00000000000..f4b1169943a --- /dev/null +++ b/dlls/kernel32/nls/srm.nls @@ -0,0 +1,174 @@ +/* + * Locale definitions for Serbian (Serbia, Latin) + * + * Copyright 2016 Michael Müller + * + * This library 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 library 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 library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN +{ + LOCALE_FONTSIGNATURE L"\x0027\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0400\x0012\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "381" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "0" + LOCALE_IDEFAULTANSICODEPAGE "1250" + LOCALE_IDEFAULTCODEPAGE "852" + LOCALE_IDEFAULTCOUNTRY "381" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "241a" + LOCALE_IDEFAULTMACCODEPAGE "10029" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IGEOID "271" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "241a" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "0" + LOCALE_INEGATIVEPERCENT "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "1" + LOCALE_S1159 "pre podne" + LOCALE_S2359 "po podne" + LOCALE_SABBREVCTRYNAME "SRB" + LOCALE_SABBREVDAYNAME1 "pon" + LOCALE_SABBREVDAYNAME2 "uto" + LOCALE_SABBREVDAYNAME3 "sre" + LOCALE_SABBREVDAYNAME4 "čet" + LOCALE_SABBREVDAYNAME5 "pet" + LOCALE_SABBREVDAYNAME6 "sub" + LOCALE_SABBREVDAYNAME7 "ned" + LOCALE_SABBREVLANGNAME "SRM" + LOCALE_SABBREVMONTHNAME1 "jan" + LOCALE_SABBREVMONTHNAME2 "feb" + LOCALE_SABBREVMONTHNAME3 "mar" + LOCALE_SABBREVMONTHNAME4 "apr" + LOCALE_SABBREVMONTHNAME5 "maj" + LOCALE_SABBREVMONTHNAME6 "jun" + LOCALE_SABBREVMONTHNAME7 "jul" + LOCALE_SABBREVMONTHNAME8 "avg" + LOCALE_SABBREVMONTHNAME9 "sep" + LOCALE_SABBREVMONTHNAME10 "okt" + LOCALE_SABBREVMONTHNAME11 "nov" + LOCALE_SABBREVMONTHNAME12 "dec" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Serbia" + LOCALE_SCURRENCY "Din." + LOCALE_SDATE "." + LOCALE_SDAYNAME1 "ponedeljak" + LOCALE_SDAYNAME2 "utorak" + LOCALE_SDAYNAME3 "sreda" + LOCALE_SDAYNAME4 "četvrtak" + LOCALE_SDAYNAME5 "petak" + LOCALE_SDAYNAME6 "subota" + LOCALE_SDAYNAME7 "nedelja" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Serbia" + LOCALE_SENGCURRNAME "Serbian Dinar" + LOCALE_SENGLANGUAGE "Serbian (Latin)" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "RSD" + LOCALE_SISO3166CTRYNAME "RS" + LOCALE_SISO639LANGNAME "sr" + LOCALE_SLANGUAGE "Serbian (Latin, Serbia)" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, dd. MMMM yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "d. MMMM" + LOCALE_SMONTHNAME1 "januar" + LOCALE_SMONTHNAME2 "februar" + LOCALE_SMONTHNAME3 "mart" + LOCALE_SMONTHNAME4 "april" + LOCALE_SMONTHNAME5 "maj" + LOCALE_SMONTHNAME6 "jun" + LOCALE_SMONTHNAME7 "jul" + LOCALE_SMONTHNAME8 "avgust" + LOCALE_SMONTHNAME9 "septembar" + LOCALE_SMONTHNAME10 "oktobar" + LOCALE_SMONTHNAME11 "novembar" + LOCALE_SMONTHNAME12 "decembar" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "sr-Latn-RS" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "Srbija" + LOCALE_SNATIVECURRNAME "Srpski dinar" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "srpski (Srbija)" + LOCALE_SNATIVELANGNAME "srpski" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SNEGINFINITY L"-\x221e" + LOCALE_SOPENTYPELANGUAGETAG "SRB " + LOCALE_SPARENT "sr-Latn" + LOCALE_SPOSINFINITY L"\x221e" + LOCALE_SPOSITIVESIGN "+" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SSHORTDATE "d.M.yyyy" + LOCALE_SSHORTESTDAYNAME1 "pon" + LOCALE_SSHORTESTDAYNAME2 "uto" + LOCALE_SSHORTESTDAYNAME3 "sre" + LOCALE_SSHORTESTDAYNAME4 "čet" + LOCALE_SSHORTESTDAYNAME5 "pet" + LOCALE_SSHORTESTDAYNAME6 "sub" + LOCALE_SSHORTESTDAYNAME7 "ned" + LOCALE_SSHORTTIME "H:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "MMMM yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +} -- 2.20.1

1 3

[PATCH 1/5] winegstreamer: Move the stream event fields to struct wg_parser_stream.
by Zebediah Figura Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 125 +++++++++++++++++----------------- 1 file changed, 64 insertions(+), 61 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 8d08ff370f4..eaad0f56133 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -74,12 +74,37 @@ struct wg_parser bool flushing, sink_connected; }; +enum wg_parser_event_type +{ + WG_PARSER_EVENT_NONE = 0, + WG_PARSER_EVENT_BUFFER, + WG_PARSER_EVENT_EOS, + WG_PARSER_EVENT_SEGMENT, +}; + +struct wg_parser_event +{ + enum wg_parser_event_type type; + union + { + GstBuffer *buffer; + struct + { + uint64_t position, stop; + double rate; + } segment; + } u; +}; + struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; GstSegment *segment; GstCaps *caps; + + pthread_cond_t event_cond, event_empty_cond; + struct wg_parser_event event; }; struct parser @@ -112,28 +137,6 @@ struct parser HRESULT (*source_get_media_type)(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt); }; -enum parser_event_type -{ - PARSER_EVENT_NONE = 0, - PARSER_EVENT_BUFFER, - PARSER_EVENT_EOS, - PARSER_EVENT_SEGMENT, -}; - -struct parser_event -{ - enum parser_event_type type; - union - { - GstBuffer *buffer; - struct - { - uint64_t position, stop; - double rate; - } segment; - } u; -}; - struct parser_source { struct strmbase_source pin; @@ -144,9 +147,7 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; - pthread_cond_t event_cond, event_empty_cond; bool flushing, eos; - struct parser_event event; HANDLE thread; }; @@ -710,9 +711,10 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) return ret; } -static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct parser_event *event) +static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct wg_parser_event *event) { struct wg_parser *parser = impl_from_strmbase_filter(pin->pin.pin.filter)->wg_parser; + struct wg_parser_stream *stream = pin->wg_stream; /* Unlike request_buffer_src() [q.v.], we need to watch for GStreamer * flushes here. The difference is that we can be blocked by the streaming @@ -721,17 +723,17 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct * is solved by flushing the upstream source. */ pthread_mutex_lock(&parser->mutex); - while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_empty_cond, &parser->mutex); + while (!pin->flushing && stream->event.type != WG_PARSER_EVENT_NONE) + pthread_cond_wait(&stream->event_empty_cond, &parser->mutex); if (pin->flushing) { pthread_mutex_unlock(&parser->mutex); GST_DEBUG("Filter is flushing; discarding event."); return GST_FLOW_FLUSHING; } - pin->event = *event; + stream->event = *event; pthread_mutex_unlock(&parser->mutex); - pthread_cond_signal(&pin->event_cond); + pthread_cond_signal(&stream->event_cond); GST_LOG("Event queued."); return GST_FLOW_OK; } @@ -750,7 +752,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_SEGMENT: if (pin->pin.pin.peer) { - struct parser_event stream_event; + struct wg_parser_event stream_event; const GstSegment *segment; gst_event_parse_segment(event, &segment); @@ -763,7 +765,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) gst_segment_copy_into(segment, stream->segment); - stream_event.type = PARSER_EVENT_SEGMENT; + stream_event.type = WG_PARSER_EVENT_SEGMENT; stream_event.u.segment.position = segment->position / 100; stream_event.u.segment.stop = segment->stop / 100; stream_event.u.segment.rate = segment->rate * segment->applied_rate; @@ -774,9 +776,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_EOS: if (pin->pin.pin.peer) { - struct parser_event stream_event; + struct wg_parser_event stream_event; - stream_event.type = PARSER_EVENT_EOS; + stream_event.type = WG_PARSER_EVENT_EOS; queue_stream_event(pin, &stream_event); } else @@ -794,20 +796,20 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) pthread_mutex_lock(&parser->mutex); pin->flushing = true; - pthread_cond_signal(&pin->event_empty_cond); + pthread_cond_signal(&stream->event_empty_cond); - switch (pin->event.type) + switch (stream->event.type) { - case PARSER_EVENT_NONE: - case PARSER_EVENT_EOS: - case PARSER_EVENT_SEGMENT: + case WG_PARSER_EVENT_NONE: + case WG_PARSER_EVENT_EOS: + case WG_PARSER_EVENT_SEGMENT: break; - case PARSER_EVENT_BUFFER: - gst_buffer_unref(pin->event.u.buffer); + case WG_PARSER_EVENT_BUFFER: + gst_buffer_unref(stream->event.u.buffer); break; } - pin->event.type = PARSER_EVENT_NONE; + stream->event.type = WG_PARSER_EVENT_NONE; pthread_mutex_unlock(&parser->mutex); } @@ -897,7 +899,7 @@ static void *push_data(void *iface) static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *buffer) { struct parser_source *pin = gst_pad_get_element_private(pad); - struct parser_event stream_event; + struct wg_parser_event stream_event; GstFlowReturn ret; GST_LOG("pin %p, buffer %p.", pin, buffer); @@ -908,7 +910,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu return GST_FLOW_OK; } - stream_event.type = PARSER_EVENT_BUFFER; + stream_event.type = WG_PARSER_EVENT_BUFFER; stream_event.u.buffer = buffer; /* Transfer our reference to the buffer to the thread. */ if ((ret = queue_stream_event(pin, &stream_event)) != GST_FLOW_OK) @@ -1044,15 +1046,16 @@ static void send_buffer(struct parser_source *pin, GstBuffer *buf) gst_buffer_unref(buf); } -static bool get_stream_event(struct parser_source *pin, struct parser_event *event) +static bool get_stream_event(struct parser_source *pin, struct wg_parser_event *event) { struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); + struct wg_parser_stream *stream = pin->wg_stream; struct wg_parser *parser = filter->wg_parser; pthread_mutex_lock(&parser->mutex); - while (!parser->flushing && pin->event.type == PARSER_EVENT_NONE) - pthread_cond_wait(&pin->event_cond, &parser->mutex); + while (!parser->flushing && stream->event.type == WG_PARSER_EVENT_NONE) + pthread_cond_wait(&stream->event_cond, &parser->mutex); if (parser->flushing) { @@ -1061,11 +1064,11 @@ static bool get_stream_event(struct parser_source *pin, struct parser_event *eve return false; } - *event = pin->event; - pin->event.type = PARSER_EVENT_NONE; + *event = stream->event; + stream->event.type = WG_PARSER_EVENT_NONE; pthread_mutex_unlock(&parser->mutex); - pthread_cond_signal(&pin->event_empty_cond); + pthread_cond_signal(&stream->event_empty_cond); return true; } @@ -1079,7 +1082,7 @@ static DWORD CALLBACK stream_thread(void *arg) while (filter->streaming) { - struct parser_event event; + struct wg_parser_event event; EnterCriticalSection(&pin->flushing_cs); @@ -1093,20 +1096,20 @@ static DWORD CALLBACK stream_thread(void *arg) switch (event.type) { - case PARSER_EVENT_BUFFER: + case WG_PARSER_EVENT_BUFFER: send_buffer(pin, event.u.buffer); break; - case PARSER_EVENT_EOS: + case WG_PARSER_EVENT_EOS: IPin_EndOfStream(pin->pin.pin.peer); break; - case PARSER_EVENT_SEGMENT: + case WG_PARSER_EVENT_SEGMENT: IPin_NewSegment(pin->pin.pin.peer, event.u.segment.position, event.u.segment.stop, event.u.segment.rate); break; - case PARSER_EVENT_NONE: + case WG_PARSER_EVENT_NONE: assert(0); } @@ -1785,7 +1788,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) if (!pin->pin.pin.peer) continue; - pthread_cond_signal(&pin->event_cond); + pthread_cond_signal(&pin->wg_stream->event_cond); } for (i = 0; i < filter->source_count; ++i) @@ -2187,7 +2190,7 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { if (filter->sources[i]->pin.pin.peer) { - pthread_cond_signal(&pin->event_cond); + pthread_cond_signal(&stream->event_cond); IPin_BeginFlush(filter->sources[i]->pin.pin.peer); } } @@ -2468,8 +2471,8 @@ static void free_source_pin(struct parser_source *pin) gst_object_unref(stream->my_sink); gst_segment_free(stream->segment); - pthread_cond_destroy(&pin->event_cond); - pthread_cond_destroy(&pin->event_empty_cond); + pthread_cond_destroy(&stream->event_cond); + pthread_cond_destroy(&stream->event_empty_cond); free(stream); @@ -2517,8 +2520,8 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate); - pthread_cond_init(&pin->event_cond, NULL); - pthread_cond_init(&pin->event_empty_cond, NULL); + pthread_cond_init(&stream->event_cond, NULL); + pthread_cond_init(&stream->event_empty_cond, NULL); BaseFilterImpl_IncrementPinVersion(&filter->filter); InitializeCriticalSection(&pin->flushing_cs); @@ -2551,7 +2554,7 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) for (i = 0; i < This->source_count; ++i) { This->sources[i]->flushing = true; - pthread_cond_signal(&This->sources[i]->event_empty_cond); + pthread_cond_signal(&This->sources[i]->wg_stream->event_empty_cond); } pthread_mutex_unlock(&parser->mutex); -- 2.30.0

1 4

[PATCH 1/2] winevulkan: Fix vkDestroyDebugUtilsMessengerEXT with NULL object.
by Georg Lehmann Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/vulkan.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 2a503a7430d..640b3ee7b67 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1940,6 +1940,9 @@ void WINAPI wine_vkDestroyDebugUtilsMessengerEXT( object = wine_debug_utils_messenger_from_handle(messenger); + if (!object) + return; + instance->funcs.p_vkDestroyDebugUtilsMessengerEXT(instance->instance, object->debug_messenger, NULL); WINE_VK_REMOVE_HANDLE_MAPPING(instance, object); -- 2.30.0

1 1

[PATCH] kernelbase: Support FileEndOfFileInfo in SetFileInformationByHandle.
by Jacek Caban Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[PATCH vkd3d 2/2] vkd3d-shader: Implement relative addressing of tessellation control shader inputs.
by Henri Verbeet Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 153 ++++++++++++++++++++++++++++++++++---- tests/d3d12.c | 2 +- 2 files changed, 138 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 27bf40b..a997ec6 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3083,21 +3083,32 @@ static void vkd3d_dxbc_compiler_emit_dereference_register(struct vkd3d_dxbc_comp } else if (register_info->is_aggregate) { - struct vkd3d_shader_register_index reg_idx = reg->idx[0]; - - if (reg->idx[1].rel_addr) - FIXME("Relative addressing not implemented.\n"); - - if (register_info->is_dynamically_indexed) + if (reg->type == VKD3DSPR_INPUT || reg->type == VKD3DSPR_INCONTROLPOINT) { - indexes[index_count++] = vkd3d_spirv_build_op_load(builder, - vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_INT, 1), - register_info->member_idx, SpvMemoryAccessMaskNone); + /* Indices for these are swapped compared to the generated SPIR-V. */ + if (reg->idx[1].offset != ~0u) + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]); + if (reg->idx[0].offset != ~0u) + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[0]); } else { - reg_idx.offset = register_info->member_idx; - indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); + struct vkd3d_shader_register_index reg_idx = reg->idx[0]; + + if (reg->idx[1].rel_addr) + FIXME("Relative addressing not implemented.\n"); + + if (register_info->is_dynamically_indexed) + { + indexes[index_count++] = vkd3d_spirv_build_op_load(builder, + vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_INT, 1), + register_info->member_idx, SpvMemoryAccessMaskNone); + } + else + { + reg_idx.offset = register_info->member_idx; + indexes[index_count++] = vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg_idx); + } } } else @@ -4258,14 +4269,13 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_symbol_make_register(&reg_symbol, reg); - if (builtin) + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { - input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); - entry = rb_get(&compiler->symbol_table, &reg_symbol); + input_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; } - else if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) + else if (builtin) { - input_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, storage_class, array_size); } else { @@ -6256,6 +6266,66 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compi SpvScopeWorkgroup, SpvScopeInvocation, SpvMemorySemanticsMaskNone); } +static void vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_signature *signature = compiler->input_signature; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, length_id, index_id, src_id, dst_id, vicp_id; + const struct vkd3d_shader_signature_element *element; + enum vkd3d_shader_input_sysval_semantic sysval; + const struct vkd3d_spirv_builtin *builtin; + unsigned int register_count, i; + struct vkd3d_shader_register r; + struct vkd3d_symbol symbol; + struct rb_entry *entry; + + for (i = 0, register_count = 0; i < signature->element_count; ++i) + { + register_count = max(register_count, signature->elements[i].register_index + 1); + } + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 4); + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, compiler->input_control_point_count); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_INPUT; + r.idx[0].offset = 0; + r.idx[1].offset = ~0u; + vkd3d_symbol_make_register(&symbol, &r); + + for (i = 0; i < signature->element_count; ++i) + { + element = &signature->elements[i]; + + symbol.key.reg.idx = element->register_index; + entry = rb_get(&compiler->symbol_table, &symbol); + vicp_id = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry)->id; + + index_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, element->register_index); + dst_id = vkd3d_spirv_build_op_in_bounds_access_chain1(builder, type_id, vicp_id, index_id); + + if (element->sysval_semantic) + { + sysval = vkd3d_siv_from_sysval(element->sysval_semantic); + builtin = get_spirv_builtin_for_sysval(compiler, sysval); + src_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, + SpvStorageClassInput, compiler->input_control_point_count); + } + else + { + src_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassInput, VKD3D_SHADER_COMPONENT_FLOAT, 4, compiler->input_control_point_count); + vkd3d_spirv_add_iface_variable(builder, src_id); + vkd3d_spirv_build_op_decorate1(builder, src_id, SpvDecorationLocation, element->register_index); + vkd3d_spirv_build_op_name(builder, src_id, "v%u", element->register_index); + } + + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -6266,6 +6336,8 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler vkd3d_spirv_builder_begin_main_function(builder); + vkd3d_dxbc_compiler_emit_hull_shader_input_initialisation(compiler); + void_id = vkd3d_spirv_get_op_type_void(builder); if ((control_point_phase = vkd3d_dxbc_compiler_get_control_point_phase(compiler))) @@ -8851,6 +8923,53 @@ static void vkd3d_dxbc_compiler_emit_cut_stream(struct vkd3d_dxbc_compiler *comp vkd3d_spirv_build_op_end_primitive(builder); } +static void vkd3d_dxbc_compiler_emit_hull_shader_inputs(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_signature *signature = compiler->input_signature; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, length_id, vicp_id, vicp_type_id; + unsigned int register_count, register_idx, i; + struct vkd3d_shader_register r; + struct vkd3d_symbol symbol; + struct rb_entry *entry; + + for (i = 0, register_count = 0; i < signature->element_count; ++i) + { + register_count = max(register_count, signature->elements[i].register_index + 1); + } + + type_id = vkd3d_spirv_get_type_id(builder, VKD3D_SHADER_COMPONENT_FLOAT, 4); + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, compiler->input_control_point_count); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, register_count); + type_id = vkd3d_spirv_get_op_type_array(builder, type_id, length_id); + vicp_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassPrivate, type_id); + + vicp_id = vkd3d_spirv_build_op_variable(builder, + &builder->global_stream, vicp_type_id, SpvStorageClassPrivate, 0); + vkd3d_spirv_build_op_name(builder, vicp_id, "vicp"); + + memset(&r, 0, sizeof(r)); + r.type = VKD3DSPR_INPUT; + r.idx[0].offset = 0; + r.idx[1].offset = ~0u; + vkd3d_symbol_make_register(&symbol, &r); + + for (i = 0; i < signature->element_count; ++i) + { + register_idx = signature->elements[i].register_index; + + symbol.key.reg.idx = register_idx; + if ((entry = rb_get(&compiler->symbol_table, &symbol))) + continue; + + vkd3d_symbol_set_register_info(&symbol, vicp_id, SpvStorageClassPrivate, + VKD3D_SHADER_COMPONENT_FLOAT, VKD3DSP_WRITEMASK_ALL); + symbol.info.reg.is_aggregate = true; + vkd3d_dxbc_compiler_put_symbol(compiler, &symbol); + } +} + /* This function is called after declarations are processed. */ static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *compiler) { @@ -8859,6 +8978,8 @@ static void vkd3d_dxbc_compiler_emit_main_prolog(struct vkd3d_dxbc_compiler *com if (compiler->xfb_info && compiler->xfb_info->element_count && compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) vkd3d_dxbc_compiler_emit_point_size(compiler); + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) + vkd3d_dxbc_compiler_emit_hull_shader_inputs(compiler); } static bool is_dcl_instruction(enum VKD3D_SHADER_INSTRUCTION_HANDLER handler_idx) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e4af96..609f15b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -33308,7 +33308,7 @@ static void test_hull_shader_relative_addressing(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - todo check_triangles(&rb, &expected_triangle, 1); + check_triangles(&rb, &expected_triangle, 1); release_resource_readback(&rb); ID3D12Resource_Release(so_buffer); -- 2.20.1

1 0

[PATCH vkd3d 1/2] tests: Add a test for relative addressing of tessellation control shader inputs.
by Henri Verbeet Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 261 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 250 insertions(+), 11 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5554178..2e4af96 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -26605,21 +26605,17 @@ struct triangle struct vec4 v[3]; }; -#define check_triangles(a, b, c, d, e) check_triangles_(__LINE__, a, b, c, d, e) -static void check_triangles_(unsigned int line, ID3D12Resource *buffer, - ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, +#define check_triangles(a, b, c) check_triangles_(__LINE__, a, b, c) +static void check_triangles_(unsigned int line, struct resource_readback *rb, const struct triangle *triangles, unsigned int triangle_count) { const struct triangle *current, *expected; - struct resource_readback rb; unsigned int i, j, offset; bool all_match = true; - get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); - for (i = 0; i < triangle_count; ++i) { - current = get_readback_data(&rb, i, 0, 0, sizeof(*current)); + current = get_readback_data(rb, i, 0, 0, sizeof(*current)); expected = &triangles[i]; offset = ~0u; @@ -26660,8 +26656,6 @@ static void check_triangles_(unsigned int line, ID3D12Resource *buffer, expected->v[0].x, expected->v[0].y, expected->v[0].z, expected->v[0].w, expected->v[1].x, expected->v[1].y, expected->v[1].z, expected->v[1].w, expected->v[2].x, expected->v[2].y, expected->v[2].z, expected->v[2].w); - - release_resource_readback(&rb); } static void test_quad_tessellation(void) @@ -26978,7 +26972,9 @@ static void test_quad_tessellation(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_triangles(so_buffer, queue, command_list, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + check_triangles(&rb, expected_quad_ccw, ARRAY_SIZE(expected_quad_ccw)); + release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, so_buffer, @@ -27017,7 +27013,9 @@ static void test_quad_tessellation(void) transition_resource_state(command_list, so_buffer, D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); - check_triangles(so_buffer, queue, command_list, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + check_triangles(&rb, expected_quad_cw, ARRAY_SIZE(expected_quad_cw)); + release_resource_readback(&rb); reset_command_list(command_list, context.allocator); transition_resource_state(command_list, so_buffer, @@ -33078,6 +33076,246 @@ static void test_sampler_register_space(void) destroy_test_context(&context); } +static void test_hull_shader_relative_addressing(void) +{ + D3D12_ROOT_SIGNATURE_DESC root_signature_desc; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + D3D12_ROOT_PARAMETER root_parameters[1]; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_INPUT_LAYOUT_DESC input_layout; + ID3D12Resource *vb, *so_buffer; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + HRESULT hr; + +#if 0 + int2 index[4]; + + struct patch_in_data + { + float4 position[2] : P; + }; + + struct patch_out_data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + void patch_constant(out patch_constant_data output) + { + output.edges[0] = 1.0f; + output.edges[1] = 1.0f; + output.edges[2] = 1.0f; + output.inside = 1.0f; + } + + patch_in_data vs_main(patch_in_data input) + { + return input; + } + + [domain("tri")] + [outputcontrolpoints(4)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + patch_out_data hs_main(InputPatch<patch_in_data, 3> input, uint i : SV_OutputControlPointID) + { + patch_out_data output; + + output.position = input[index[i].x].position[index[i].y]; + + return output; + } + + [domain("tri")] + float4 ds_main(patch_constant_data input, float3 tess_coord : SV_DomainLocation, + const OutputPatch<patch_out_data, 4> patch) : SV_Position + { + float4 position; + + position = patch[3].position; + position += patch[0].position * tess_coord.x; + position += patch[1].position * tess_coord.y; + position += patch[2].position * tess_coord.z; + + return position / 2; + } +#endif + static const DWORD vs_code[] = + { + 0x43425844, 0x7ba6d35f, 0x9640af75, 0x43fbed3a, 0x564c554f, 0x00000001, 0x00000124, 0x00000003, + 0x0000002c, 0x00000070, 0x000000b4, 0x4e475349, 0x0000003c, 0x00000002, 0x00000008, 0x00000038, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000038, 0x00000001, 0x00000000, + 0x00000003, 0x00000001, 0x00000f0f, 0xabab0050, 0x4e47534f, 0x0000003c, 0x00000002, 0x00000008, + 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x00000038, 0x00000001, + 0x00000000, 0x00000003, 0x00000001, 0x0000000f, 0xabab0050, 0x58454853, 0x00000068, 0x00010050, + 0x0000001a, 0x0100086a, 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x001010f2, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000001, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x001020f2, 0x00000001, 0x00101e46, 0x00000001, + 0x0100003e, + }; + static const DWORD hs_code[] = + { + 0x43425844, 0xe1d76e8a, 0x5e615b9a, 0xac2b4cf5, 0xbd8708f0, 0x00000001, 0x000002ec, 0x00000004, + 0x00000030, 0x00000074, 0x000000a8, 0x0000013c, 0x4e475349, 0x0000003c, 0x00000002, 0x00000008, + 0x00000038, 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x00000038, 0x00000001, + 0x00000000, 0x00000003, 0x00000001, 0x00000f0f, 0xabab0050, 0x4e47534f, 0x0000002c, 0x00000001, + 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, + 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, + 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, + 0x00000001, 0x00000e01, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, + 0x00000076, 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, + 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, + 0x000001a8, 0x00030050, 0x0000006a, 0x01000071, 0x01001893, 0x01002094, 0x01001095, 0x01000896, + 0x01001897, 0x0100086a, 0x04000859, 0x00208e46, 0x00000000, 0x00000004, 0x01000072, 0x0200005f, + 0x00016000, 0x0400005f, 0x002010f2, 0x00000003, 0x00000000, 0x0400005f, 0x002010f2, 0x00000003, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0500005b, 0x002010f2, + 0x00000003, 0x00000000, 0x00000002, 0x04000036, 0x00100012, 0x00000000, 0x00016001, 0x07000036, + 0x00100022, 0x00000000, 0x0420801a, 0x00000000, 0x0010000a, 0x00000000, 0x07000036, 0x00100012, + 0x00000000, 0x0420800a, 0x00000000, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, + 0x04a01e46, 0x0010000a, 0x00000000, 0x0010001a, 0x00000000, 0x0100003e, 0x01000073, 0x02000099, + 0x00000003, 0x0200005f, 0x00017000, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x04000067, + 0x00102012, 0x00000001, 0x00000012, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x02000068, + 0x00000001, 0x0400005b, 0x00102012, 0x00000000, 0x00000003, 0x04000036, 0x00100012, 0x00000000, + 0x0001700a, 0x06000036, 0x00902012, 0x0010000a, 0x00000000, 0x00004001, 0x3f800000, 0x0100003e, + 0x01000073, 0x04000067, 0x00102012, 0x00000003, 0x00000014, 0x05000036, 0x00102012, 0x00000003, + 0x00004001, 0x3f800000, 0x0100003e, + }; + static const DWORD ds_code[] = + { + 0x43425844, 0x95673c05, 0xbf512405, 0x69311baa, 0x46d18077, 0x00000001, 0x00000214, 0x00000004, + 0x00000030, 0x00000064, 0x000000f8, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, + 0x00000003, 0x00000000, 0x00000001, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, + 0x00000001, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x00000076, + 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, + 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x000000e0, 0x00040050, 0x00000038, 0x01002093, + 0x01001095, 0x0100086a, 0x0200005f, 0x0001c072, 0x0400005f, 0x002190f2, 0x00000004, 0x00000000, + 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x0a000032, 0x001000f2, + 0x00000000, 0x00219e46, 0x00000000, 0x00000000, 0x0001c006, 0x00219e46, 0x00000003, 0x00000000, + 0x09000032, 0x001000f2, 0x00000000, 0x00219e46, 0x00000001, 0x00000000, 0x0001c556, 0x00100e46, + 0x00000000, 0x09000032, 0x001000f2, 0x00000000, 0x00219e46, 0x00000002, 0x00000000, 0x0001caa6, + 0x00100e46, 0x00000000, 0x0a000038, 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, + 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"P", 0, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 0, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + {"P", 1, DXGI_FORMAT_R32G32B32A32_FLOAT, 0, 16, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "SV_POSITION", 0, 0, 4, 0}, + }; + static const struct + { + struct vec4 texcoord[2]; + } + vertices[] = + { + {{{1.0f, 1.0f, 1.0f, 1.0f}, { 8.0f, 8.0f, 8.0f, 1.0f}}}, + {{{2.0f, 2.0f, 2.0f, 1.0f}, {16.0f, 16.0f, 16.0f, 1.0f}}}, + {{{4.0f, 4.0f, 4.0f, 1.0f}, {32.0f, 32.0f, 32.0f, 1.0f}}}, + }; + static const struct uvec4 indices[] = + { + {0, 0}, + {1, 1}, + {2, 1}, + {2, 0}, + }; + static const struct triangle expected_triangle = + {{ + {10.0f, 10.0f, 10.0f, 1.0f}, + {18.0f, 18.0f, 18.0f, 1.0f}, + { 2.5f, 2.5f, 2.5f, 1.0f}, + }}; + unsigned int strides[] = {sizeof(struct vec4)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[0].Constants.ShaderRegister = 0; + root_parameters[0].Constants.RegisterSpace = 0; + root_parameters[0].Constants.Num32BitValues = 16; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_HULL; + memset(&root_signature_desc, 0, sizeof(root_signature_desc)); + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + hr = create_root_signature(context.device, &root_signature_desc, &context.root_signature); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + init_pipeline_state_desc(&pso_desc, context.root_signature, DXGI_FORMAT_UNKNOWN, NULL, NULL, &input_layout); + pso_desc.VS = shader_bytecode(vs_code, sizeof(vs_code)); + pso_desc.HS = shader_bytecode(hs_code, sizeof(hs_code)); + pso_desc.DS = shader_bytecode(ds_code, sizeof(ds_code)); + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + so_buffer = create_default_buffer(context.device, 4096, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 16, indices, 0); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + todo check_triangles(&rb, &expected_triangle, 1); + release_resource_readback(&rb); + + ID3D12Resource_Release(so_buffer); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -33244,4 +33482,5 @@ START_TEST(d3d12) run_test(test_write_buffer_immediate); run_test(test_register_space); run_test(test_sampler_register_space); + run_test(test_hull_shader_relative_addressing); } -- 2.20.1

1 0

[tools] testbot/WineTest: Always work around explorer's 'fresh WINEPREFIX' bug.
by Francois Gouget Feb. 3, 2021

Feb. 3, 2021

WineTest.pl assumed that the wineprefix had been set up by WineReconfig so that pre-initializing it to work around explorer's 'fresh WINEPREFIX' bug (41713) was not necessary. But that's no longer true so make sure to always fully initialize the wineprefix before starting any test. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48671 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- I expect this will shave 6 to 8 minutes off the WineTest run time. That means it will probably still time out but I'll reassess the situation once this patch is in. testbot/bin/build/WineTest.pl | 41 +++++++++++++---------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 84ba1cb0a..dd41fcf67 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -63,6 +63,18 @@ sub SetupTest($$) my $BaseName = SetupWineEnvironment($Mission); InfoMsg "\nRunning $Test in the $BaseName Wine\n"; InfoMsg "LANG=$ENV{LANG}\n"; + + if (!-d $ENV{WINEPREFIX}) + { + # FIXME Wait for the wineserver as a workaround for bug 41713. + my $ErrMessage = CreateWinePrefix($Mission, "wait"); + if (defined $ErrMessage) + { + LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; + return 0; + } + } + return $BaseName; } @@ -70,10 +82,9 @@ sub WineTestSuite($$$$) { my ($Mission, $NoSubmit, $BaseTag, $Args) = @_; - my $BaseName = SetupTest("WineTest", $Mission); - # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); @@ -128,20 +139,9 @@ sub TestPatch($$) return 1 if (!@TestList); } - my $BaseName = SetupTest("the tests", $Mission); - if (!-d $ENV{WINEPREFIX}) - { - # FIXME Wait for the wineserver as a workaround for bug 41713. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; - } - } - # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. + my $BaseName = SetupTest("the tests", $Mission); RunWine($Mission, "winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); @@ -177,18 +177,7 @@ sub TestExe($$$) my ($Mission, $FileName, $Args) = @_; my $BaseName = SetupTest("the tests", $Mission); - if (!-d $ENV{WINEPREFIX}) - { - # FIXME Wait for the wineserver as a workaround for bug 41713. - my $ErrMessage = CreateWinePrefix($Mission, "wait"); - if (defined $ErrMessage) - { - LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n"; - return 0; - } - } - - my $TestDir = GetTestDir($Mission); + my $TestDir = GetTestDir($Mission); # needs $WINEPREFIX if ($TestDir eq ".") { $FileName = "$DataDir/staging/$FileName"; -- 2.20.1

1 0

[PATCH v2 1/3] wined3d: Store stencil reference value in wined3d_state.
by Jan Sikorski Feb. 3, 2021

Feb. 3, 2021

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 2 -- dlls/d3d11/device.c | 15 +++------------ dlls/wined3d/adapter_vk.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/cs.c | 16 ++++++++++++---- dlls/wined3d/device.c | 25 +++++++++++++++++-------- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 4 ++-- 10 files changed, 48 insertions(+), 38 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 7fef636b883..cdae1104efa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -583,8 +583,6 @@ struct d3d_device struct wine_rb_tree depthstencil_states; struct wine_rb_tree rasterizer_states; struct wine_rb_tree sampler_states; - - UINT stencil_ref; }; static inline struct d3d_device *impl_from_ID3D11Device(ID3D11Device *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d24ec0ef0ba..a7e1999c07a 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -881,27 +881,19 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetDepthStencilState(ID3 { struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); struct d3d_depthstencil_state *state_impl; - const D3D11_DEPTH_STENCIL_DESC *desc; TRACE("iface %p, depth_stencil_state %p, stencil_ref %u.\n", iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - device->stencil_ref = stencil_ref; if (!(state_impl = unsafe_impl_from_ID3D11DepthStencilState(depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL); + wined3d_device_set_depth_stencil_state(device->wined3d_device, NULL, stencil_ref); wined3d_mutex_unlock(); return; } - wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state); - desc = &state_impl->desc; - - if (desc->StencilEnable) - { - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_STENCILREF, stencil_ref); - } + wined3d_device_set_depth_stencil_state(device->wined3d_device, state_impl->wined3d_state, stencil_ref); wined3d_mutex_unlock(); } @@ -2022,7 +2014,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 iface, depth_stencil_state, stencil_ref); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device))) + if ((wined3d_state = wined3d_device_get_depth_stencil_state(device->wined3d_device, stencil_ref))) { state_impl = wined3d_depth_stencil_state_get_parent(wined3d_state); ID3D11DepthStencilState_AddRef(*depth_stencil_state = &state_impl->ID3D11DepthStencilState_iface); @@ -2031,7 +2023,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3 { *depth_stencil_state = NULL; } - *stencil_ref = device->stencil_ref; wined3d_mutex_unlock(); } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d2ac652ab62..62032fb74c5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -43,6 +43,7 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_STREAMSRC, {STATE_STREAMSRC, state_nop}}, {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_DEPTH_STENCIL, {STATE_DEPTH_STENCIL, state_nop}}, + {STATE_STENCIL_REF, {STATE_STENCIL_REF, state_nop}}, {STATE_RASTERIZER, {STATE_RASTERIZER, state_nop}}, {STATE_SCISSORRECT, {STATE_SCISSORRECT, state_nop}}, {STATE_POINTSPRITECOORDORIGIN, {STATE_POINTSPRITECOORDORIGIN, state_nop}}, @@ -116,7 +117,6 @@ static const struct wined3d_state_entry_template misc_state_template_vk[] = {STATE_RENDER(WINED3D_RS_ANISOTROPY), {STATE_RENDER(WINED3D_RS_ANISOTROPY), state_nop}}, {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_nop}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), state_nop}}, - {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_RENDER(WINED3D_RS_STENCILREF), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_RENDER(WINED3D_RS_WRAP0), state_nop}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_RENDER(WINED3D_RS_WRAP0)}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_RENDER(WINED3D_RS_WRAP0)}}, diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 841b3d742c6..55127e44a00 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -2076,7 +2076,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.front.compareOp = vk_compare_op_from_wined3d(d->desc.front.func); key->ds_desc.front.compareMask = d->desc.stencil_read_mask; key->ds_desc.front.writeMask = d->desc.stencil_write_mask; - key->ds_desc.front.reference = state->render_states[WINED3D_RS_STENCILREF] + key->ds_desc.front.reference = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); key->ds_desc.back.failOp = vk_stencil_op_from_wined3d(d->desc.back.fail_op); @@ -2085,7 +2085,7 @@ static bool wined3d_context_vk_update_graphics_pipeline_key(struct wined3d_conte key->ds_desc.back.compareOp = vk_compare_op_from_wined3d(d->desc.back.func); key->ds_desc.back.compareMask = d->desc.stencil_read_mask; key->ds_desc.back.writeMask = d->desc.stencil_write_mask; - key->ds_desc.back.reference = state->render_states[WINED3D_RS_STENCILREF] + key->ds_desc.back.reference = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); } else diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 56df760145a..1dfc881905b 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -275,6 +275,7 @@ struct wined3d_cs_set_depth_stencil_state { enum wined3d_cs_op opcode; struct wined3d_depth_stencil_state *state; + unsigned int stencil_ref; }; struct wined3d_cs_set_rasterizer_state @@ -1235,7 +1236,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const if (prev->format->depth_bias_scale != op->view->format->depth_bias_scale) device_invalidate_state(device, STATE_RASTERIZER); if (prev->format->stencil_size != op->view->format->stencil_size) - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_STENCILREF)); + device_invalidate_state(device, STATE_STENCIL_REF); } device_invalidate_state(device, STATE_FRAMEBUFFER); @@ -1665,19 +1666,26 @@ void wined3d_cs_emit_set_blend_state(struct wined3d_cs *cs, struct wined3d_blend static void wined3d_cs_exec_set_depth_stencil_state(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_depth_stencil_state *op = data; + struct wined3d_state *state = &cs->state; - cs->state.depth_stencil_state = op->state; - device_invalidate_state(cs->device, STATE_DEPTH_STENCIL); + if (state->depth_stencil_state != op->state) + { + state->depth_stencil_state = op->state; + device_invalidate_state(cs->device, STATE_DEPTH_STENCIL); + } + state->stencil_ref = op->stencil_ref; + device_invalidate_state(cs->device, STATE_STENCIL_REF); } void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state) + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_cs_set_depth_stencil_state *op; op = wined3d_cs_require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE; op->state = state; + op->stencil_ref = stencil_ref; wined3d_cs_submit(cs, WINED3D_CS_QUEUE_DEFAULT); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3c16a3c691e..feaef2ef18f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1774,28 +1774,30 @@ struct wined3d_blend_state * CDECL wined3d_device_get_blend_state(const struct w } void CDECL wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state) + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) { struct wined3d_depth_stencil_state *prev; - TRACE("device %p, state %p.\n", device, state); + TRACE("device %p, state %p, stencil_ref %u.\n", device, state, stencil_ref); prev = device->state.depth_stencil_state; - if (prev == state) + if (prev == state && device->state.stencil_ref == stencil_ref) return; if (state) wined3d_depth_stencil_state_incref(state); device->state.depth_stencil_state = state; - wined3d_cs_emit_set_depth_stencil_state(device->cs, state); + device->state.stencil_ref = stencil_ref; + wined3d_cs_emit_set_depth_stencil_state(device->cs, state, stencil_ref); if (prev) wined3d_depth_stencil_state_decref(prev); } -struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device) +struct wined3d_depth_stencil_state * CDECL wined3d_device_get_depth_stencil_state(const struct wined3d_device *device, unsigned int *stencil_ref) { - TRACE("device %p.\n", device); + TRACE("device %p, stencil_ref %p.\n", device, stencil_ref); + *stencil_ref = device->state.stencil_ref; return device->state.depth_stencil_state; } @@ -3704,6 +3706,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, case WINED3D_RS_STENCILENABLE: case WINED3D_RS_STENCILFAIL: case WINED3D_RS_STENCILFUNC: + case WINED3D_RS_STENCILREF: case WINED3D_RS_STENCILMASK: case WINED3D_RS_STENCILPASS: case WINED3D_RS_STENCILWRITEMASK: @@ -3848,6 +3851,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, struct wined3d_depth_stencil_state *depth_stencil_state; struct wined3d_depth_stencil_state_desc desc; struct wine_rb_entry *entry; + unsigned int stencil_ref; memset(&desc, 0, sizeof(desc)); switch (state->rs[WINED3D_RS_ZENABLE]) @@ -3887,15 +3891,20 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, desc.back = desc.front; } + if (wined3d_bitmap_is_set(changed->renderState, WINED3D_RS_STENCILREF)) + stencil_ref = state->rs[WINED3D_RS_STENCILREF]; + else + wined3d_device_get_depth_stencil_state(device, &stencil_ref); + if ((entry = wine_rb_get(&device->depth_stencil_states, &desc))) { depth_stencil_state = WINE_RB_ENTRY_VALUE(entry, struct wined3d_depth_stencil_state, entry); - wined3d_device_set_depth_stencil_state(device, depth_stencil_state); + wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); } else if (SUCCEEDED(wined3d_depth_stencil_state_create(device, &desc, NULL, &wined3d_null_parent_ops, &depth_stencil_state))) { - wined3d_device_set_depth_stencil_state(device, depth_stencil_state); + wined3d_device_set_depth_stencil_state(device, depth_stencil_state, stencil_ref); if (wine_rb_put(&device->depth_stencil_states, &desc, &depth_stencil_state->entry) == -1) { ERR("Failed to insert depth/stencil state.\n"); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 040a9f81083..f72fd3e3ae3 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2469,6 +2469,7 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_BLEND_FACTOR, {STATE_VDECL}}, {STATE_SAMPLE_MASK, {STATE_VDECL}}, {STATE_DEPTH_STENCIL, {STATE_VDECL}}, + {STATE_STENCIL_REF, {STATE_VDECL}}, {STATE_STREAMSRC, {STATE_VDECL}}, {STATE_VDECL, {STATE_VDECL, state_nop}}, {STATE_RASTERIZER, {STATE_VDECL}}, @@ -2545,7 +2546,6 @@ static const struct wined3d_state_entry_template misc_state_template_no3d[] = {STATE_RENDER(WINED3D_RS_ANISOTROPY), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_FLUSHBATCH), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT), {STATE_VDECL}}, - {STATE_RENDER(WINED3D_RS_STENCILREF), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP0), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP1), {STATE_VDECL}}, {STATE_RENDER(WINED3D_RS_WRAP2), {STATE_VDECL}}, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index e40c23daf03..f454a7a3801 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1070,7 +1070,7 @@ static void state_stencil(struct wined3d_context *context, const struct wined3d_ if (!(func_back = wined3d_gl_compare_func(d->desc.back.func))) func_back = GL_ALWAYS; mask = d->desc.stencil_read_mask; - ref = state->render_states[WINED3D_RS_STENCILREF] & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); + ref = state->stencil_ref & ((1 << state->fb.depth_stencil->format->stencil_size) - 1); stencilFail = gl_stencil_op(d->desc.front.fail_op); depthFail = gl_stencil_op(d->desc.front.depth_fail_op); stencilPass = gl_stencil_op(d->desc.front.pass_op); @@ -4691,6 +4691,7 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_SAMPLE_MASK, { STATE_SAMPLE_MASK, state_sample_mask_w }, WINED3D_GL_EXT_NONE }, { STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil_2s }, EXT_STENCIL_TWO_SIDE }, { STATE_DEPTH_STENCIL, { STATE_DEPTH_STENCIL, depth_stencil }, WINED3D_GL_EXT_NONE }, + { STATE_STENCIL_REF, { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_STREAMSRC, { STATE_STREAMSRC, streamsrc }, WINED3D_GL_EXT_NONE }, { STATE_VDECL, { STATE_VDECL, vdecl_miscpart }, WINED3D_GL_EXT_NONE }, { STATE_RASTERIZER, { STATE_RASTERIZER, rasterizer_cc }, ARB_CLIP_CONTROL }, @@ -4775,7 +4776,6 @@ const struct wined3d_state_entry_template misc_state_template_gl[] = { STATE_RENDER(WINED3D_RS_ANISOTROPY), { STATE_RENDER(WINED3D_RS_ANISOTROPY), state_anisotropy }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FLUSHBATCH), { STATE_RENDER(WINED3D_RS_FLUSHBATCH), state_flushbatch }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),{ STATE_RENDER(WINED3D_RS_TRANSLUCENTSORTINDEPENDENT),state_translucentsi }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3D_RS_STENCILREF), { STATE_DEPTH_STENCIL, NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP0), { STATE_RENDER(WINED3D_RS_WRAP0), state_wrap }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP1), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_WRAP2), { STATE_RENDER(WINED3D_RS_WRAP0), NULL }, WINED3D_GL_EXT_NONE }, @@ -5574,8 +5574,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 40, 40}, { 42, 45}, { 47, 47}, - { 52, 56}, - { 58, 59}, + { 52, 59}, { 61, 127}, {149, 150}, {162, 162}, @@ -5621,6 +5620,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) STATE_BLEND, STATE_BLEND_FACTOR, STATE_DEPTH_STENCIL, + STATE_STENCIL_REF, }; unsigned int i, current; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 101c0287936..e9607edb971 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1827,7 +1827,10 @@ enum wined3d_pipeline #define STATE_DEPTH_STENCIL (STATE_SAMPLE_MASK + 1) #define STATE_IS_DEPTH_STENCIL(a) ((a) == STATE_DEPTH_STENCIL) -#define STATE_COMPUTE_OFFSET (STATE_DEPTH_STENCIL + 1) +#define STATE_STENCIL_REF (STATE_DEPTH_STENCIL + 1) +#define STATE_IS_STENCIL_REF(a) ((a) == STATE_STENCIL_REF) + +#define STATE_COMPUTE_OFFSET (STATE_STENCIL_REF + 1) #define STATE_COMPUTE_SHADER (STATE_COMPUTE_OFFSET) #define STATE_IS_COMPUTE_SHADER(a) ((a) == STATE_COMPUTE_SHADER) @@ -3701,6 +3704,7 @@ struct wined3d_state struct wined3d_color blend_factor; unsigned int sample_mask; struct wined3d_depth_stencil_state *depth_stencil_state; + unsigned int stencil_ref; struct wined3d_rasterizer_state *rasterizer_state; }; @@ -4740,7 +4744,7 @@ void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, UINT cb_idx, struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_state(struct wined3d_cs *cs, - struct wined3d_depth_stencil_state *state) DECLSPEC_HIDDEN; + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil_view(struct wined3d_cs *cs, struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 310911992ae..96cb6fc1d86 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2392,7 +2392,7 @@ struct wined3d_sampler * __cdecl wined3d_device_get_cs_sampler(const struct wine struct wined3d_unordered_access_view * __cdecl wined3d_device_get_cs_uav(const struct wined3d_device *device, unsigned int idx); struct wined3d_depth_stencil_state * __cdecl wined3d_device_get_depth_stencil_state( - const struct wined3d_device *device); + const struct wined3d_device *device, unsigned int *stencil_ref); struct wined3d_rendertarget_view * __cdecl wined3d_device_get_depth_stencil_view(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, struct wined3d_caps *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, @@ -2480,7 +2480,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); void __cdecl wined3d_device_set_depth_stencil_state(struct wined3d_device *device, - struct wined3d_depth_stencil_state *state); + struct wined3d_depth_stencil_state *state, unsigned int stencil_ref); HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); -- 2.30.0

2 5

[PATCH 1/8] d3d11/tests: Add more tests for ID3D11DeviceContext1_SwapDeviceContextState.
by Rémi Bernon Feb. 3, 2021

Feb. 3, 2021

Better checking multiple context swap side effects. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- So it looks like that a device context state tracks a unique state per device (or per context, but it only works on immediate contexts). This requires anyway a new wined3d object to track the hidden refcount, but then the corresponding states also have to be tracked on each device, and doesn't seem to be viable to keep it on the d3d11 side. dlls/d3d11/tests/d3d11.c | 47 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c5c2e16e716..7935dab1332 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -7057,14 +7057,21 @@ static void test_device_context_state(void) ID3D11Device1_GetImmediateContext1(device2, &context2); ok(!!context2, "Failed to get immediate context.\n"); + /* but they track a distinct state on each context */ ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); ok(!!tmp_context_state, "Failed to get context state.\n"); tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + /* updating context2 vertex shader doesn't update other contexts using the same state */ + ID3D11DeviceContext1_VSSetShader(context2, vs, NULL, 0); ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); else refcount = 0; todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); refcount = ID3DDeviceContextState_Release(tmp_context_state); ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); @@ -7072,14 +7079,46 @@ static void test_device_context_state(void) todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); - refcount = ID3D11DeviceContext1_Release(context2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); - refcount = ID3D11Device1_Release(device2); - ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + /* swapping the default state on context2 effectively clears the vertex shader */ + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + /* clearing the vertex shader on context doesn't have side effect on context2 */ ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); refcount = ID3D11VertexShader_Release(vs2); ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* even after swapping it again */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context2, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs, "Got shader %p, expected %p.\n", tmp_vs, vs); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* swapping the initial state on context2 doesn't have side effect on context either */ + ID3D11DeviceContext1_SwapDeviceContextState(context2, previous_context_state, NULL); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + ok(!tmp_vs, "Got unexpected shader %p.\n", tmp_vs); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); -- 2.30.0

3 22