February 2024 - Wine-commits

Zebediah Figura : wined3d: Merge shader_load_constants() into shader_select().
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: c8a98e03c8f13664c6d3c43897da5e2443b79ab1 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8a98e03c8f13664c6d3c43897da5e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 13:57:55 2023 -0600 wined3d: Merge shader_load_constants() into shader_select(). Arguably there is a benefit here in that it reduces shader backend state application down to a single method, although whether that is an improvement may be up for debate. More saliently, we would like to move FFP state application out of the state table and into a linear state function. In practice that function will probably be vp_enable / fp_enable. In that case we will need those functions, and hence also shader_select(), to be called when more states are dirty. This does not in itself mean that shader_load_constants() needs to be merged with shader_select(), but it does remove the primary impetus for keeping them separate. Rename to shader_apply_draw_state() to reflect the adjusted purpose, as suggested by Henri Verbeet. --- dlls/wined3d/arb_program_shader.c | 40 +++++++++++++++++++-------------------- dlls/wined3d/context_gl.c | 16 +++++----------- dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/glsl_shader.c | 38 ++++++++++++++++++++++--------------- dlls/wined3d/shader.c | 7 ++----- dlls/wined3d/shader_spirv.c | 11 ++--------- dlls/wined3d/wined3d_private.h | 4 +--- 7 files changed, 54 insertions(+), 64 deletions(-)

1 0

