January 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Do not return GST_FLOW_NOT_LINKED if the DirectShow pin is not connected.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 36a7dd93d713ff16b0df6ef3cdb836d6614ec0f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36a7dd93d713ff16b0df6ef3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:51 2021 -0600 winegstreamer: Do not return GST_FLOW_NOT_LINKED if the DirectShow pin is not connected. This is a fatal error condition for GStreamer, but should not cause errors for DirectShow. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 90ba02bba5d..da0121e089e 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -878,18 +878,12 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu TRACE("pad %p, pin %p, buffer %p.\n", pad, pin, buffer); - if (filter->initial) + if (filter->initial || !pin->pin.pin.peer) { gst_buffer_unref(buffer); return GST_FLOW_OK; } - if (!pin->pin.pin.peer) - { - gst_buffer_unref(buffer); - return GST_FLOW_NOT_LINKED; - } - stream_event.type = PARSER_EVENT_BUFFER; stream_event.u.buffer = buffer; /* Transfer our reference to the buffer to the thread. */

1 0

Zebediah Figura : winegstreamer: Flush connected pins directly in SetPositions().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: ef79e902a61e25845b3fac16bc51294b370030d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef79e902a61e25845b3fac16… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:49 2021 -0600 winegstreamer: Flush connected pins directly in SetPositions(). Instead of propagating GStreamer flush events to corresponding DirectShow pins. This is mainly to avoid more callbacks from GStreamer and further separate the Win32 and Unix code. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 130 ++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 44 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 949acd012aa..9cf2379cb2c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -65,7 +65,7 @@ struct parser /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ - bool streaming; + bool streaming, flushing; BOOL initial, ignore_flush; GstElement *container; @@ -111,8 +111,9 @@ struct parser_source GstCaps *caps; SourceSeeking seek; - CONDITION_VARIABLE event_cv, event_empty_cv, flushing_cv, flush_stop_cv; - bool flushing, thread_blocked; + CRITICAL_SECTION flushing_cs; + CONDITION_VARIABLE event_cv, event_empty_cv; + bool flushing; struct parser_event event; HANDLE thread; }; @@ -630,8 +631,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_start(); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -643,8 +642,6 @@ static gboolean gst_base_src_perform_seek(struct parser *This, GstEvent *event) tevent = gst_event_new_flush_stop(TRUE); gst_event_set_seqnum(tevent, seqnum); gst_pad_push_event(This->my_src, tevent); - if (This->reader) - IAsyncReader_EndFlush(This->reader); if (thread) gst_pad_set_active(This->my_src, 1); } @@ -659,25 +656,18 @@ static gboolean event_src(GstPad *pad, GstObject *parent, GstEvent *event) TRACE("filter %p, type \"%s\".\n", This, GST_EVENT_TYPE_NAME(event)); - switch (event->type) { + switch (event->type) + { case GST_EVENT_SEEK: ret = gst_base_src_perform_seek(This, event); break; + case GST_EVENT_FLUSH_START: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_BeginFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_FLUSH_STOP: - EnterCriticalSection(&This->filter.filter_cs); - if (This->reader) - IAsyncReader_EndFlush(This->reader); - LeaveCriticalSection(&This->filter.filter_cs); - break; case GST_EVENT_QOS: case GST_EVENT_RECONFIGURE: break; + default: WARN("Ignoring \"%s\" event.\n", GST_EVENT_TYPE_NAME(event)); ret = FALSE; @@ -757,19 +747,11 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } if (pin->pin.pin.peer) { - IPin_BeginFlush(pin->pin.pin.peer); - EnterCriticalSection(&filter->cs); pin->flushing = true; - WakeConditionVariable(&pin->event_cv); WakeConditionVariable(&pin->event_empty_cv); - /* Wait for the thread to pause itself, to ensure that no stale - * samples are sent. */ - while (!pin->thread_blocked) - SleepConditionVariableCS(&pin->flushing_cv, &filter->cs, INFINITE); - /* And flush out any buffered event. */ switch (pin->event.type) { case PARSER_EVENT_NONE: @@ -797,9 +779,6 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) EnterCriticalSection(&filter->cs); pin->flushing = false; LeaveCriticalSection(&filter->cs); - WakeConditionVariable(&pin->flush_stop_cv); - - IPin_EndFlush(pin->pin.pin.peer); } break; @@ -1057,32 +1036,31 @@ static DWORD CALLBACK stream_thread(void *arg) { struct parser_event event; + EnterCriticalSection(&pin->flushing_cs); EnterCriticalSection(&filter->cs); - while (filter->streaming && !pin->flushing && pin->event.type == PARSER_EVENT_NONE) + while (filter->streaming && !filter->flushing && pin->event.type == PARSER_EVENT_NONE) SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); - if (pin->flushing) + if (filter->flushing) { - TRACE("Filter is flushing; pausing thread.\n"); - pin->thread_blocked = true; - WakeConditionVariable(&pin->flushing_cv); - do - SleepConditionVariableCS(&pin->flush_stop_cv, &filter->cs, INFINITE); - while (pin->flushing); - pin->thread_blocked = false; - TRACE("Filter is no longer flushing; resuming thread.\n"); + LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); + TRACE("Filter is flushing.\n"); + continue; } if (!filter->streaming) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); break; } if (!pin->event.type) { LeaveCriticalSection(&filter->cs); + LeaveCriticalSection(&pin->flushing_cs); continue; } @@ -1127,6 +1105,8 @@ static DWORD CALLBACK stream_thread(void *arg) case PARSER_EVENT_NONE: assert(0); } + + LeaveCriticalSection(&pin->flushing_cs); } TRACE("Streaming stopped; exiting.\n"); @@ -2153,7 +2133,10 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { GstSeekType current_type = GST_SEEK_TYPE_SET, stop_type = GST_SEEK_TYPE_SET; struct parser_source *pin = impl_from_IMediaSeeking(iface); + struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); GstSeekFlags flags = 0; + HRESULT hr = S_OK; + int i; TRACE("pin %p, current %s, current_flags %#x, stop %s, stop_flags %#x.\n", pin, current ? debugstr_time(*current) : "<null>", current_flags, @@ -2161,9 +2144,40 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, mark_wine_thread(); - SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (pin->pin.pin.filter->state == State_Stopped) + { + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); return S_OK; + } + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = true; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + { + WakeConditionVariable(&pin->event_cv); + IPin_BeginFlush(filter->sources[i]->pin.pin.peer); + } + } + + if (filter->reader) + IAsyncReader_BeginFlush(filter->reader); + } + + /* Acquire the flushing locks. This blocks the streaming threads, and + * ensures the seek is serialized between flushes. */ + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + EnterCriticalSection(&pin->flushing_cs); + } + + SourceSeekingImpl_SetPositions(iface, current, current_flags, stop, stop_flags); if (current_flags & AM_SEEKING_SeekToKeyFrame) flags |= GST_SEEK_FLAG_KEY_UNIT; @@ -2182,9 +2196,33 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, { ERR("Failed to seek (current %s, stop %s).\n", debugstr_time(pin->seek.llCurrent), debugstr_time(pin->seek.llStop)); - return E_FAIL; + hr = E_FAIL; } - return S_OK; + + if (!(current_flags & AM_SEEKING_NoFlush)) + { + EnterCriticalSection(&filter->cs); + filter->flushing = false; + LeaveCriticalSection(&filter->cs); + + for (i = 0; i < filter->source_count; ++i) + { + if (filter->sources[i]->pin.pin.peer) + IPin_EndFlush(filter->sources[i]->pin.pin.peer); + } + + if (filter->reader) + IAsyncReader_EndFlush(filter->reader); + } + + /* Release the flushing locks. */ + for (i = filter->source_count - 1; i >= 0; --i) + { + if (filter->sources[i]->pin.pin.peer) + LeaveCriticalSection(&pin->flushing_cs); + } + + return hr; } static const IMediaSeekingVtbl GST_Seeking_Vtbl = @@ -2397,6 +2435,9 @@ static void free_source_pin(struct parser_source *pin) CloseHandle(pin->eos_event); gst_segment_free(pin->segment); + pin->flushing_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&pin->flushing_cs); + strmbase_seeking_cleanup(&pin->seek); strmbase_source_cleanup(&pin->pin); heap_free(pin); @@ -2434,10 +2475,11 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name GST_ChangeCurrent, GST_ChangeRate); InitializeConditionVariable(&pin->event_cv); InitializeConditionVariable(&pin->event_empty_cv); - InitializeConditionVariable(&pin->flushing_cv); - InitializeConditionVariable(&pin->flush_stop_cv); BaseFilterImpl_IncrementPinVersion(&filter->filter); + InitializeCriticalSection(&pin->flushing_cs); + pin->flushing_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": pin.flushing_cs"); + sprintf(pad_name, "qz_sink_%u", filter->source_count); pin->my_sink = gst_pad_new(pad_name, GST_PAD_SINK); gst_pad_set_element_private(pin->my_sink, pin);

