March 2024 - Wine-Commits - list.winehq.org

Nikolay Sivov : d3d10_1/tests: Add an effect compilation test using 10.1 features.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 5eb46419b44c8ce4362d06205fb33e7085685ff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eb46419b44c8ce4362d06205fb33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 15:25:23 2024 +0100 d3d10_1/tests: Add an effect compilation test using 10.1 features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10_1/tests/d3d10_1.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index ad7aaeb0dc4..e3cd3943594 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1053,6 +1053,30 @@ static void test_shader_profiles(void) ok(!strcmp(profile, "ps_4_0"), "Unexpected profile %s.\n", profile); } +static void test_compile_effect(void) +{ + char default_bs_source[] = "BlendState default_blend_state {};"; + char bs_source2[] = + "BlendState blend_state\n" + "{\n" + " srcblend[0] = zero;\n" + "};"; + ID3D10Blob *blob; + HRESULT hr; + + hr = D3D10CompileEffectFromMemory(default_bs_source, strlen(default_bs_source), + NULL, NULL, NULL, 0, 0, &blob, NULL); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Blob_Release(blob); + + /* Compilation fails due to 10.1 feature incompatibility with fx_4_0 profile. */ + hr = D3D10CompileEffectFromMemory(bs_source2, strlen(bs_source2), NULL, NULL, NULL, + 0, 0, &blob, NULL); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); +} + START_TEST(d3d10_1) { test_create_device(); @@ -1062,4 +1086,5 @@ START_TEST(d3d10_1) test_getdc(); test_fx_4_1_blend_state(); test_shader_profiles(); + test_compile_effect(); }

1 0

Zebediah Figura : wined3d/nvrc: Remove now redundant WINED3D_TSS_RESULT_ARG handlers.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 6fa14583785fb45fd0991cfabb23ab24a5aef3ac URL: https://gitlab.winehq.org/wine/wine/-/commit/6fa14583785fb45fd0991cfabb23ab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:39:02 2024 -0600 wined3d/nvrc: Remove now redundant WINED3D_TSS_RESULT_ARG handlers. nvrc_update_color_op() takes care of this. Redirect WINED3D_TSS_RESULT_ARG to nvrc_colorop() so that the shader is invalidated. --- dlls/wined3d/nvidia_texture_shader.c | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-)

1 0

