February 2024 - Wine-commits

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

26 Feb '24

Module: wine Branch: master Commit: 03e3bd947fef8f0eed7eb8c674b3d2ae917db8ea URL: https://gitlab.winehq.org/wine/wine/-/commit/03e3bd947fef8f0eed7eb8c674b3d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:24:33 2024 -0600 wmwcore: Force debug info in critical sections. --- dlls/wmvcore/async_reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wmvcore/async_reader.c b/dlls/wmvcore/async_reader.c index 3a8556a5f0a..ef657d561ba 100644 --- a/dlls/wmvcore/async_reader.c +++ b/dlls/wmvcore/async_reader.c @@ -1924,9 +1924,9 @@ static HRESULT WINAPI async_reader_create(IWMReader **reader) goto failed; IWMReader_Release(&object->IWMReader_iface); - InitializeCriticalSection(&object->cs); + InitializeCriticalSectionEx(&object->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.cs"); - InitializeCriticalSection(&object->callback_cs); + InitializeCriticalSectionEx(&object->callback_cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); object->callback_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": async_reader.callback_cs"); QueryPerformanceFrequency(&object->clock_frequency);

1 0

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

26 Feb '24

Module: wine Branch: master Commit: f4a3f573c279213b710f9eef6bd391a5cb193568 URL: https://gitlab.winehq.org/wine/wine/-/commit/f4a3f573c279213b710f9eef6bd391… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:26:15 2024 -0600 browseui: Force debug info in critical sections. --- dlls/browseui/compcatcachedaemon.c | 2 +- dlls/browseui/progressdlg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index f7a5e4b449f..6ea983626a4 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -149,7 +149,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; This->refCount = 1; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": CompCatCacheDaemon.cs"); TRACE("returning %p\n", This); diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 9834a4089f2..da73dbb4740 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -626,7 +626,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; This->IOleWindow_iface.lpVtbl = &OleWindowVtbl; This->refCount = 1; - InitializeCriticalSection(&This->cs); + InitializeCriticalSectionEx(&This->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); This->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ProgressDialog.cs"); TRACE("returning %p\n", This);

1 0

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

26 Feb '24

Module: wine Branch: master Commit: 131918e4c29237f8750168432a6653d272179f1f URL: https://gitlab.winehq.org/wine/wine/-/commit/131918e4c29237f8750168432a6653… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:27:28 2024 -0600 itss: Force debug info in critical sections. --- dlls/itss/chm_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index f2665cae529..894bfc07a49 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -686,11 +686,11 @@ struct chmFile *chm_openW(const WCHAR *filename) } /* initialize mutexes, if needed */ - InitializeCriticalSection(&newHandle->mutex); + InitializeCriticalSectionEx(&newHandle->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex"); - InitializeCriticalSection(&newHandle->lzx_mutex); + InitializeCriticalSectionEx(&newHandle->lzx_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex"); - InitializeCriticalSection(&newHandle->cache_mutex); + InitializeCriticalSectionEx(&newHandle->cache_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex"); /* read and verify header */ @@ -817,11 +817,11 @@ struct chmFile *chm_dup(struct chmFile *oldHandle) newHandle->cache_num_blocks = 0; /* initialize mutexes, if needed */ - InitializeCriticalSection(&newHandle->mutex); + InitializeCriticalSectionEx(&newHandle->mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.mutex"); - InitializeCriticalSection(&newHandle->lzx_mutex); + InitializeCriticalSectionEx(&newHandle->lzx_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->lzx_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.lzx_mutex"); - InitializeCriticalSection(&newHandle->cache_mutex); + InitializeCriticalSectionEx(&newHandle->cache_mutex, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); newHandle->cache_mutex.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": chmFile.cache_mutex"); /* initialize cache */

1 0

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

26 Feb '24

