July 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : wined3d: Set an array of rendertarget views as a single CS operation.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: befaf4d612c4d60ab1fdcb7f1b29d975110fa98d URL: https://source.winehq.org/git/wine.git/?a=commit;h=befaf4d612c4d60ab1fdcb7f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jul 15 00:18:34 2021 -0500 wined3d: Set an array of rendertarget views as a single CS operation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 76 +++++++++++++++++++++++------------------- dlls/wined3d/device.c | 8 ++--- dlls/wined3d/wined3d_private.h | 4 +-- 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 2b14da03c2f..360121e8fac 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -117,7 +117,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_PREDICATION, WINED3D_CS_OP_SET_VIEWPORTS, WINED3D_CS_OP_SET_SCISSOR_RECTS, - WINED3D_CS_OP_SET_RENDERTARGET_VIEW, + WINED3D_CS_OP_SET_RENDERTARGET_VIEWS, WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW, WINED3D_CS_OP_SET_VERTEX_DECLARATION, WINED3D_CS_OP_SET_STREAM_SOURCES, @@ -236,11 +236,12 @@ struct wined3d_cs_set_scissor_rects RECT rects[1]; }; -struct wined3d_cs_set_rendertarget_view +struct wined3d_cs_set_rendertarget_views { enum wined3d_cs_op opcode; - unsigned int view_idx; - struct wined3d_rendertarget_view *view; + unsigned int start_idx; + unsigned int count; + struct wined3d_rendertarget_view *views[1]; }; struct wined3d_cs_set_depth_stencil_view @@ -590,7 +591,7 @@ static const char *debug_cs_op(enum wined3d_cs_op op) WINED3D_TO_STR(WINED3D_CS_OP_SET_PREDICATION); WINED3D_TO_STR(WINED3D_CS_OP_SET_VIEWPORTS); WINED3D_TO_STR(WINED3D_CS_OP_SET_SCISSOR_RECTS); - WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDERTARGET_VIEW); + WINED3D_TO_STR(WINED3D_CS_OP_SET_RENDERTARGET_VIEWS); WINED3D_TO_STR(WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW); WINED3D_TO_STR(WINED3D_CS_OP_SET_VERTEX_DECLARATION); WINED3D_TO_STR(WINED3D_CS_OP_SET_STREAM_SOURCES); @@ -1293,43 +1294,50 @@ void wined3d_device_context_emit_set_scissor_rects(struct wined3d_device_context wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } -static void wined3d_cs_exec_set_rendertarget_view(struct wined3d_cs *cs, const void *data) +static void wined3d_cs_exec_set_rendertarget_views(struct wined3d_cs *cs, const void *data) { - const struct wined3d_cs_set_rendertarget_view *op = data; - bool prev_alpha_swizzle, curr_alpha_swizzle; - struct wined3d_rendertarget_view *prev; - bool prev_srgb_write, curr_srgb_write; - struct wined3d_device *device; + const struct wined3d_cs_set_rendertarget_views *op = data; + struct wined3d_device *device = cs->c.device; + unsigned int i; - device = cs->c.device; - prev = cs->state.fb.render_targets[op->view_idx]; - cs->state.fb.render_targets[op->view_idx] = op->view; - device_invalidate_state(device, STATE_FRAMEBUFFER); + for (i = 0; i < op->count; ++i) + { + struct wined3d_rendertarget_view *prev = cs->state.fb.render_targets[op->start_idx + i]; + struct wined3d_rendertarget_view *view = op->views[i]; + bool prev_alpha_swizzle, curr_alpha_swizzle; + bool prev_srgb_write, curr_srgb_write; - prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; - curr_alpha_swizzle = op->view && op->view->format->id == WINED3DFMT_A8_UNORM; - if (prev_alpha_swizzle != curr_alpha_swizzle) - device_invalidate_state(device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + cs->state.fb.render_targets[op->start_idx + i] = view; - if (!(device->adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) - || cs->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) - { - prev_srgb_write = prev && prev->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; - curr_srgb_write = op->view && op->view->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; - if (prev_srgb_write != curr_srgb_write) - device_invalidate_state(device, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + prev_alpha_swizzle = prev && prev->format->id == WINED3DFMT_A8_UNORM; + curr_alpha_swizzle = view && view->format->id == WINED3DFMT_A8_UNORM; + if (prev_alpha_swizzle != curr_alpha_swizzle) + device_invalidate_state(device, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); + + if (!(device->adapter->d3d_info.wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL) + || cs->state.render_states[WINED3D_RS_SRGBWRITEENABLE]) + { + prev_srgb_write = prev && prev->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + curr_srgb_write = view && view->format_flags & WINED3DFMT_FLAG_SRGB_WRITE; + if (prev_srgb_write != curr_srgb_write) + device_invalidate_state(device, STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE)); + } } + + device_invalidate_state(device, STATE_FRAMEBUFFER); } -void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx, - struct wined3d_rendertarget_view *view) +void wined3d_device_context_emit_set_rendertarget_views(struct wined3d_device_context *context, + unsigned int start_idx, unsigned int count, struct wined3d_rendertarget_view *const *views) { - struct wined3d_cs_set_rendertarget_view *op; + struct wined3d_cs_set_rendertarget_views *op; - op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); - op->opcode = WINED3D_CS_OP_SET_RENDERTARGET_VIEW; - op->view_idx = view_idx; - op->view = view; + op = wined3d_device_context_require_space(context, + offsetof(struct wined3d_cs_set_rendertarget_views, views[count]), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_SET_RENDERTARGET_VIEWS; + op->start_idx = start_idx; + op->count = count; + memcpy(op->views, views, count * sizeof(*views)); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2891,7 +2899,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_PREDICATION */ wined3d_cs_exec_set_predication, /* WINED3D_CS_OP_SET_VIEWPORTS */ wined3d_cs_exec_set_viewports, /* WINED3D_CS_OP_SET_SCISSOR_RECTS */ wined3d_cs_exec_set_scissor_rects, - /* WINED3D_CS_OP_SET_RENDERTARGET_VIEW */ wined3d_cs_exec_set_rendertarget_view, + /* WINED3D_CS_OP_SET_RENDERTARGET_VIEWS */ wined3d_cs_exec_set_rendertarget_views, /* WINED3D_CS_OP_SET_DEPTH_STENCIL_VIEW */ wined3d_cs_exec_set_depth_stencil_view, /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, /* WINED3D_CS_OP_SET_STREAM_SOURCES */ wined3d_cs_exec_set_stream_sources, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ec863379c10..431d1fc47e7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1649,10 +1649,8 @@ void CDECL wined3d_device_context_set_state(struct wined3d_device_context *conte context->state = state; wined3d_device_context_emit_set_feature_level(context, state->feature_level); - for (i = 0; i < WINED3D_MAX_RENDER_TARGETS; ++i) - { - wined3d_device_context_emit_set_rendertarget_view(context, i, state->fb.render_targets[i]); - } + wined3d_device_context_emit_set_rendertarget_views(context, 0, + ARRAY_SIZE(state->fb.render_targets), state->fb.render_targets); wined3d_device_context_emit_set_depth_stencil_view(context, state->fb.depth_stencil); wined3d_device_context_emit_set_vertex_declaration(context, state->vertex_declaration); @@ -2145,6 +2143,7 @@ HRESULT CDECL wined3d_device_context_set_rendertarget_views(struct wined3d_devic if (!memcmp(views, &state->fb.render_targets[start_idx], count * sizeof(*views))) return WINED3D_OK; + wined3d_device_context_emit_set_rendertarget_views(context, start_idx, count, views); for (i = 0; i < count; ++i) { struct wined3d_rendertarget_view *prev = state->fb.render_targets[start_idx + i]; @@ -2156,7 +2155,6 @@ HRESULT CDECL wined3d_device_context_set_rendertarget_views(struct wined3d_devic wined3d_rtv_bind_count_inc(view); } state->fb.render_targets[start_idx + i] = view; - wined3d_device_context_emit_set_rendertarget_view(context, start_idx + i, view); /* Release after the assignment, to prevent device_resource_released() * from seeing the resource as still in use. */ if (prev) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38d6796e666..898b35050dd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4826,8 +4826,8 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_render_state(struct wined3d_device_context *context, enum wined3d_render_state state, unsigned int value) DECLSPEC_HIDDEN; -void wined3d_device_context_emit_set_rendertarget_view(struct wined3d_device_context *context, unsigned int view_idx, - struct wined3d_rendertarget_view *view) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_rendertarget_views(struct wined3d_device_context *context, unsigned int start_idx, + unsigned int count, struct wined3d_rendertarget_view *const *views) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_samplers(struct wined3d_device_context *context, enum wined3d_shader_type type, unsigned int start_idx, unsigned int count, struct wined3d_sampler *const *samplers) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_sampler_state(struct wined3d_device_context *context, unsigned int sampler_idx,