Zebediah Figura : wined3d: Introduce a separate vp_disable() method.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 9880e29d69a227b7ae0031ddaff0148768d1be7e URL: https://gitlab.winehq.org/wine/wine/-/commit/9880e29d69a227b7ae0031ddaff014… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 21:21:52 2023 -0600 wined3d: Introduce a separate vp_disable() method. Analogous to shader_disable(). We'd like to pass a wined3d_state pointer to vp_enable() to let it handle actually compiling the vertex pipeline, which doesn't mesh well conceptually with its use in shader_disable(). --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ffp_gl.c | 29 +++++++++++++++++------------ dlls/wined3d/glsl_shader.c | 17 ++++++++++------- dlls/wined3d/shader.c | 2 +- dlls/wined3d/shader_spirv.c | 8 +++++++- dlls/wined3d/wined3d_private.h | 1 + 6 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4e856c6a616..a1f56406a0a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4778,7 +4778,7 @@ static void shader_arb_disable(void *shader_priv, struct wined3d_context *contex gl_info->gl_ops.gl.p_glDisable(GL_VERTEX_PROGRAM_ARB); checkGLcall("glDisable(GL_VERTEX_PROGRAM_ARB)"); } - priv->vertex_pipe->vp_enable(context, FALSE); + priv->vertex_pipe->vp_disable(context); if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT] && priv->last_vs_color_unclamp) { diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index d52d198e545..8d8a14107eb 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -4842,6 +4842,8 @@ static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = /* Context activation is done by the caller. */ static void ffp_pipe_enable(const struct wined3d_context *context, BOOL enable) {} +static void ffp_pipe_disable(const struct wined3d_context *context) {} + static void *ffp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { return shader_priv; @@ -4879,12 +4881,13 @@ static unsigned int vp_ffp_get_emul_mask(const struct wined3d_adapter *adapter) const struct wined3d_vertex_pipe_ops ffp_vertex_pipe = { - ffp_pipe_enable, - vp_ffp_get_caps, - vp_ffp_get_emul_mask, - ffp_alloc, - ffp_free, - vp_ffp_states, + .vp_enable = ffp_pipe_enable, + .vp_disable = ffp_pipe_disable, + .vp_get_caps = vp_ffp_get_caps, + .vp_get_emul_mask = vp_ffp_get_emul_mask, + .vp_alloc = ffp_alloc, + .vp_free = ffp_free, + .vp_states = vp_ffp_states, }; static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) @@ -4965,6 +4968,8 @@ const struct wined3d_fragment_pipe_ops ffp_fragment_pipeline = static void none_pipe_enable(const struct wined3d_context *context, BOOL enable) {} +static void none_pipe_disable(const struct wined3d_context *context) {} + static void *none_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { return shader_priv; @@ -4984,12 +4989,12 @@ static unsigned int vp_none_get_emul_mask(const struct wined3d_adapter *adapter) const struct wined3d_vertex_pipe_ops none_vertex_pipe = { - none_pipe_enable, - vp_none_get_caps, - vp_none_get_emul_mask, - none_alloc, - none_free, - NULL, + .vp_enable = none_pipe_enable, + .vp_disable = none_pipe_disable, + .vp_get_caps = vp_none_get_caps, + .vp_get_emul_mask = vp_none_get_emul_mask, + .vp_alloc = none_alloc, + .vp_free = none_free, }; static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4e9a3b3467b..07b3d002c67 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10820,7 +10820,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte GL_EXTCALL(glUseProgram(0)); checkGLcall("glUseProgram"); - priv->vertex_pipe->vp_enable(context, FALSE); + priv->vertex_pipe->vp_disable(context); priv->fragment_pipe->fp_enable(context, FALSE); if (needs_legacy_glsl_syntax(gl_info) && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) @@ -11565,6 +11565,8 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = static void glsl_vertex_pipe_vp_enable(const struct wined3d_context *context, BOOL enable) {} +static void glsl_vertex_pipe_vp_disable(const struct wined3d_context *context) {} + static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { const struct wined3d_gl_info *gl_info = &wined3d_adapter_gl_const(adapter)->gl_info; @@ -12049,12 +12051,13 @@ static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = * - Implement vertex tweening. */ const struct wined3d_vertex_pipe_ops glsl_vertex_pipe = { - glsl_vertex_pipe_vp_enable, - glsl_vertex_pipe_vp_get_caps, - glsl_vertex_pipe_vp_get_emul_mask, - glsl_vertex_pipe_vp_alloc, - glsl_vertex_pipe_vp_free, - glsl_vertex_pipe_vp_states, + .vp_enable = glsl_vertex_pipe_vp_enable, + .vp_disable = glsl_vertex_pipe_vp_disable, + .vp_get_caps = glsl_vertex_pipe_vp_get_caps, + .vp_get_emul_mask = glsl_vertex_pipe_vp_get_emul_mask, + .vp_alloc = glsl_vertex_pipe_vp_alloc, + .vp_free = glsl_vertex_pipe_vp_free, + .vp_states = glsl_vertex_pipe_vp_states, }; static void glsl_fragment_pipe_enable(const struct wined3d_context *context, BOOL enable) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b72a3df8737..e047e3da03d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1952,7 +1952,7 @@ static void shader_none_disable(void *shader_priv, struct wined3d_context *conte { struct shader_none_priv *priv = shader_priv; - priv->vertex_pipe->vp_enable(context, FALSE); + priv->vertex_pipe->vp_disable(context); priv->fragment_pipe->fp_enable(context, FALSE); context->shader_update_mask = (1u << WINED3D_SHADER_TYPE_PIXEL) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 1eac7373ee3..ca14564d7d6 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -904,7 +904,7 @@ static void shader_spirv_disable(void *shader_priv, struct wined3d_context *cont struct wined3d_context_vk *context_vk = wined3d_context_vk(context); struct shader_spirv_priv *priv = shader_priv; - priv->vertex_pipe->vp_enable(context, false); + priv->vertex_pipe->vp_disable(context); priv->fragment_pipe->fp_enable(context, false); context_vk->compute.vk_pipeline = VK_NULL_HANDLE; @@ -1141,6 +1141,11 @@ static void spirv_vertex_pipe_vk_vp_enable(const struct wined3d_context *context /* Nothing to do. */ } +static void spirv_vertex_pipe_vk_vp_disable(const struct wined3d_context *context) +{ + /* Nothing to do. */ +} + static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { memset(caps, 0, sizeof(*caps)); @@ -1200,6 +1205,7 @@ static const struct wined3d_state_entry_template spirv_vertex_pipe_vk_vp_states[ static const struct wined3d_vertex_pipe_ops spirv_vertex_pipe_vk = { .vp_enable = spirv_vertex_pipe_vk_vp_enable, + .vp_disable = spirv_vertex_pipe_vk_vp_disable, .vp_get_caps = spirv_vertex_pipe_vk_vp_get_caps, .vp_get_emul_mask = spirv_vertex_pipe_vk_vp_get_emul_mask, .vp_alloc = spirv_vertex_pipe_vk_vp_alloc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 033e0d6b9dc..8c562ba5daf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2029,6 +2029,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_context *context, BOOL enable); + void (*vp_disable)(const struct wined3d_context *context); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); unsigned int (*vp_get_emul_mask)(const struct wined3d_adapter *adapter); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv);