Module: wine Branch: master Commit: b9a2ff25587bb7a7c9db9467a96dc2a18feab4ab URL: https://gitlab.winehq.org/wine/wine/-/commit/b9a2ff25587bb7a7c9db9467a96dc2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 26 09:29:48 2024 -0600 mmdevapi: Force debug info in critical sections. --- dlls/mmdevapi/devenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 246625286b8..3c2085339ed 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -344,7 +344,7 @@ static MMDevice *MMDevice_Create(const WCHAR *name, GUID *id, EDataFlow flow, DW cur->IMMDevice_iface.lpVtbl = &MMDeviceVtbl; cur->IMMEndpoint_iface.lpVtbl = &MMEndpointVtbl; - InitializeCriticalSection(&cur->crst); + InitializeCriticalSectionEx(&cur->crst, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); cur->crst.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MMDevice.crst"); list_add_tail(&device_list, &cur->entry);

1 0

Vijay Kiran Kamuju : taskschd: Implement ITaskService_get_ConnectedUser.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 6ec977aa004409e17e1df5a2fdee850044ddf1ca URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec977aa004409e17e1df5a2fdee85… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Feb 25 22:25:00 2024 +0100 taskschd: Implement ITaskService_get_ConnectedUser. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48110 --- dlls/taskschd/task.c | 22 ++++++++++++++++++++-- dlls/taskschd/tests/scheduler.c | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index d9ddf9d12b8..26cfeb950b0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3687,6 +3687,7 @@ typedef struct BOOL connected; DWORD version; WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR user_name[256]; } TaskService; static inline TaskService *impl_from_ITaskService(ITaskService *iface) @@ -3858,6 +3859,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V static WCHAR ncalrpc[] = L"ncalrpc"; TaskService *task_svc = impl_from_ITaskService(iface); WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR user_name[256]; DWORD len; HRESULT hr; RPC_WSTR binding_str; @@ -3873,6 +3875,10 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (!GetComputerNameW(comp_name, &len)) return HRESULT_FROM_WIN32(GetLastError()); + len = ARRAY_SIZE(user_name); + if (!GetUserNameW(user_name, &len)) + return HRESULT_FROM_WIN32(GetLastError()); + if (!is_variant_null(&server)) { const WCHAR *server_name; @@ -3911,6 +3917,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V TRACE("server version %#lx\n", task_svc->version); lstrcpyW(task_svc->comp_name, comp_name); + lstrcpyW(task_svc->user_name, user_name); task_svc->connected = TRUE; return S_OK; @@ -3948,8 +3955,19 @@ static HRESULT WINAPI TaskService_get_TargetServer(ITaskService *iface, BSTR *se static HRESULT WINAPI TaskService_get_ConnectedUser(ITaskService *iface, BSTR *user) { - FIXME("%p,%p: stub\n", iface, user); - return E_NOTIMPL; + TaskService *task_svc = impl_from_ITaskService(iface); + + TRACE("%p,%p\n", iface, user); + + if (!user) return E_POINTER; + + if (!task_svc->connected) + return HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED); + + *user = SysAllocString(task_svc->user_name); + if (!*user) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI TaskService_get_ConnectedDomain(ITaskService *iface, BSTR *domain) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index bf6e13be98b..2829ba98ff2 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -64,6 +64,7 @@ static BOOL check_win_version(int min_major, int min_minor) static void test_Connect(void) { WCHAR comp_name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR user_name[256]; DWORD len; HRESULT hr; BSTR bstr; @@ -93,6 +94,12 @@ static void test_Connect(void) hr = ITaskService_get_TargetServer(service, &bstr); ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + hr = ITaskService_get_ConnectedUser(service, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#lx\n", hr); + + hr = ITaskService_get_ConnectedUser(service, &bstr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ONLY_IF_CONNECTED), "expected ERROR_ONLY_IF_CONNECTED, got %#lx\n", hr); + /* Win7 doesn't support UNC \\ prefix, but according to a user * comment on MSDN Win8 supports both ways. */ @@ -144,6 +151,14 @@ static void test_Connect(void) ok(!lstrcmpW(comp_name, bstr), "compname %s != server name %s\n", wine_dbgstr_w(comp_name), wine_dbgstr_w(bstr)); SysFreeString(bstr); + len = ARRAY_SIZE(user_name); + GetUserNameW(user_name, &len); + + hr = ITaskService_get_ConnectedUser(service, &bstr); + ok(hr == S_OK, "get_ConnectedUser error %#lx\n", hr); + ok(!lstrcmpW(user_name, bstr), "username %s != user name %s\n", wine_dbgstr_w(user_name), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + ITaskService_Release(service); }

1 0

Vijay Kiran Kamuju : taskschd: Return success from Principal_put_RunLevel.
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 3db38ea7f4856b2856f1fd5c5f9d7272ff8d0063 URL: https://gitlab.winehq.org/wine/wine/-/commit/3db38ea7f4856b2856f1fd5c5f9d72… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Fri Feb 23 21:30:29 2024 +0100 taskschd: Return success from Principal_put_RunLevel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49877 --- dlls/taskschd/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 26cfeb950b0..99a2ccdf992 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1620,7 +1620,7 @@ static HRESULT WINAPI Principal_get_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TY static HRESULT WINAPI Principal_put_RunLevel(IPrincipal *iface, TASK_RUNLEVEL_TYPE run_level) { FIXME("%p,%u: stub\n", iface, run_level); - return E_NOTIMPL; + return S_OK; } static const IPrincipalVtbl Principal_vtbl =

1 0

Zebediah Figura : wined3d/atifs: Move TEXTUREFACTOR constant loading to arbfp_apply_draw_state().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 3153441f14bf3b6deb551b45b8c51cdf56de8e24 URL: https://gitlab.winehq.org/wine/wine/-/commit/3153441f14bf3b6deb551b45b8c51c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 15:53:33 2023 -0600 wined3d/atifs: Move TEXTUREFACTOR constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1404db853b2..7be14f11b29 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -948,13 +948,16 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[WINED3D_MAX_FFP_TE static void atifs_tfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - struct atifs_context_private_data *ctx_priv = context->fragment_pipe_data; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; +} + +static void atifs_update_ps_constants(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) +{ + struct atifs_context_private_data *ctx_priv = context_gl->c.fragment_pipe_data; const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_color color; - if (!ctx_priv->last_shader - || ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] != ATIFS_CONSTANT_TFACTOR) + if (ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] != ATIFS_CONSTANT_TFACTOR) return; wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); @@ -1076,7 +1079,7 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined break; case ATIFS_CONSTANT_TFACTOR: - atifs_tfactor(context, state, STATE_RENDER(WINED3D_RS_TEXTUREFACTOR)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; break; case ATIFS_CONSTANT_STAGE: @@ -1253,18 +1256,24 @@ static const struct wined3d_state_entry_template atifs_fragmentstate_template[] /* Context activation is done by the caller. */ static void atifs_apply_draw_state(struct wined3d_context *context, const struct wined3d_state *state) { - const struct wined3d_gl_info *gl_info = wined3d_context_gl_const(context)->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + uint32_t constant_update_mask; - if (!use_ps(state)) - { - gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_SHADER_ATI); - checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); - } - else + if (use_ps(state)) { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_SHADER_ATI); checkGLcall("glDisable(GL_FRAGMENT_SHADER_ATI)"); + return; } + + gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_SHADER_ATI); + checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + + constant_update_mask = context->constant_update_mask; + + if (constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) + atifs_update_ps_constants(context_gl, state); } static void atifs_disable(const struct wined3d_context *context)

1 0

Zebediah Figura : wined3d/atifs: Move texture constant loading to arbfp_apply_draw_state().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 0e0ee3e21b6b3620e7ac315d3af476dcf7d0304a URL: https://gitlab.winehq.org/wine/wine/-/commit/0e0ee3e21b6b3620e7ac315d3af476… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 15:56:17 2023 -0600 wined3d/atifs: Move texture constant loading to arbfp_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 39 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 7be14f11b29..ff9542867fc 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -957,12 +957,22 @@ static void atifs_update_ps_constants(struct wined3d_context_gl *context_gl, con const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_color color; - if (ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] != ATIFS_CONSTANT_TFACTOR) - return; + if (ctx_priv->last_shader->constants[ATIFS_CONST_TFACTOR - GL_CON_0_ATI] == ATIFS_CONSTANT_TFACTOR) + { + wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); + GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)); + checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)"); + } - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); - GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)); - checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_TFACTOR, &color.r)"); + for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + { + if (ctx_priv->last_shader->constants[i] == ATIFS_CONSTANT_STAGE) + { + wined3d_color_from_d3dcolor(&color, state->texture_states[i][WINED3D_TSS_CONSTANT]); + GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(i), &color.r)); + checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(i), &color.r)"); + } + } } static void set_bumpmat(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -997,19 +1007,7 @@ static void set_bumpmat(struct wined3d_context *context, const struct wined3d_st static void atifs_stage_constant(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - struct atifs_context_private_data *ctx_priv = context->fragment_pipe_data; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - struct wined3d_color color; - - if (!ctx_priv->last_shader - || ctx_priv->last_shader->constants[stage] != ATIFS_CONSTANT_STAGE) - return; - - wined3d_color_from_d3dcolor(&color, state->texture_states[stage][WINED3D_TSS_CONSTANT]); - GL_EXTCALL(glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(stage), &color.r)); - checkGLcall("glSetFragmentShaderConstantATI(ATIFS_CONST_STAGE(stage), &color.r)"); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } static void set_tex_op_atifs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) @@ -1079,11 +1077,8 @@ static void set_tex_op_atifs(struct wined3d_context *context, const struct wined break; case ATIFS_CONSTANT_TFACTOR: - context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; - break; - case ATIFS_CONSTANT_STAGE: - atifs_stage_constant(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_CONSTANT)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; break; default:

1 0

Zebediah Figura : wined3d/atifs: Move FFP bumpenv constant loading to atifs_apply_draw_state().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: 3d6c33f4506d2adc2ec76490f127ab1422016558 URL: https://gitlab.winehq.org/wine/wine/-/commit/3d6c33f4506d2adc2ec76490f127ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 16:02:36 2023 -0600 wined3d/atifs: Move FFP bumpenv constant loading to atifs_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 83 +++++++++++++------------------------- 1 file changed, 27 insertions(+), 56 deletions(-)

1 0

Zebediah Figura : wined3d/atifs: Move fragment program compilation from set_tex_op_atifs() to atifs_apply_draw_state().
by Alexandre Julliard 26 Feb '24

26 Feb '24

Module: wine Branch: master Commit: ef6e9a6bb450c667e35cafc7d24f0bb8b51985ef URL: https://gitlab.winehq.org/wine/wine/-/commit/ef6e9a6bb450c667e35cafc7d24f0b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Nov 11 22:30:44 2023 -0600 wined3d/atifs: Move fragment program compilation from set_tex_op_atifs() to atifs_apply_draw_state(). --- dlls/wined3d/ati_fragment_shader.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d08e1578a67..4bdd0102682 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1011,6 +1011,11 @@ static void atifs_stage_constant(struct wined3d_context *context, const struct w } static void set_tex_op_atifs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +{ + context->shader_update_mask |= (1u << WINED3D_SHADER_TYPE_PIXEL); +} + +static void atifs_update_shader(struct wined3d_context *context, const struct wined3d_state *state) { struct atifs_context_private_data *ctx_priv = context->fragment_pipe_data; const struct atifs_ffp_desc *desc, *last_shader = ctx_priv->last_shader; @@ -1233,6 +1238,10 @@ static void atifs_apply_draw_state(struct wined3d_context *context, const struct gl_info->gl_ops.gl.p_glEnable(GL_FRAGMENT_SHADER_ATI); checkGLcall("glEnable(GL_FRAGMENT_SHADER_ATI)"); + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) + atifs_update_shader(context, state); + + /* Note that atifs_update_shader() may set the constant update mask. */ constant_update_mask = context->constant_update_mask; if (constant_update_mask & WINED3D_SHADER_CONST_FFP_PS)

1 0