1 0

Zebediah Figura : include: Add InterlockedIncrement16() and InterlockedDecrement16().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: a3c295d4cf295860fd45c3ef828174da4e969874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3c295d4cf295860fd45c3ef… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:46 2021 -0600 include: Add InterlockedIncrement16() and InterlockedDecrement16(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index b03f7bb3646..d8abb8bde70 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6905,7 +6905,9 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) +#pragma intrinsic(_InterlockedIncrement16) #pragma intrinsic(_InterlockedDecrement) +#pragma intrinsic(_InterlockedDecrement16) #pragma intrinsic(_InterlockedOr) long _InterlockedAnd(long volatile *,long); @@ -6915,9 +6917,11 @@ long long _InterlockedCompareExchange64(long long volatile*,long long,long long) unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); #endif long _InterlockedDecrement(long volatile*); +short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); long _InterlockedExchangeAdd(long volatile*,long); long _InterlockedIncrement(long volatile*); +short _InterlockedIncrement16(short volatile*); long _InterlockedOr(long volatile *,long); static FORCEINLINE LONG WINAPI InterlockedAnd( LONG volatile *dest, LONG val ) @@ -6957,11 +6961,21 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) return _InterlockedIncrement( (long volatile *)dest ); } +static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) +{ + return _InterlockedIncrement16( (long volatile *)dest ); +} + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { return _InterlockedDecrement( (long volatile *)dest ); } +static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) +{ + return _InterlockedDecrement16( (long volatile *)dest ); +} + static FORCEINLINE LONG WINAPI InterlockedOr( LONG volatile *dest, LONG val ) { return _InterlockedOr( (long volatile *)dest, val ); @@ -7098,11 +7112,21 @@ static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) return __sync_add_and_fetch( dest, 1 ); } +static FORCEINLINE short WINAPI InterlockedIncrement16( short volatile *dest ) +{ + return __sync_add_and_fetch( dest, 1 ); +} + static FORCEINLINE LONG WINAPI InterlockedDecrement( LONG volatile *dest ) { return __sync_add_and_fetch( dest, -1 ); } +static FORCEINLINE short WINAPI InterlockedDecrement16( short volatile *dest ) +{ + return __sync_add_and_fetch( dest, -1 ); +} + static FORCEINLINE void * WINAPI InterlockedExchangePointer( void *volatile *dest, void *val ) { void *ret;