1 0

Paul Gofman : mapi32: Force debug info in critical sections.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 0efd48113e767667fa1a255ee5b3ce5be9ee697f URL: https://gitlab.winehq.org/wine/wine/-/commit/0efd48113e767667fa1a255ee5b3ce… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 14:58:03 2024 -0600 mapi32: Force debug info in critical sections. --- dlls/mapi32/prop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 95176829f7e..8018ceecd4d 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -2335,7 +2335,7 @@ SCODE WINAPI CreateIProp(LPCIID iid, ALLOCATEBUFFER *lpAlloc, lpPropData->ulObjAccess = IPROP_READWRITE; lpPropData->ulNumValues = 0; list_init(&lpPropData->values); - InitializeCriticalSection(&lpPropData->cs); + InitializeCriticalSectionEx(&lpPropData->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); lpPropData->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IPropDataImpl.cs"); *lppPropData = &lpPropData->IPropData_iface; }

1 0

Paul Gofman : propsys: Force debug info in critical sections.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 67bea281cc851eda6a08430c70f6c9e848d3fbe1 URL: https://gitlab.winehq.org/wine/wine/-/commit/67bea281cc851eda6a08430c70f6c9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 14:59:13 2024 -0600 propsys: Force debug info in critical sections. --- dlls/propsys/propstore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 9906df83f6f..d2ce67969bf 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -464,7 +464,7 @@ HRESULT PropertyStore_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv This->IPropertyStoreCache_iface.lpVtbl = &PropertyStore_Vtbl; This->ref = 1; - InitializeCriticalSection(&This->lock); + InitializeCriticalSectionEx(&This->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PropertyStore.lock"); list_init(&This->formats);

1 0