1 0

Brendan Shanks : ntdll: Fix locale detection on Mac.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: ae73f35d537864e2572025f144ed9d48cbbfa721 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae73f35d537864e2572025f1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Jul 14 11:47:37 2021 -0700 ntdll: Fix locale detection on Mac. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index b405624d7fb..e90bfbf171e 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1085,7 +1085,7 @@ static void init_locale(void) CFStringRef locale_string; if (country) - locale_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@_%@"), lang, country); + locale_string = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@-%@"), lang, country); else locale_string = CFStringCreateCopy(NULL, lang); @@ -1114,7 +1114,7 @@ static void init_locale(void) country = CFLocaleGetValue( locale, kCFLocaleCountryCode ); } if (country) - locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@_%@"), lang, country ); + locale_string = CFStringCreateWithFormat( NULL, NULL, CFSTR("%@-%@"), lang, country ); else locale_string = CFStringCreateCopy( NULL, lang ); CFStringGetCString( locale_string, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 );

1 0

Nikolay Sivov : evr/mixer: Set MF_MT_INTERLACE_MODE for the mixer output types.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 43dd2fbfbc1641487dedd0e1daee005408583cac URL: https://source.winehq.org/git/wine.git/?a=commit;h=43dd2fbfbc1641487dedd0e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 15 16:20:23 2021 +0300 evr/mixer: Set MF_MT_INTERLACE_MODE for the mixer output types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 21 ++++++++++++++++++++- dlls/evr/tests/evr.c | 3 +++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 187a13be364..66c3960511a 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -657,11 +657,28 @@ static void video_mixer_append_rt_format(struct rt_format *rt_formats, unsigned *count += 1; } +static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_VideoDesc *video_desc) +{ + switch (video_desc->SampleFormat.SampleFormat) + { + case DXVA2_SampleFieldInterleavedEvenFirst: + return MFVideoInterlace_FieldInterleavedUpperFirst; + case DXVA2_SampleFieldInterleavedOddFirst: + return MFVideoInterlace_FieldInterleavedLowerFirst; + case DXVA2_SampleFieldSingleEven: + return MFVideoInterlace_FieldSingleUpper; + case DXVA2_SampleFieldSingleOdd: + return MFVideoInterlace_FieldSingleLower; + default: + return MFVideoInterlace_Progressive; + } +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count; + unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; HRESULT hr = MF_E_INVALIDMEDIATYPE; MFVideoArea aperture; @@ -702,6 +719,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memset(&aperture, 0, sizeof(aperture)); aperture.Area.cx = video_desc->SampleWidth; aperture.Area.cy = video_desc->SampleHeight; + interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -714,6 +732,7 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 91fff21ebed..d240ebe4456 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1056,6 +1056,9 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); IMFMediaType_Release(media_type); }