Nikolay Sivov : d3d10_1/tests: Add a basic test for returned preferred profiles.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 0a9ad614e62107f882ec6172b026766f94a5f624 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a9ad614e62107f882ec6172b02676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 14:52:42 2024 +0100 d3d10_1/tests: Add a basic test for returned preferred profiles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10_1/tests/d3d10_1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 75b01c89903..ad7aaeb0dc4 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1039,6 +1039,20 @@ static void test_fx_4_1_blend_state(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +static void test_shader_profiles(void) +{ + const char *profile; + + profile = D3D10GetVertexShaderProfile(NULL); + ok(!strcmp(profile, "vs_4_0"), "Unexpected profile %s.\n", profile); + + profile = D3D10GetGeometryShaderProfile(NULL); + ok(!strcmp(profile, "gs_4_0"), "Unexpected profile %s.\n", profile); + + profile = D3D10GetPixelShaderProfile(NULL); + ok(!strcmp(profile, "ps_4_0"), "Unexpected profile %s.\n", profile); +} + START_TEST(d3d10_1) { test_create_device(); @@ -1047,4 +1061,5 @@ START_TEST(d3d10_1) test_create_blend_state(); test_getdc(); test_fx_4_1_blend_state(); + test_shader_profiles(); }

1 0

Daniel Lehman : ole32: Do not lock storage in read-only deny-write mode.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 2fc073591be28f4606a8818163c6bb4310e55096 URL: https://gitlab.winehq.org/wine/wine/-/commit/2fc073591be28f4606a8818163c6bb… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Mar 1 20:46:39 2024 -0800 ole32: Do not lock storage in read-only deny-write mode. --- dlls/ole32/storage32.c | 8 +++++--- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 1bf08e45701..78e6de22be8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5036,7 +5036,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) ULARGE_INTEGER offset; ULARGE_INTEGER cb; DWORD share_mode = STGM_SHARE_MODE(openFlags); - BOOL supported; + BOOL supported, ro_denyw; if (openFlags & STGM_NOSNAPSHOT) { @@ -5045,6 +5045,8 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) else if (share_mode != STGM_SHARE_EXCLUSIVE) share_mode = STGM_SHARE_DENY_WRITE; } + ro_denyw = (STGM_ACCESS_MODE(openFlags) == STGM_READ) && (share_mode == STGM_SHARE_DENY_WRITE); + /* Wrap all other locking inside a single lock so we can check ranges safely */ offset.QuadPart = RANGELOCK_CHECKLOCKS; cb.QuadPart = 1; @@ -5088,7 +5090,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) hr = StorageImpl_LockOne(This, RANGELOCK_PRIORITY2_FIRST, RANGELOCK_PRIORITY2_LAST); } - if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE)) + if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_WRITE) && !ro_denyw) hr = StorageImpl_LockOne(This, RANGELOCK_READ_FIRST, RANGELOCK_READ_LAST); if (SUCCEEDED(hr) && (STGM_ACCESS_MODE(openFlags) != STGM_READ)) @@ -5097,7 +5099,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_READ || share_mode == STGM_SHARE_EXCLUSIVE)) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_READ_FIRST, RANGELOCK_DENY_READ_LAST); - if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE)) + if (SUCCEEDED(hr) && (share_mode == STGM_SHARE_DENY_WRITE || share_mode == STGM_SHARE_EXCLUSIVE) && !ro_denyw) hr = StorageImpl_LockOne(This, RANGELOCK_DENY_WRITE_FIRST, RANGELOCK_DENY_WRITE_LAST); if (SUCCEEDED(hr) && (openFlags & STGM_NOSNAPSHOT) == STGM_NOSNAPSHOT) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 97809db539c..9728c1c9db8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -3394,7 +3394,7 @@ static const struct lock_test lock_tests[] = { { STGM_READWRITE|STGM_TRANSACTED, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, rw_locked_bytes, rw_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED|STGM_NOSNAPSHOT, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, nosn_locked_bytes, rwdw_fail_ranges, FALSE }, { STGM_READWRITE|STGM_TRANSACTED|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ|GENERIC_WRITE, FILE_SHARE_READ, rwdw_locked_bytes, rwdw_fail_ranges, FALSE }, - { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, TRUE }, + { STGM_READ|STGM_SHARE_DENY_WRITE, FALSE, GENERIC_READ, FILE_SHARE_READ, no_locked_bytes, dw_fail_ranges, FALSE }, { STGM_READ|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, tr_locked_bytes, tr_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE }, { STGM_READ|STGM_SHARE_EXCLUSIVE|STGM_TRANSACTED, FALSE, GENERIC_READ, FILE_SHARE_READ, roex_locked_bytes, roex_fail_ranges, FALSE },

1 0

Henri Verbeet : wined3d: Slightly adjust an ERR in shader_spirv_compile_shader().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 37bb8c14e010c4141a86101fe7bf9380d29090c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/37bb8c14e010c4141a86101fe7bf93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 16:51:41 2024 +0100 wined3d: Slightly adjust an ERR in shader_spirv_compile_shader(). We're not necessarily compiling DXBC shaders here after commit 1474f5cc47d9f056382f04ea5dff3314c6d181b8. --- dlls/wined3d/shader_spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index acdf47b504e..3919368ac45 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -325,7 +325,7 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con if (ret < 0) { - ERR("Failed to compile DXBC, ret %d.\n", ret); + ERR("Failed to compile shader, ret %d.\n", ret); return VK_NULL_HANDLE; }

1 0

Zebediah Figura : wined3d/nvrc: Move alpha op application to nvrc_apply_draw_state().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: c3840b6c497988f5594ab040188604450fe462d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3840b6c497988f5594ab040188604… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:37:51 2024 -0600 wined3d/nvrc: Move alpha op application to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 66 +++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 32 deletions(-)

1 0

Daniel Lehman : ole32/tests: Remove todo from lock tests.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 91e5d21cdf47edaada0a6bbb170d03c167add287 URL: https://gitlab.winehq.org/wine/wine/-/commit/91e5d21cdf47edaada0a6bbb170d03… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Fri Mar 1 20:46:39 2024 -0800 ole32/tests: Remove todo from lock tests. --- dlls/ole32/tests/storage32.c | 115 +++++++++++++------------------------------ 1 file changed, 33 insertions(+), 82 deletions(-)

1 0

Zebediah Figura : wined3d/nvrc: Remove now redundant STATE_SAMPLER handlers.
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 115d690731916b8d54021fb02121290cea12e995 URL: https://gitlab.winehq.org/wine/wine/-/commit/115d690731916b8d54021fb0212129… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:31:41 2024 -0600 wined3d/nvrc: Remove now redundant STATE_SAMPLER handlers. nvrc_update_color_op() takes care of this. Redirect STATE_SAMPLER to nvrc_colorop() so that the shader is invalidated. --- dlls/wined3d/nvidia_texture_shader.c | 46 +++++++----------------------------- 1 file changed, 8 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index a15b1419d43..3f001a1c436 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -593,28 +593,6 @@ static void nvrc_resultarg(struct wined3d_context *context, const struct wined3d } } -static void nvts_texdim(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - unsigned int sampler, mapped_stage; - - sampler = state_id - STATE_SAMPLER(0); - mapped_stage = context_gl->tex_unit_map[sampler]; - - /* No need to enable / disable anything here for unused samplers. The tex_colorop - * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop - * will take care of this business. */ - if (mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= context_gl->gl_info->limits.ffp_textures) - return; - if (sampler >= context->lowest_disabled_stage) - return; - if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP))) - return; - - wined3d_context_gl_active_texture(context_gl, context_gl->gl_info, sampler); - nvts_activate_dimensions(state, sampler, context_gl); -} - static void nvrc_update_bumpenv_constants(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; @@ -893,22 +871,14 @@ static const struct wined3d_state_entry_template nvrc_fragmentstate_template[] = { STATE_RENDER(WINED3D_RS_FOGSTART), { STATE_RENDER(WINED3D_RS_FOGSTART), state_fogstartend }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_FOGEND), { STATE_RENDER(WINED3D_RS_FOGSTART), NULL }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3D_RS_SHADEMODE), { STATE_RENDER(WINED3D_RS_SHADEMODE), state_shademode }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(0), { STATE_SAMPLER(0), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(1), { STATE_SAMPLER(1), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(2), { STATE_SAMPLER(2), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(3), { STATE_SAMPLER(3), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(4), { STATE_SAMPLER(4), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(5), { STATE_SAMPLER(5), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(6), { STATE_SAMPLER(6), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler_texdim }, WINED3D_GL_EXT_NONE }, - { STATE_SAMPLER(7), { STATE_SAMPLER(7), nvts_texdim }, NV_TEXTURE_SHADER2 }, - { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler_texdim }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(0), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(1), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(2), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(3), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(4), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(5), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(6), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, + { STATE_SAMPLER(7), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0

Zebediah Figura : wined3d/nvrc: Move color ops from nvrc_colorop() to nvrc_apply_draw_state().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 1c03b29f7ba0bf07fe6ff60714302eff56eb92a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c03b29f7ba0bf07fe6ff60714302e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 21 19:27:54 2024 -0600 wined3d/nvrc: Move color ops from nvrc_colorop() to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 43 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index a290ee70c42..a15b1419d43 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -481,17 +481,18 @@ void set_tex_op_nvrc(const struct wined3d_gl_info *gl_info, const struct wined3d static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - unsigned int stage = (state_id - STATE_TEXTURESTAGE(0, 0)) / (WINED3D_HIGHEST_TEXTURE_STATE + 1); - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - BOOL tex_used = context->fixed_function_usage_map & (1u << stage); + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; +} + +static void nvrc_update_color_op(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state, unsigned int stage) +{ + BOOL tex_used = context_gl->c.fixed_function_usage_map & (1u << stage); const struct wined3d_gl_info *gl_info = context_gl->gl_info; unsigned int mapped_stage = context_gl->tex_unit_map[stage]; TRACE("Setting color op for stage %u.\n", stage); - /* Using a pixel shader? Don't care for anything here, the shader applying does it */ - if (use_ps(state)) return; - if (stage != mapped_stage) WARN("Using non 1:1 mapping: %d -> %d!\n", stage, mapped_stage); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -504,16 +505,16 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage); } - if (context->lowest_disabled_stage > 0) + if (context_gl->c.lowest_disabled_stage > 0) { gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); - GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, context->lowest_disabled_stage)); + GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, context_gl->c.lowest_disabled_stage)); } else { gl_info->gl_ops.gl.p_glDisable(GL_REGISTER_COMBINERS_NV); } - if (stage >= context->lowest_disabled_stage) + if (stage >= context_gl->c.lowest_disabled_stage) { TRACE("Stage disabled\n"); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -542,18 +543,12 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s return; } - /* The sampler will also activate the correct texture dimensions, so no need to do it here - * if the sampler for this stage is dirty - */ - if (!isStateDirty(context, STATE_SAMPLER(stage))) + if (tex_used) { - if (tex_used) - { - if (gl_info->supported[NV_TEXTURE_SHADER2]) - nvts_activate_dimensions(state, stage, context_gl); - else - texture_activate_dimensions(wined3d_state_get_ffp_texture(state, stage), gl_info); - } + if (gl_info->supported[NV_TEXTURE_SHADER2]) + nvts_activate_dimensions(state, stage, context_gl); + else + texture_activate_dimensions(wined3d_state_get_ffp_texture(state, stage), gl_info); } /* Set the texture combiners */ @@ -572,7 +567,7 @@ static void nvrc_colorop(struct wined3d_context *context, const struct wined3d_s { BOOL usesBump = (state->texture_states[stage][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP_LUMINANCE || state->texture_states[stage][WINED3D_TSS_COLOR_OP] == WINED3D_TOP_BUMPENVMAP); - BOOL usedBump = !!(context->texShaderBumpMap & 1u << (stage + 1)); + BOOL usedBump = !!(context_gl->c.texShaderBumpMap & 1u << (stage + 1)); if (usesBump != usedBump) { wined3d_context_gl_active_texture(context_gl, gl_info, mapped_stage + 1); @@ -673,6 +668,12 @@ static void nvrc_apply_draw_state(struct wined3d_context *context, const struct gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) + { + for (unsigned int i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) + nvrc_update_color_op(context_gl, state, i); + } + if (context->constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) { wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]);

1 0

Zebediah Figura : wined3d/nvrc: Move TEXTUREFACTOR constant loading to nvrc_apply_draw_state().
by Alexandre Julliard March 5, 2024

March 5, 2024

Module: wine Branch: master Commit: 8f2586cfb5764d0923817ce60176aaa4396a494c URL: https://gitlab.winehq.org/wine/wine/-/commit/8f2586cfb5764d0923817ce60176aa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Nov 12 16:07:11 2023 -0600 wined3d/nvrc: Move TEXTUREFACTOR constant loading to nvrc_apply_draw_state(). --- dlls/wined3d/nvidia_texture_shader.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 0575e72ef43..b7418c9e70d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -651,28 +651,29 @@ static void nvts_bumpenvmat(struct wined3d_context *context, const struct wined3 static void nvrc_texfactor(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - 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; - - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); - GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &color.r)); + context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } /* Context activation is done by the caller. */ static void nvrc_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_color color; - if (!use_ps(state)) - { - gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); - checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); - } - else + if (use_ps(state)) { gl_info->gl_ops.gl.p_glDisable(GL_REGISTER_COMBINERS_NV); checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); + return; + } + + gl_info->gl_ops.gl.p_glEnable(GL_REGISTER_COMBINERS_NV); + checkGLcall("glEnable(GL_REGISTER_COMBINERS_NV)"); + + if (context->constant_update_mask & WINED3D_SHADER_CONST_FFP_PS) + { + wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); + GL_EXTCALL(glCombinerParameterfvNV(GL_CONSTANT_COLOR0_NV, &color.r)); } }

1 0