Paul Gofman : rpcrt4: Force debug info in critical sections.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 139d624787a2c629cf640a413c4faabfc2bf40b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/139d624787a2c629cf640a413c4faa… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 15:01:47 2024 -0600 rpcrt4: Force debug info in critical sections. --- dlls/rpcrt4/rpc_assoc.c | 4 ++-- dlls/rpcrt4/rpc_server.c | 2 +- dlls/rpcrt4/rpc_transport.c | 2 +- dlls/rpcrt4/rpcrt4_main.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index 6a6768e1677..c3eec9558dd 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -72,7 +72,7 @@ static RPC_STATUS RpcAssoc_Alloc(LPCSTR Protseq, LPCSTR NetworkAddr, assoc->refs = 1; list_init(&assoc->free_connection_pool); list_init(&assoc->context_handle_list); - InitializeCriticalSection(&assoc->cs); + InitializeCriticalSectionEx(&assoc->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); assoc->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcAssoc.cs"); assoc->Protseq = strdup(Protseq); assoc->NetworkAddr = strdup(NetworkAddr); @@ -463,7 +463,7 @@ RPC_STATUS RpcServerAssoc_AllocateContextHandle(RpcAssoc *assoc, void *CtxGuard, return RPC_S_OUT_OF_MEMORY; context_handle->ctx_guard = CtxGuard; - InitializeCriticalSection(&context_handle->lock); + InitializeCriticalSectionEx(&context_handle->lock, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); context_handle->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcContextHandle.lock"); context_handle->refs = 1; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 41431ebca02..eb733f69980 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -965,7 +965,7 @@ static RPC_STATUS alloc_serverprotoseq(UINT MaxCalls, const char *Protseq, RpcSe (*ps)->ops = ops; list_init(&(*ps)->listeners); list_init(&(*ps)->connections); - InitializeCriticalSection(&(*ps)->cs); + InitializeCriticalSectionEx(&(*ps)->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); (*ps)->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcServerProtseq.cs"); list_add_head(&protseqs, &(*ps)->entry); diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 62bbd9f2939..8d53e7cee35 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -1756,7 +1756,7 @@ static RpcConnection *rpcrt4_ncacn_http_alloc(void) httpc->cancel_event = CreateEventW(NULL, FALSE, FALSE, NULL); httpc->async_data->refs = 1; httpc->async_data->inet_buffers.dwStructSize = sizeof(INTERNET_BUFFERSW); - InitializeCriticalSection(&httpc->async_data->cs); + InitializeCriticalSectionEx(&httpc->async_data->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); httpc->async_data->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": RpcHttpAsyncData.cs"); return &httpc->common; } diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index 122ab94f17c..37d82f330dc 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -950,7 +950,7 @@ static struct threaddata *get_or_create_threaddata(void) tdata = calloc(1, sizeof(*tdata)); if (!tdata) return NULL; - InitializeCriticalSection(&tdata->cs); + InitializeCriticalSectionEx(&tdata->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); tdata->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": threaddata.cs"); tdata->thread_id = GetCurrentThreadId();

1 0

Paul Gofman : vcomp: Force debug info in critical sections.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: c65d0a0770bdcd60ecf579d7506b62b200e6386e URL: https://gitlab.winehq.org/wine/wine/-/commit/c65d0a0770bdcd60ecf579d7506b62… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 15:02:43 2024 -0600 vcomp: Force debug info in critical sections. --- dlls/vcomp/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 63ec0502b9b..91afea33112 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1712,7 +1712,7 @@ static CRITICAL_SECTION *alloc_critsect(void) ExitProcess(1); } - InitializeCriticalSection(critsect); + InitializeCriticalSectionEx(critsect, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); critsect->DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": critsect"); return critsect; }

1 0

Paul Gofman : webservices: Force debug info in critical sections.
by Alexandre Julliard 16 Feb '24

16 Feb '24

Module: wine Branch: master Commit: 95e12689e6e100e11e7857a12a714311c6cb4c93 URL: https://gitlab.winehq.org/wine/wine/-/commit/95e12689e6e100e11e7857a12a7143… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 15 15:06:25 2024 -0600 webservices: Force debug info in critical sections. --- dlls/webservices/channel.c | 6 +++--- dlls/webservices/error.c | 2 +- dlls/webservices/heap.c | 2 +- dlls/webservices/listener.c | 2 +- dlls/webservices/msg.c | 2 +- dlls/webservices/proxy.c | 2 +- dlls/webservices/reader.c | 2 +- dlls/webservices/writer.c | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 5851fd9d4af..b58a2d44457 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -252,9 +252,9 @@ static struct channel *alloc_channel(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = CHANNEL_MAGIC; - InitializeCriticalSection( &ret->cs ); - InitializeCriticalSection( &ret->send_q.cs ); - InitializeCriticalSection( &ret->recv_q.cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + InitializeCriticalSectionEx( &ret->send_q.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + InitializeCriticalSectionEx( &ret->recv_q.cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.cs"); ret->send_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.send_q.cs"); ret->recv_q.cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": channel.recv_q.cs"); diff --git a/dlls/webservices/error.c b/dlls/webservices/error.c index aa1a9744f34..9e57f454ce9 100644 --- a/dlls/webservices/error.c +++ b/dlls/webservices/error.c @@ -67,7 +67,7 @@ static struct error *alloc_error(void) } ret->magic = ERROR_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": error.cs"); prop_init( error_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index b2ee514b970..71ef42c9530 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -184,7 +184,7 @@ static struct heap *alloc_heap(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = HEAP_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": heap.cs"); prop_init( heap_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/listener.c b/dlls/webservices/listener.c index 3112d5d84fd..da4e135703f 100644 --- a/dlls/webservices/listener.c +++ b/dlls/webservices/listener.c @@ -141,7 +141,7 @@ static struct listener *alloc_listener(void) free( ret ); return NULL; } - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": listener.cs"); prop_init( listener_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 7f6cd028163..5912195e015 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -108,7 +108,7 @@ static struct msg *alloc_msg(void) ret->state = WS_MESSAGE_STATE_EMPTY; ret->header_size = HEADER_ARRAY_SIZE; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": msg.cs"); prop_init( msg_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/proxy.c b/dlls/webservices/proxy.c index bde4cdb168f..d00ad4ad70b 100644 --- a/dlls/webservices/proxy.c +++ b/dlls/webservices/proxy.c @@ -62,7 +62,7 @@ static struct proxy *alloc_proxy(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = PROXY_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": proxy.cs"); prop_init( proxy_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0c8ddcea035..0cd974c9118 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -422,7 +422,7 @@ static struct reader *alloc_reader(void) ret->nb_prefixes = ret->nb_prefixes_allocated = 1; ret->magic = READER_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": reader.cs"); prop_init( reader_props, count, ret->prop, &ret[1] ); diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 6923035f00c..df8535f8647 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -109,7 +109,7 @@ static struct writer *alloc_writer(void) if (!(ret = calloc( 1, size ))) return NULL; ret->magic = WRITER_MAGIC; - InitializeCriticalSection( &ret->cs ); + InitializeCriticalSectionEx( &ret->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); ret->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": writer.cs"); prop_init( writer_props, count, ret->prop, &ret[1] );

1 0

Francisco Casas : vkd3d-shader/d3dbc: Implement casts from ints to floats as a MOV.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: 4b5c7e372196a303db6786f01f9c37589f86d2e8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b5c7e372196a303db6786f01f9c3… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 20 18:38:12 2023 -0300 vkd3d-shader/d3dbc: Implement casts from ints to floats as a MOV. For temporary registers, SM1-SM3 integer types are internally represented as floating point, so, in order to perform a cast from ints to floats we need a mere MOV. For constant integer registers "iN" there is no operation for casting from a floating point register to them. For address registers "aN", and the loop counting register "aL", vertex shaders have the "mova" operation but we haven't used these registers in any way yet. We probably would want to introduce these as synthetic variables allocated in a special register set. In that case we have to remember to use MOVA instead of MOV in the store operations, but they shouldn't be src or dst of CAST operations. Regarding constant integer registers, in some shaders, constants are expected to be received formatted as an integer, such as: int m; float4 main() : sv_target { float4 res = {0, 0, 0, 0}; for (int k = 0; k < m; ++k) res += k; return res; } which compiles as: // Registers: // // Name Reg Size // ------------ ----- ---- // m i0 1 // ps_3_0 def c0, 0, 1, 0, 0 mov r0, c0.x mov r1.x, c0.x rep i0 add r0, r0, r1.x add r1.x, r1.x, c0.y endrep mov oC0, r0 but this only happens if the integer constant is used directly in an instruction that needs it, and as I said there is no instruction that allows converting them to a float representation. Notice how a more complex shader, that performs operations with this integer variable "m": int m; float4 main() : sv_target { float4 res = {0, 0, 0, 0}; for (int k = 0; k < m * m; ++k) res += k; return res; } gives the following output: // Registers: // // Name Reg Size // ------------ ----- ---- // m c0 1 // ps_3_0 def c1, 0, 0, 1, 0 defi i0, 255, 0, 0, 0 mul r0.x, c0.x, c0.x mov r1, c1.y mov r0.y, c1.y rep i0 mov r0.z, r0.x break_ge r0.y, r0.z add r1, r0.y, r1 add r0.y, r0.y, c1.z endrep mov oC0, r1 Meaning that the uniform "m" is just stored as a floating point in "c0", the constant integer register "i0" is just set to 255 (hoping it is a high enough value) using "defi", and the "break_ge" involving c0 is used to break from the loop. We could potentially use this approach to implement loops from SM3 without expecting the variables being received as constant integer registers. According to the D3D documentation, for SM1-SM3 constant integer registers are only used by the 'loop' and 'rep' instructions. --- libs/vkd3d-shader/d3dbc.c | 82 +++++++++++++++++++++++++++++++++++++++++ tests/hlsl/distance.shader_test | 2 +- tests/hlsl/half.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 4 +- tests/hlsl/lerp.shader_test | 6 +-- 5 files changed, 90 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 9ad9f735..27aec124 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1958,6 +1958,84 @@ static void write_sm1_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe write_sm1_instruction(ctx, buffer, &instr); } +static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_ir_node *instr) +{ + struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + const struct hlsl_ir_node *arg1 = expr->operands[0].node; + const struct hlsl_type *dst_type = expr->node.data_type; + const struct hlsl_type *src_type = arg1->data_type; + + /* Narrowing casts were already lowered. */ + assert(src_type->dimx == dst_type->dimx); + + switch (dst_type->base_type) + { + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + switch (src_type->base_type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + /* Integers are internally represented as floats, so no change is necessary.*/ + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to float."); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to float."); + break; + + default: + vkd3d_unreachable(); + } + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + switch(src_type->base_type) + { + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); + break; + + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from float to integer."); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to integer."); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &instr->loc, "SM1 cast from double to integer."); + break; + + default: + vkd3d_unreachable(); + } + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, &instr->loc, "SM1 cast to double."); + break; + + case HLSL_TYPE_BOOL: + /* Casts to bool should have already been lowered. */ + default: + hlsl_fixme(ctx, &expr->node.loc, "SM1 cast from %s to %s.\n", + debug_hlsl_type(ctx, src_type), debug_hlsl_type(ctx, dst_type)); + break; + } +} + static void write_sm1_constant_defs(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer) { unsigned int i, x; @@ -2179,6 +2257,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_unary_op(ctx, buffer, D3DSIO_ABS, &instr->reg, &arg1->reg, 0, 0); break; + case HLSL_OP1_CAST: + write_sm1_cast(ctx, buffer, instr); + break; + case HLSL_OP1_DSX: write_sm1_unary_op(ctx, buffer, D3DSIO_DSX, &instr->reg, &arg1->reg, 0, 0); break; diff --git a/tests/hlsl/distance.shader_test b/tests/hlsl/distance.shader_test index bf2423c7..3f544645 100644 --- a/tests/hlsl/distance.shader_test +++ b/tests/hlsl/distance.shader_test @@ -13,7 +13,7 @@ uniform 4 float4 2.0 -1.0 4.0 5.0 draw quad probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1 -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 x; uniform int4 y; diff --git a/tests/hlsl/half.shader_test b/tests/hlsl/half.shader_test index 8cf7a756..fe7074e4 100644 --- a/tests/hlsl/half.shader_test +++ b/tests/hlsl/half.shader_test @@ -9,7 +9,7 @@ float4 main() : sv_target [require] options: backcompat -[pixel shader todo(sm<4)] +[pixel shader] uniform half h; float4 main() : sv_target @@ -19,5 +19,5 @@ float4 main() : sv_target [test] uniform 0 float 10.0 -todo(sm<4) draw quad +draw quad probe all rgba (10.0, 10.0, 10.0, 10.0) diff --git a/tests/hlsl/ldexp.shader_test b/tests/hlsl/ldexp.shader_test index 2d778e07..75492b66 100644 --- a/tests/hlsl/ldexp.shader_test +++ b/tests/hlsl/ldexp.shader_test @@ -14,7 +14,7 @@ draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 x; uniform int4 y; @@ -28,7 +28,7 @@ if(sm<4) uniform 0 float4 2 3 4 5 if(sm<4) uniform 4 float4 0 -10 10 100 if(sm>=4) uniform 0 int4 2 3 4 5 if(sm>=4) uniform 4 int4 0 -10 10 100 -todo(sm<4) draw quad +draw quad probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2 diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/lerp.shader_test index 901857df..ae6ef534 100644 --- a/tests/hlsl/lerp.shader_test +++ b/tests/hlsl/lerp.shader_test @@ -16,7 +16,7 @@ draw quad probe all rgba (2.0, -10.0, -2.0, 76.25) -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 x; uniform int4 y; uniform int4 s; @@ -33,8 +33,8 @@ if(sm<4) uniform 8 float4 0 1 -1 1000000 if(sm>=4) uniform 0 int4 2 3 4 0 if(sm>=4) uniform 4 int4 0 -10 10 1000000 if(sm>=4) uniform 8 int4 0 1 -1 1000000 -todo(sm<4) draw quad -probe all rgba (2.0, -10.0, -2.0, 1e12) +draw quad +probe all rgba (2.0, -10.0, -2.0, 1e12) 4 [pixel shader]

1 0

Francisco Casas : tests: Add simple test for implicit cast to int.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: e62bd1927e53d9628d4f3f5e55eae7321ce662e1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e62bd1927e53d9628d4f3f5e55eae… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 26 22:07:15 2024 -0300 tests: Add simple test for implicit cast to int. --- tests/hlsl/cast-to-int.shader_test | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/hlsl/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test index 385e3375..4605edb8 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -1,3 +1,19 @@ +[pixel shader todo(sm<4)] +uniform float3 f; + +float4 main() : sv_target +{ + int3 r = f; + + return float4(r, 0); +} + +[test] +uniform 0 float4 10.3 11.5 12.8 13.1 +todo(sm<4) draw quad +probe all rgba (10, 11, 12, 0) + + [pixel shader todo(sm<4)] uniform float f; uniform uint u;

1 0

Francisco Casas : vkd3d-shader/hlsl: Lower casts to int for SM1.
by Alexandre Julliard 15 Feb '24

15 Feb '24

Module: vkd3d Branch: master Commit: e3ed5ac77e462d38d42878ef22cbf17c1d485c34 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e3ed5ac77e462d38d42878ef22cbf… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Oct 20 23:23:46 2023 -0300 vkd3d-shader/hlsl: Lower casts to int for SM1. --- libs/vkd3d-shader/d3dbc.c | 18 +++++++++--------- libs/vkd3d-shader/hlsl_codegen.c | 34 ++++++++++++++++++++++++++++++++++ tests/hlsl/cast-to-int.shader_test | 4 ++-- tests/hlsl/ceil.shader_test | 8 ++++---- tests/hlsl/floor.shader_test | 8 ++++---- tests/hlsl/round.shader_test | 8 ++++---- tests/hlsl/saturate.shader_test | 4 ++-- 7 files changed, 59 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index 27aec124..27f5c810 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -2000,16 +2000,14 @@ static void write_sm1_cast(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b case HLSL_TYPE_UINT: switch(src_type->base_type) { + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + /* A compilation pass applies a FLOOR operation to casts to int, so no change is necessary. */ case HLSL_TYPE_INT: case HLSL_TYPE_UINT: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, 0, 0); break; - case HLSL_TYPE_HALF: - case HLSL_TYPE_FLOAT: - hlsl_fixme(ctx, &instr->loc, "SM1 cast from float to integer."); - break; - case HLSL_TYPE_BOOL: hlsl_fixme(ctx, &instr->loc, "SM1 cast from bool to integer."); break; @@ -2244,6 +2242,12 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b assert(instr->reg.allocated); + if (expr->op == HLSL_OP1_CAST) + { + write_sm1_cast(ctx, buffer, instr); + return; + } + if (instr->data_type->base_type != HLSL_TYPE_FLOAT) { /* These need to be lowered. */ @@ -2257,10 +2261,6 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b write_sm1_unary_op(ctx, buffer, D3DSIO_ABS, &instr->reg, &arg1->reg, 0, 0); break; - case HLSL_OP1_CAST: - write_sm1_cast(ctx, buffer, instr); - break; - case HLSL_OP1_DSX: write_sm1_unary_op(ctx, buffer, D3DSIO_DSX, &instr->reg, &arg1->reg, 0, 0); break; diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 6ad60e4c..4121fadf 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -2647,6 +2647,39 @@ static bool sort_synthetic_separated_samplers_first(struct hlsl_ctx *ctx) return false; } +/* Append a FLOOR before a CAST to int or uint (which is written as a mere MOV). */ +static bool lower_casts_to_int(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) +{ + struct hlsl_ir_node *arg, *floor, *cast2; + struct hlsl_ir_expr *expr; + + if (instr->type != HLSL_IR_EXPR) + return false; + expr = hlsl_ir_expr(instr); + if (expr->op != HLSL_OP1_CAST) + return false; + + arg = expr->operands[0].node; + if (instr->data_type->base_type != HLSL_TYPE_INT && instr->data_type->base_type != HLSL_TYPE_UINT) + return false; + if (arg->data_type->base_type != HLSL_TYPE_FLOAT && arg->data_type->base_type != HLSL_TYPE_HALF) + return false; + + /* Check that the argument is not already a FLOOR */ + if (arg->type == HLSL_IR_EXPR && hlsl_ir_expr(arg)->op == HLSL_OP1_FLOOR) + return false; + + if (!(floor = hlsl_new_unary_expr(ctx, HLSL_OP1_FLOOR, arg, &instr->loc))) + return false; + hlsl_block_add_instr(block, floor); + + if (!(cast2 = hlsl_new_cast(ctx, floor, instr->data_type, &instr->loc))) + return false; + hlsl_block_add_instr(block, cast2); + + return true; +} + /* Lower DIV to RCP + MUL. */ static bool lower_division(struct hlsl_ctx *ctx, struct hlsl_ir_node *instr, struct hlsl_block *block) { @@ -5060,6 +5093,7 @@ int hlsl_emit_bytecode(struct hlsl_ctx *ctx, struct hlsl_ir_function_decl *entry lower_ir(ctx, lower_ternary, body); if (profile->major_version < 4) { + lower_ir(ctx, lower_casts_to_int, body); lower_ir(ctx, lower_division, body); lower_ir(ctx, lower_sqrt, body); lower_ir(ctx, lower_dot, body); diff --git a/tests/hlsl/cast-to-int.shader_test b/tests/hlsl/cast-to-int.shader_test index 4605edb8..f35bb560 100644 --- a/tests/hlsl/cast-to-int.shader_test +++ b/tests/hlsl/cast-to-int.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo(sm<4)] +[pixel shader] uniform float3 f; float4 main() : sv_target @@ -10,7 +10,7 @@ float4 main() : sv_target [test] uniform 0 float4 10.3 11.5 12.8 13.1 -todo(sm<4) draw quad +draw quad probe all rgba (10, 11, 12, 0) diff --git a/tests/hlsl/ceil.shader_test b/tests/hlsl/ceil.shader_test index aa4bdf29..91bfe199 100644 --- a/tests/hlsl/ceil.shader_test +++ b/tests/hlsl/ceil.shader_test @@ -21,7 +21,7 @@ uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (0.0, 7.0, 8.0, 4.0) 4 -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -34,10 +34,10 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -todo(sm<4) draw quad +draw quad probe all rgba (7.0, 8.0, 0.0, 4.0) 4 -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 u; float4 main() : sv_target @@ -51,5 +51,5 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 -todo(sm<4) draw quad +draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4 diff --git a/tests/hlsl/floor.shader_test b/tests/hlsl/floor.shader_test index ed1ab768..b3552515 100644 --- a/tests/hlsl/floor.shader_test +++ b/tests/hlsl/floor.shader_test @@ -21,7 +21,7 @@ uniform 0 float4 -0.5 6.5 7.5 3.4 draw quad probe all rgba (-1.0, 6.0, 7.0, 3.0) 4 -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -34,11 +34,11 @@ float4 main() : sv_target [test] uniform 0 float4 -0.5 6.5 7.5 3.4 -todo(sm<4) draw quad +draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4 -[pixel shader todo(sm<4)] +[pixel shader] uniform int4 u; float4 main() : sv_target @@ -52,5 +52,5 @@ float4 main() : sv_target [test] if(sm<4) uniform 0 float4 -1 6 7 3 if(sm>=4) uniform 0 int4 -1 6 7 3 -todo(sm<4) draw quad +draw quad probe all rgba (6.0, 7.0, -1.0, 3.0) 4 diff --git a/tests/hlsl/round.shader_test b/tests/hlsl/round.shader_test index 7b4c68cb..b9234b01 100644 --- a/tests/hlsl/round.shader_test +++ b/tests/hlsl/round.shader_test @@ -13,7 +13,7 @@ probe all rgba (0.0, -7.0, 8.0, 3.0) 4 -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -26,12 +26,12 @@ float4 main() : sv_target [test] uniform 0 float4 -0.4 -6.6 7.6 3.4 -todo(sm<4) draw quad +draw quad probe all rgba (-7.0, 8.0, 0.0, 3.0) 4 -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -42,5 +42,5 @@ float4 main() : sv_target [test] uniform 0 float4 -1 0 2 10 -todo(sm<4) draw quad +draw quad probe all rgba (-1.0, 0.0, 2.0, 10.0) 4 diff --git a/tests/hlsl/saturate.shader_test b/tests/hlsl/saturate.shader_test index 6852015b..2ed83cf6 100644 --- a/tests/hlsl/saturate.shader_test +++ b/tests/hlsl/saturate.shader_test @@ -11,7 +11,7 @@ uniform 0 float4 0.7 -0.1 0.0 0.0 todo(sm>=6) draw quad probe all rgba (0.7, 0.0, 1.0, 0.0) -[pixel shader todo(sm<4)] +[pixel shader] uniform float4 u; float4 main() : sv_target @@ -22,5 +22,5 @@ float4 main() : sv_target [test] uniform 0 float4 -2 0 2 -1 -todo(sm<4 | sm>=6) draw quad +todo(sm>=6) draw quad probe all rgba (0.0, 0.0, 1.0, 0.0)

1 0