1 0

Aaron Hill : crypt32: Implement CNG_RSA_PUBLIC_KEY_BLOB encoding/decoding.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 5edf65616a8dcbf5988bbabe0493827d9e125fc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5edf65616a8dcbf5988bbabe… Author: Aaron Hill <aa1ronham(a)gmail.com> Date: Mon Jul 12 11:40:50 2021 +0200 crypt32: Implement CNG_RSA_PUBLIC_KEY_BLOB encoding/decoding. Add support for the OID CNG_RSA_PUBLIC_KEY_BLOB to CryptEncodeObjectEx and CryptDecodeObjectEx. This OID decodes to / encodes from memory consisting of a BCRYPT_RSAKEY_BLOB, followed in memory by the exponent and modulus in big-endian format. Signed-off-by: Aaron Hill <aa1ronham(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/crypt32_private.h | 5 ++ dlls/crypt32/decode.c | 114 ++++++++++++++++++++++++++++++++---- dlls/crypt32/encode.c | 53 +++++++++++++++++ dlls/crypt32/tests/encode.c | 130 +++++++++++++++++++++++++++++++++++++++++ include/wincrypt.h | 1 + 5 files changed, 291 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5edf65616a8dcbf5988b…

1 0

Zebediah Figura : winegstreamer: Switch to the quartz debug channel.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 82c3205c264b3169a7e41f493e033a4bdb873ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c3205c264b3169a7e41f49… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jul 10 19:22:21 2021 -0500 winegstreamer: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/main.c | 2 +- dlls/winegstreamer/quartz_parser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 16fd6147ddf..9211a090cf1 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -29,7 +29,7 @@ LONG object_locks; -WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); const struct unix_funcs *unix_funcs = NULL; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 5f9535659b4..09a916d7f5c 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -33,7 +33,7 @@ #include "wmcodecdsp.h" #include "ksmedia.h" -WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; static const GUID MEDIASUBTYPE_MP3 = {WAVE_FORMAT_MPEGLAYER3, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};