1 0

Zebediah Figura : wined3d: Use YieldProcessor().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 6bdf641142c631ce22784da16cf8ff0bda4f3a70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdf641142c631ce22784da1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:48 2021 -0600 wined3d: Use YieldProcessor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 4 ++-- dlls/wined3d/wined3d_private.h | 9 +-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0b9c5f70043..56df760145a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -646,7 +646,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw * ahead of the worker thread. */ while (pending >= swapchain->max_frame_latency) { - wined3d_pause(); + YieldProcessor(); pending = InterlockedCompareExchange(&cs->pending_presents, 0, 0); } } @@ -2822,7 +2822,7 @@ static void wined3d_cs_mt_finish(struct wined3d_cs *cs, enum wined3d_cs_queue_id return wined3d_cs_st_finish(cs, queue_id); while (cs->queue[queue_id].head != *(volatile LONG *)&cs->queue[queue_id].tail) - wined3d_pause(); + YieldProcessor(); } static const struct wined3d_cs_ops wined3d_cs_mt_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 37fe3a314cb..e010deb1264 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -424,13 +424,6 @@ static inline unsigned int wined3d_popcount(unsigned int x) #endif } -static inline void wined3d_pause(void) -{ -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) - __asm__ __volatile__( "rep;nop" : : : "memory" ); -#endif -} - #define ORM_BACKBUFFER 0 #define ORM_FBO 1 @@ -4817,7 +4810,7 @@ static inline void wined3d_resource_wait_idle(struct wined3d_resource *resource) return; while (InterlockedCompareExchange(&resource->access_count, 0, 0)) - wined3d_pause(); + YieldProcessor(); } /* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other

1 0

Zebediah Figura : include: Add YieldProcessor().
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 86fc30c10540dc5ed225e547032ca1dd2d21433f URL: https://source.winehq.org/git/wine.git/?a=commit;h=86fc30c10540dc5ed225e547… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 22:35:47 2021 -0600 include: Add YieldProcessor(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index d8abb8bde70..83f03b62ade 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7154,6 +7154,19 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __GNUC__ */ +static FORCEINLINE void YieldProcessor(void) +{ +#ifdef __GNUC__ +#if defined(__i386__) || defined(__x86_64__) + __asm__ __volatile__( "rep; nop" : : : "memory" ); +#elif defined(__arm__) || defined(__aarch64__) + __asm__ __volatile__( "dmb ishst\n\tyield" : : : "memory" ); +#else + __asm__ __volatile__( "" : : : "memory" ); +#endif +#endif +} + #ifdef __cplusplus } #endif

1 0

Zebediah Figura : winegstreamer: Use the "flushing" field to unblock the streaming thread when stopping.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: wine Branch: master Commit: 275b222662e425dbd6d758c59285c6a5c0ae4edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=275b222662e425dbd6d758c5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jan 20 18:58:53 2021 -0600 winegstreamer: Use the "flushing" field to unblock the streaming thread when stopping. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 6e0f727de49..da53556eb0c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1013,14 +1013,14 @@ static DWORD CALLBACK stream_thread(void *arg) TRACE("Starting streaming thread for pin %p.\n", pin); - for (;;) + while (filter->streaming) { struct parser_event event; EnterCriticalSection(&pin->flushing_cs); EnterCriticalSection(&filter->cs); - while (filter->streaming && !filter->flushing && pin->event.type == PARSER_EVENT_NONE) + while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); if (filter->flushing) @@ -1031,13 +1031,6 @@ static DWORD CALLBACK stream_thread(void *arg) continue; } - if (!filter->streaming) - { - LeaveCriticalSection(&filter->cs); - LeaveCriticalSection(&pin->flushing_cs); - break; - } - if (!pin->event.type) { LeaveCriticalSection(&filter->cs); @@ -1585,8 +1578,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) if (!filter->container) return S_OK; - EnterCriticalSection(&filter->cs); filter->streaming = true; + EnterCriticalSection(&filter->cs); + filter->flushing = false; LeaveCriticalSection(&filter->cs); /* DirectShow retains the old seek positions, but resets to them every time @@ -1624,8 +1618,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) if (!filter->container) return S_OK; - EnterCriticalSection(&filter->cs); filter->streaming = false; + EnterCriticalSection(&filter->cs); + filter->flushing = true; LeaveCriticalSection(&filter->cs); for (i = 0; i < filter->source_count; ++i) @@ -1869,6 +1864,7 @@ static void parser_init_common(struct parser *object) object->error_event = CreateEventW(NULL, TRUE, FALSE, NULL); InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.cs"); + object->flushing = true; } HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out)

1 0

Zebediah Figura : vkd3d-shader: Implement addition and subtraction in #if directives.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: vkd3d Branch: master Commit: 76383b244bdff2ad99f55235fd50c073835f707d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=76383b244bdff2ad99f5523… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:20 2021 -0600 vkd3d-shader: Implement addition and subtraction in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.y | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index eb2036c..61b6baf 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -336,6 +336,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> primary_expr %type <integer> unary_expr %type <integer> mul_expr +%type <integer> add_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -489,7 +490,7 @@ directive } vkd3d_free($2); } - | T_IF mul_expr T_NEWLINE + | T_IF add_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -504,7 +505,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF mul_expr T_NEWLINE + | T_ELIF add_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -656,3 +657,14 @@ mul_expr } $$ = $1 / $3; } + +add_expr + : mul_expr + | add_expr '+' mul_expr + { + $$ = $1 + $3; + } + | add_expr '-' mul_expr + { + $$ = $1 - $3; + }

1 0

Zebediah Figura : vkd3d-shader: Implement unary operators in #if directives.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: vkd3d Branch: master Commit: f8a89877378b8a494f7f068f297f5ff89dea4587 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f8a89877378b8a494f7f068… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:18 2021 -0600 vkd3d-shader: Implement unary operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 36 ++++++++++++++++++++++++++++++++---- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 95b043e..011f8db 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -157,7 +157,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[()\[\]{},] {return yytext[0];} +<INITIAL>[-()\[\]{},+!] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 008d01e..51df5d4 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -333,7 +333,8 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_CONCAT "##" %token T_DEFINED "defined" -%type <integer> expr +%type <integer> primary_expr +%type <integer> unary_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -426,6 +427,18 @@ body_token_const { $$ = ","; } + | '+' + { + $$ = "+"; + } + | '-' + { + $$ = "-"; + } + | '!' + { + $$ = "!"; + } | T_CONCAT { $$ = "##"; @@ -467,7 +480,7 @@ directive } vkd3d_free($2); } - | T_IF expr T_NEWLINE + | T_IF unary_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -482,7 +495,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF expr T_NEWLINE + | T_ELIF unary_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -582,7 +595,7 @@ directive vkd3d_free($2); } -expr +primary_expr : T_INTEGER { $$ = preproc_parse_integer($1); @@ -603,3 +616,18 @@ expr $$ = !!preproc_find_macro(ctx, $3); vkd3d_free($3); } + +unary_expr + : primary_expr + | '+' unary_expr + { + $$ = $2; + } + | '-' unary_expr + { + $$ = -$2; + } + | '!' unary_expr + { + $$ = !$2; + }

1 0

Zebediah Figura : vkd3d-shader: Implement multiplication and division in #if directives.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: vkd3d Branch: master Commit: be7e06cd4a4b0eefba908aab3b9b517ad7c47bb3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=be7e06cd4a4b0eefba908aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:19 2021 -0600 vkd3d-shader: Implement multiplication and division in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 2 +- libs/vkd3d-shader/preproc.y | 29 +++++++++++++++++++++++++++-- libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index 011f8db..a522b7c 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -157,7 +157,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 51df5d4..eb2036c 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -335,6 +335,7 @@ static void free_parse_arg_names(struct parse_arg_names *args) %type <integer> primary_expr %type <integer> unary_expr +%type <integer> mul_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -439,6 +440,14 @@ body_token_const { $$ = "!"; } + | '*' + { + $$ = "*"; + } + | '/' + { + $$ = "/"; + } | T_CONCAT { $$ = "##"; @@ -480,7 +489,7 @@ directive } vkd3d_free($2); } - | T_IF unary_expr T_NEWLINE + | T_IF mul_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -495,7 +504,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF unary_expr T_NEWLINE + | T_ELIF mul_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -631,3 +640,19 @@ unary_expr { $$ = !$2; } + +mul_expr + : unary_expr + | mul_expr '*' unary_expr + { + $$ = $1 * $3; + } + | mul_expr '/' unary_expr + { + if (!$3) + { + preproc_warning(ctx, &@3, VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO, "Division by zero."); + $3 = 1; + } + $$ = $1 / $3; + } diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 8d9821d..12edfae 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -90,6 +90,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_PP_UNKNOWN_DIRECTIVE = 4303, VKD3D_SHADER_WARNING_PP_UNTERMINATED_MACRO = 4304, VKD3D_SHADER_WARNING_PP_UNTERMINATED_IF = 4305, + VKD3D_SHADER_WARNING_PP_DIV_BY_ZERO = 4306, }; enum VKD3D_SHADER_INSTRUCTION_HANDLER

1 0

Zebediah Figura : vkd3d-shader: Implement inequality operators in #if directives.
by Alexandre Julliard Jan. 21, 2021

Jan. 21, 2021

Module: vkd3d Branch: master Commit: eecfe9c2a2d4dde32a60c7fb680c02ff74a6837d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eecfe9c2a2d4dde32a60c7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 19 11:18:21 2021 -0600 vkd3d-shader: Implement inequality operators in #if directives. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/preproc.l | 7 +++++-- libs/vkd3d-shader/preproc.y | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/preproc.l b/libs/vkd3d-shader/preproc.l index a522b7c..6779a39 100644 --- a/libs/vkd3d-shader/preproc.l +++ b/libs/vkd3d-shader/preproc.l @@ -78,6 +78,9 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>{IDENTIFIER}/\( {return T_IDENTIFIER_PAREN;} <INITIAL>{IDENTIFIER} {return T_IDENTIFIER;} +<INITIAL>"<=" {return T_LE;} +<INITIAL>">=" {return T_GE;} + /* We have no use for floats, but shouldn't parse them as integers. */ <INITIAL>[0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[hHfF]? {return T_TEXT;} @@ -96,7 +99,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* <INITIAL>"--" {return T_TEXT;} <INITIAL>"<<"=? {return T_TEXT;} <INITIAL>">>"=? {return T_TEXT;} -<INITIAL>[-+*/%&|^=><!]= {return T_TEXT;} +<INITIAL>[-+*/%&|^=!]= {return T_TEXT;} <INCLUDE>\"[^"]*\" {return T_STRING;} <INCLUDE>\<[^>]*\> {return T_STRING;} @@ -157,7 +160,7 @@ IDENTIFIER [A-Za-z_][A-Za-z0-9_]* } <INITIAL>{WS}+ {} -<INITIAL>[-()\[\]{},+!*/] {return yytext[0];} +<INITIAL>[-()\[\]{},+!*/<>] {return yytext[0];} <INITIAL>. {return T_TEXT;} %% diff --git a/libs/vkd3d-shader/preproc.y b/libs/vkd3d-shader/preproc.y index 61b6baf..6d88419 100644 --- a/libs/vkd3d-shader/preproc.y +++ b/libs/vkd3d-shader/preproc.y @@ -331,12 +331,16 @@ static void free_parse_arg_names(struct parse_arg_names *args) %token T_UNDEF "#undef" %token T_CONCAT "##" + +%token T_LE "<=" +%token T_GE ">=" %token T_DEFINED "defined" %type <integer> primary_expr %type <integer> unary_expr %type <integer> mul_expr %type <integer> add_expr +%type <integer> ineq_expr %type <string> body_token %type <const_string> body_token_const %type <string_buffer> body_text @@ -449,10 +453,26 @@ body_token_const { $$ = "/"; } + | '<' + { + $$ = "<"; + } + | '>' + { + $$ = ">"; + } | T_CONCAT { $$ = "##"; } + | T_LE + { + $$ = "<="; + } + | T_GE + { + $$ = ">="; + } | T_DEFINED { $$ = "defined"; @@ -490,7 +510,7 @@ directive } vkd3d_free($2); } - | T_IF add_expr T_NEWLINE + | T_IF ineq_expr T_NEWLINE { if (!preproc_push_if(ctx, !!$2)) YYABORT; @@ -505,7 +525,7 @@ directive preproc_push_if(ctx, !preproc_find_macro(ctx, $2)); vkd3d_free($2); } - | T_ELIF add_expr T_NEWLINE + | T_ELIF ineq_expr T_NEWLINE { const struct preproc_file *file = preproc_get_top_file(ctx); @@ -668,3 +688,22 @@ add_expr { $$ = $1 - $3; } + +ineq_expr + : add_expr + | ineq_expr '<' add_expr + { + $$ = $1 < $3; + } + | ineq_expr '>' add_expr + { + $$ = $1 > $3; + } + | ineq_expr T_LE add_expr + { + $$ = $1 <= $3; + } + | ineq_expr T_GE add_expr + { + $$ = $1 >= $3; + }

1 0