1 0

Zebediah Figura : strmbase: Switch to the quartz debug channel.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 4600383b79c62d402a5083f944eba3ddd033f137 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4600383b79c62d402a5083f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jul 10 19:22:22 2021 -0500 strmbase: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/dispatch.c | 2 +- dlls/strmbase/filter.c | 2 +- dlls/strmbase/mediatype.c | 4 ++-- dlls/strmbase/outputqueue.c | 2 +- dlls/strmbase/pin.c | 4 ++-- dlls/strmbase/pospass.c | 2 +- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/seeking.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index de817f20c0d..562c8c12ee6 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -20,7 +20,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static ITypeLib *control_typelib; static ITypeInfo *control_typeinfo[last_tid]; diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 93593e4c189..2cf874ac1f1 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -20,7 +20,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct enum_pins { diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index 9544d1b8bae..6f66999c390 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -23,7 +23,7 @@ #include "dvdmedia.h" #include "dxva.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const struct { @@ -65,7 +65,7 @@ static const char *debugstr_fourcc(DWORD fourcc) void strmbase_dump_media_type(const AM_MEDIA_TYPE *mt) { - if (!TRACE_ON(strmbase) || !mt) return; + if (!TRACE_ON(quartz) || !mt) return; TRACE("Dumping media type %p: major type %s, subtype %s", mt, strmbase_debugstr_guid(&mt->majortype), strmbase_debugstr_guid(&mt->subtype)); diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index dbcc4b6d0dd..4ac3ef72bd5 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -20,7 +20,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); enum {SAMPLE_PACKET, EOS_PACKET}; diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index e815f7b82df..efce0155a9e 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -21,7 +21,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const IMemInputPinVtbl MemInputPin_Vtbl; @@ -152,7 +152,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, else if (hr != S_OK) break; - if (TRACE_ON(strmbase)) + if (TRACE_ON(quartz)) { TRACE("Returning media type %u:\n", enummt->index + i); strmbase_dump_media_type(mts[i]); diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index b9e6f23a974..7478c0e67c5 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -22,7 +22,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static struct strmbase_passthrough *impl_from_ISeekingPassThru(ISeekingPassThru *iface) { diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 01fabfc98de..a879917b169 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -20,7 +20,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); /* The following quality-of-service code is based on GstBaseSink QoS code, which * is covered by the following copyright information: diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index d87e4f8516c..67ef660ba3d 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -21,7 +21,7 @@ #include "strmbase_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) {

1 0

Zebediah Figura : winegstreamer: Avoid using WARN_ON from a GStreamer callback.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: bcc19e88fbd5395f07f7523e9f6bcafc3b9e9807 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcc19e88fbd5395f07f7523e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jul 10 19:22:18 2021 -0500 winegstreamer: Avoid using WARN_ON from a GStreamer callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 4689c83413b..a2eb5415c7b 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -977,7 +977,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) gst_query_parse_accept_caps(query, &caps); wg_format_from_caps(&format, caps); ret = wg_format_compare(&format, &stream->current_format); - if (!ret && WARN_ON(gstreamer)) + if (!ret && gst_debug_category_get_threshold(GST_CAT_DEFAULT) >= GST_LEVEL_WARNING) { gchar *str = gst_caps_to_string(caps); GST_WARNING("Rejecting caps \"%s\".", str);

1 0

Zebediah Figura : winegstreamer: Factor out create_element().
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 4d2c94e1ddc6cc161dd1fc7d0337ca5e475db0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d2c94e1ddc6cc161dd1fc7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jul 10 19:22:19 2021 -0500 winegstreamer: Factor out create_element(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 68 +++++++++++++----------------------------- 1 file changed, 21 insertions(+), 47 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index a2eb5415c7b..1ff82836184 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -992,6 +992,16 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) } } +static GstElement *create_element(const char *name, const char *plugin_set) +{ + GstElement *element; + + if (!(element = gst_element_factory_make(name, NULL))) + fprintf(stderr, "winegstreamer: failed to create %s, are %u-bit GStreamer \"%s\" plugins installed?\n", + name, 8 * (unsigned int)sizeof(void *), plugin_set); + return element; +} + static struct wg_parser_stream *create_stream(struct wg_parser *parser) { struct wg_parser_stream *stream, **new_array; @@ -1046,39 +1056,23 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) /* DirectShow can express interlaced video, but downstream filters can't * necessarily consume it. In particular, the video renderer can't. */ - if (!(deinterlace = gst_element_factory_make("deinterlace", NULL))) - { - fprintf(stderr, "winegstreamer: failed to create deinterlace, are %u-bit GStreamer \"good\" plugins installed?\n", - 8 * (int)sizeof(void *)); + if (!(deinterlace = create_element("deinterlace", "good"))) goto out; - } /* decodebin considers many YUV formats to be "raw", but some quartz * filters can't handle those. Also, videoflip can't handle all "raw" * formats either. Add a videoconvert to swap color spaces. */ - if (!(vconv = gst_element_factory_make("videoconvert", NULL))) - { - fprintf(stderr, "winegstreamer: failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", - 8 * (int)sizeof(void *)); + if (!(vconv = create_element("videoconvert", "base"))) goto out; - } /* GStreamer outputs RGB video top-down, but DirectShow expects bottom-up. */ - if (!(flip = gst_element_factory_make("videoflip", NULL))) - { - fprintf(stderr, "winegstreamer: failed to create videoflip, are %u-bit GStreamer \"good\" plugins installed?\n", - 8 * (int)sizeof(void *)); + if (!(flip = create_element("videoflip", "good"))) goto out; - } /* videoflip does not support 15 and 16-bit RGB so add a second videoconvert * to do the final conversion. */ - if (!(vconv2 = gst_element_factory_make("videoconvert", NULL))) - { - fprintf(stderr, "winegstreamer: failed to create videoconvert, are %u-bit GStreamer \"base\" plugins installed?\n", - 8 * (int)sizeof(void *)); + if (!(vconv2 = create_element("videoconvert", "base"))) goto out; - } /* The bin takes ownership of these elements. */ gst_bin_add(GST_BIN(parser->container), deinterlace); @@ -1106,12 +1100,8 @@ static void pad_added_cb(GstElement *element, GstPad *pad, gpointer user) * surround-sound configurations. Native dsound can't always handle * 64-bit formats either. Add an audioconvert to allow changing bit * depth and channel count. */ - if (!(convert = gst_element_factory_make("audioconvert", NULL))) - { - fprintf(stderr, "winegstreamer: failed to create audioconvert, are %u-bit GStreamer \"base\" plugins installed?\n", - 8 * (int)sizeof(void *)); + if (!(convert = create_element("audioconvert", "base"))) goto out; - } gst_bin_add(GST_BIN(parser->container), convert); gst_element_sync_state_with_parent(convert); @@ -1636,15 +1626,11 @@ static void CDECL wg_parser_disconnect(struct wg_parser *parser) static BOOL decodebin_parser_init_gst(struct wg_parser *parser) { - GstElement *element = gst_element_factory_make("decodebin", NULL); + GstElement *element; int ret; - if (!element) - { - ERR("Failed to create decodebin; are %u-bit GStreamer \"base\" plugins installed?\n", - 8 * (int)sizeof(void*)); + if (!(element = create_element("decodebin", "base"))) return FALSE; - } gst_bin_add(GST_BIN(parser->container), element); parser->decodebin = element; @@ -1689,15 +1675,11 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) static BOOL avi_parser_init_gst(struct wg_parser *parser) { - GstElement *element = gst_element_factory_make("avidemux", NULL); + GstElement *element; int ret; - if (!element) - { - ERR("Failed to create avidemux; are %u-bit GStreamer \"good\" plugins installed?\n", - 8 * (int)sizeof(void*)); + if (!(element = create_element("avidemux", "good"))) return FALSE; - } gst_bin_add(GST_BIN(parser->container), element); @@ -1744,12 +1726,8 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) GstElement *element; int ret; - if (!(element = gst_element_factory_make("mpegaudioparse", NULL))) - { - ERR("Failed to create mpegaudioparse; are %u-bit GStreamer \"good\" plugins installed?\n", - 8 * (int)sizeof(void*)); + if (!(element = create_element("mpegaudioparse", "good"))) return FALSE; - } gst_bin_add(GST_BIN(parser->container), element); @@ -1797,12 +1775,8 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) GstElement *element; int ret; - if (!(element = gst_element_factory_make("wavparse", NULL))) - { - ERR("Failed to create wavparse; are %u-bit GStreamer \"good\" plugins installed?\n", - 8 * (int)sizeof(void*)); + if (!(element = create_element("wavparse", "good"))) return FALSE; - } gst_bin_add(GST_BIN(parser->container), element);

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debugging functions at all in the Unix library.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: e36e384cb4d96fd47763332f93c2b213f6556287 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e36e384cb4d96fd47763332f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jul 10 19:22:20 2021 -0500 winegstreamer: Avoid using Wine debugging functions at all in the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 46 +++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 1ff82836184..92e4fae034a 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -34,7 +34,10 @@ #include <gst/video/video.h> #include <gst/audio/audio.h> -WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +/* GStreamer callbacks may be called on threads not created by Wine, and + * therefore cannot access the Wine TEB. This means that we must use GStreamer + * debug logging instead of Wine debug logging. In order to be safe we forbid + * any use of Wine debug logging in this entire file. */ GST_DEBUG_CATEGORY_STATIC(wine); #define GST_CAT_DEFAULT wine @@ -609,7 +612,7 @@ static bool CDECL wg_parser_stream_get_event(struct wg_parser_stream *stream, st if (parser->flushing) { pthread_mutex_unlock(&parser->mutex); - TRACE("Filter is flushing.\n"); + GST_DEBUG("Filter is flushing.\n"); return false; } @@ -706,13 +709,13 @@ static void CDECL wg_parser_stream_notify_qos(struct wg_parser_stream *stream, /* This can happen legitimately if the sample falls outside of the * segment bounds. GStreamer elements shouldn't present the sample in * that case, but DirectShow doesn't care. */ - TRACE("Ignoring QoS event.\n"); + GST_LOG("Ignoring QoS event.\n"); return; } if (!(event = gst_event_new_qos(underflow ? GST_QOS_TYPE_UNDERFLOW : GST_QOS_TYPE_OVERFLOW, proportion, diff * 100, stream_time))) - ERR("Failed to create QOS event.\n"); + GST_ERROR("Failed to create QOS event.\n"); gst_pad_push_event(stream->my_sink, event); } @@ -721,7 +724,7 @@ static GstAutoplugSelectResult autoplug_select_cb(GstElement *bin, GstPad *pad, { const char *name = gst_element_factory_get_longname(fact); - GST_TRACE("Using \"%s\".", name); + GST_INFO("Using \"%s\".", name); if (strstr(name, "Player protection")) { @@ -1493,7 +1496,7 @@ static LONGLONG query_duration(GstPad *pad) if (gst_pad_query_duration(pad, GST_FORMAT_TIME, &duration)) return duration / 100; - WARN("Failed to query time duration; trying to convert from byte length.\n"); + GST_INFO("Failed to query time duration; trying to convert from byte length.\n"); /* To accurately get a duration for the stream, we want to only consider the * length of that stream. Hence, query for the pad duration, instead of @@ -1502,7 +1505,7 @@ static LONGLONG query_duration(GstPad *pad) && gst_pad_query_convert(pad, GST_FORMAT_BYTES, byte_length, GST_FORMAT_TIME, &duration)) return duration / 100; - ERR("Failed to query duration.\n"); + GST_WARNING("Failed to query duration.\n"); return 0; } @@ -1648,7 +1651,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.\n", ret); return FALSE; } @@ -1656,7 +1659,7 @@ static BOOL decodebin_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; } @@ -1695,7 +1698,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link pads, error %d.\n", ret); + GST_ERROR("Failed to link pads, error %d.\n", ret); return FALSE; } @@ -1703,7 +1706,7 @@ static BOOL avi_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; } @@ -1734,7 +1737,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.\n", ret); return FALSE; } @@ -1744,7 +1747,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src = gst_element_get_static_pad(element, "src")); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - ERR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } @@ -1753,7 +1756,7 @@ static BOOL mpeg_audio_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; } @@ -1783,7 +1786,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) parser->their_sink = gst_element_get_static_pad(element, "sink"); if ((ret = gst_pad_link(parser->my_src, parser->their_sink)) < 0) { - ERR("Failed to link sink pads, error %d.\n", ret); + GST_ERROR("Failed to link sink pads, error %d.\n", ret); return FALSE; } @@ -1794,7 +1797,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) gst_object_ref(stream->their_src); if ((ret = gst_pad_link(stream->their_src, stream->my_sink)) < 0) { - ERR("Failed to link source pads, error %d.\n", ret); + GST_ERROR("Failed to link source pads, error %d.\n", ret); return FALSE; } @@ -1803,7 +1806,7 @@ static BOOL wave_parser_init_gst(struct wg_parser *parser) ret = gst_element_get_state(parser->container, NULL, NULL, -1); if (ret == GST_STATE_CHANGE_FAILURE) { - ERR("Failed to play stream.\n"); + GST_ERROR("Failed to play stream.\n"); return FALSE; } @@ -1823,7 +1826,7 @@ static struct wg_parser *wg_parser_create(void) pthread_cond_init(&parser->read_done_cond, NULL); parser->flushing = true; - TRACE("Created winegstreamer parser %p.\n", parser); + GST_DEBUG("Created winegstreamer parser %p.\n", parser); return parser; } @@ -1927,15 +1930,16 @@ NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *pt if (!gst_init_check(&argc, &argv, &err)) { - ERR("Failed to initialize GStreamer: %s\n", debugstr_a(err->message)); + fprintf(stderr, "winegstreamer: failed to initialize GStreamer: %s\n", debugstr_a(err->message)); g_error_free(err); return STATUS_UNSUCCESSFUL; } - TRACE("GStreamer library version %s; wine built with %d.%d.%d.\n", - gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); GST_DEBUG_CATEGORY_INIT(wine, "WINE", GST_DEBUG_FG_RED, "Wine GStreamer support"); + GST_INFO("GStreamer library version %s; wine built with %d.%d.%d.\n", + gst_version_string(), GST_VERSION_MAJOR, GST_VERSION_MINOR, GST_VERSION_MICRO); + *(const struct unix_funcs **)ptr_out = &funcs; } return STATUS_SUCCESS;

1 0

Conor McCarthy : vkd3d: Rename d3d12_pipeline_state_init_compute_uav_counters() and handle pixel shaders.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: vkd3d Branch: master Commit: a4250e7d7115a9ee3bfba359d2a5899179c3e11c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a4250e7d7115a9ee3bfba35… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jul 15 01:47:42 2021 +1000 vkd3d: Rename d3d12_pipeline_state_init_compute_uav_counters() and handle pixel shaders. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e459c99..4537e31 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1414,9 +1414,9 @@ static HRESULT vkd3d_create_compute_pipeline(struct d3d12_device *device, return S_OK; } -static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipeline_state *state, +static HRESULT d3d12_pipeline_state_init_uav_counters(struct d3d12_pipeline_state *state, struct d3d12_device *device, const struct d3d12_root_signature *root_signature, - const struct vkd3d_shader_scan_descriptor_info *shader_info) + const struct vkd3d_shader_scan_descriptor_info *shader_info, VkShaderStageFlags stage_flags) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; VkDescriptorSetLayout set_layouts[VKD3D_MAX_DESCRIPTOR_SETS + 1]; @@ -1426,6 +1426,8 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel unsigned int i, j; HRESULT hr; + assert(vkd3d_popcount(stage_flags) == 1); + for (i = 0; i < shader_info->descriptor_count; ++i) { const struct vkd3d_shader_descriptor_info *d = &shader_info->descriptors[i]; @@ -1438,6 +1440,16 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel if (!uav_counter_count) return S_OK; + /* It should be possible to support other stages in Vulkan, but in a graphics pipeline + * D3D12 currently only supports counters in pixel shaders, and handling multiple stages + * would be more complex. */ + if (!(stage_flags & (VK_SHADER_STAGE_FRAGMENT_BIT | VK_SHADER_STAGE_COMPUTE_BIT))) + { + FIXME("Found a UAV counter for Vulkan shader stage %#x. UAV counters in a " + "graphics pipeline are only supported in pixel shaders.\n", stage_flags); + return E_INVALIDARG; + } + if (!(binding_desc = vkd3d_calloc(uav_counter_count, sizeof(*binding_desc)))) return E_OUTOFMEMORY; if (!(state->uav_counters = vkd3d_calloc(uav_counter_count, sizeof(*state->uav_counters)))) @@ -1461,17 +1473,16 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel state->uav_counters[j].register_space = d->register_space; state->uav_counters[j].register_index = d->register_index; - state->uav_counters[j].shader_visibility = VKD3D_SHADER_VISIBILITY_COMPUTE; + state->uav_counters[j].shader_visibility = (stage_flags == VK_SHADER_STAGE_COMPUTE_BIT) + ? VKD3D_SHADER_VISIBILITY_COMPUTE : VKD3D_SHADER_VISIBILITY_PIXEL; state->uav_counters[j].binding.set = set_index; state->uav_counters[j].binding.binding = descriptor_binding; state->uav_counters[j].binding.count = 1; - /* FIXME: For the graphics pipeline we have to take the shader - * visibility into account. */ binding_desc[j].binding = descriptor_binding; binding_desc[j].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; binding_desc[j].descriptorCount = 1; - binding_desc[j].stageFlags = VK_SHADER_STAGE_ALL; + binding_desc[j].stageFlags = stage_flags; binding_desc[j].pImmutableSamplers = NULL; ++descriptor_binding; @@ -1538,8 +1549,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vkd3d_result(ret); } - if (FAILED(hr = d3d12_pipeline_state_init_compute_uav_counters(state, - device, root_signature, &shader_info))) + if (FAILED(hr = d3d12_pipeline_state_init_uav_counters(state, + device, root_signature, &shader_info, VK_SHADER_STAGE_COMPUTE_BIT))) { WARN("Failed to create descriptor set layout for UAV counters, hr %#x.\n", hr); return hr;

1 0