wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Giovanni Mascellani : d3d11/tests: Do not check pitches.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 7aad5481556b2362a92ced690d491e6da9514b08 URL: https://gitlab.winehq.org/wine/wine/-/commit/7aad5481556b2362a92ced690d491e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 11 12:41:54 2024 +0200 d3d11/tests: Do not check pitches. Implementations might use different values. For example, AMD GPUs seem to use 768 here. --- dlls/d3d11/tests/d3d11.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 43b8f1494e8..46bdff09bca 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1169,11 +1169,6 @@ static void check_readback_data_u8_with_buffer_(unsigned int line, struct resour unsigned int x = 0, y = 0, z = 0; BOOL all_match = FALSE; - ok_(__FILE__, line)(rb->map_desc.RowPitch == depth_pitch, "Got row pitch %u instead of %u.\n", - rb->map_desc.RowPitch, depth_pitch); - ok_(__FILE__, line)(rb->map_desc.DepthPitch == slice_pitch, "Got depth pitch %u instead of %u.\n", - rb->map_desc.DepthPitch, depth_pitch); - for (z = 0; z < rb->depth; ++z) { for (y = 0; y < rb->height; ++y) @@ -36319,7 +36314,6 @@ static void test_nv12(void) for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx) { /* I need only two uints in the cbuffer, but the size must be a multiple of 16. */ - uint32_t cbuffer_data[4], expected_row_pitch, expected_depth_pitch; D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc = {0}; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc = {0}; D3D11_SUBRESOURCE_DATA subresource_data = {0}; @@ -36330,6 +36324,7 @@ static void test_nv12(void) ID3D11ShaderResourceView *srvs[2]; D3D11_TEXTURE2D_DESC desc = {0}; struct resource_readback rb; + uint32_t cbuffer_data[4]; ID3D11Buffer *cbuffer; HRESULT expected_hr; unsigned int i, j; @@ -36340,9 +36335,6 @@ static void test_nv12(void) winetest_push_context("test %u (%ux%u)", test_idx, width, height); - expected_row_pitch = (width + 3) & ~3; - expected_depth_pitch = expected_row_pitch * height * 3 / 2; - desc.Width = width; desc.Height = height; desc.MipLevels = 1; @@ -36352,14 +36344,14 @@ static void test_nv12(void) desc.Usage = D3D11_USAGE_DEFAULT; desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; - content = calloc(expected_depth_pitch, 1); + content = calloc(width * height * 3 / 2, 1); ok(!!content, "Failed to allocate memory.\n"); for (i = 0; i < height; ++i) { for (j = 0; j < width; ++j) { - unsigned int idx = i * expected_row_pitch + j; + unsigned int idx = i * width + j; content[idx] = (i & 7) << 3 | (j & 7); } @@ -36369,7 +36361,7 @@ static void test_nv12(void) { for (j = 0; j < width / 2; ++j) { - unsigned int idx = expected_row_pitch * (height + i) + j * 2; + unsigned int idx = width * (height + i) + j * 2; content[idx] = 1 << 6 | (i & 7) << 3 | (j & 7); content[idx + 1] = 1 << 7 | (i & 7) << 3 | (j & 7); @@ -36377,8 +36369,8 @@ static void test_nv12(void) } subresource_data.pSysMem = content; - subresource_data.SysMemPitch = expected_row_pitch; - subresource_data.SysMemSlicePitch = expected_depth_pitch; + subresource_data.SysMemPitch = width; + subresource_data.SysMemSlicePitch = 0; expected_hr = (width & 1 || height & 1) ? E_INVALIDARG : S_OK; hr = ID3D11Device_CreateTexture2D(device, &desc, &subresource_data, &texture); @@ -36432,7 +36424,7 @@ static void test_nv12(void) ID3D11DeviceContext_Dispatch(device_context, width, height, 1); get_texture_readback(check_texture, 0, &rb); - check_readback_data_u8_with_buffer(&rb, content, expected_row_pitch, expected_depth_pitch); + check_readback_data_u8_with_buffer(&rb, content, width, 0); release_resource_readback(&rb); rtv_desc.Format = DXGI_FORMAT_R8_UINT; @@ -36469,7 +36461,7 @@ static void test_nv12(void) ID3D11DeviceContext_Dispatch(device_context, width, height, 1); get_texture_readback(check_texture, 0, &rb); - check_readback_data_u8_with_buffer(&rb, content, expected_row_pitch, expected_depth_pitch); + check_readback_data_u8_with_buffer(&rb, content, width, 0); release_resource_readback(&rb); ID3D11RenderTargetView_Release(rtv2);

1 0

Giovanni Mascellani : d3d11/tests: Check for NV12 texture support before testing them.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 9ec8f02a4e1ef93f6c7c18437265a48f0f91b859 URL: https://gitlab.winehq.org/wine/wine/-/commit/9ec8f02a4e1ef93f6c7c18437265a4… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Jun 11 12:28:52 2024 +0200 d3d11/tests: Check for NV12 texture support before testing them. --- dlls/d3d11/tests/d3d11.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7053d32f0db..43b8f1494e8 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -36225,6 +36225,7 @@ static void test_nv12(void) unsigned int test_idx; ID3D10Blob *bytecode; ID3D11Device *device; + UINT support; HRESULT hr; static const uint32_t clear_values[4] = {0xabcdef00, 0xabcdef00, 0xabcdef00, 0xabcdef00}; @@ -36287,6 +36288,16 @@ static void test_nv12(void) device = test_context.device; device_context = test_context.immediate_context; + hr = ID3D11Device_CheckFormatSupport(device, DXGI_FORMAT_NV12, &support); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (!(support & D3D11_FORMAT_SUPPORT_TEXTURE2D)) + { + skip("NV12 textures are not supported.\n"); + release_test_context(&test_context); + return; + } + bytecode = compile_shader(cs_code, sizeof(cs_code) - 1, "cs_5_0"); hr = ID3D11Device_CreateComputeShader(device, ID3D10Blob_GetBufferPointer(bytecode), ID3D10Blob_GetBufferSize(bytecode), NULL, &cs);

1 0

Giovanni Mascellani : d3d11/tests: Check the result of compiling HLSL shaders.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: b81cc25b50943b3b720832d20064ff053e19f88b URL: https://gitlab.winehq.org/wine/wine/-/commit/b81cc25b50943b3b720832d20064ff… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jun 12 13:29:52 2024 +0200 d3d11/tests: Check the result of compiling HLSL shaders. --- dlls/d3d11/tests/d3d11.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c8112cb8442..7053d32f0db 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -36290,16 +36290,19 @@ static void test_nv12(void) bytecode = compile_shader(cs_code, sizeof(cs_code) - 1, "cs_5_0"); hr = ID3D11Device_CreateComputeShader(device, ID3D10Blob_GetBufferPointer(bytecode), ID3D10Blob_GetBufferSize(bytecode), NULL, &cs); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ID3D10Blob_Release(bytecode); bytecode = compile_shader(luma_ps_code, sizeof(luma_ps_code) - 1, "ps_4_0"); hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(bytecode), ID3D10Blob_GetBufferSize(bytecode), NULL, &luma_ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ID3D10Blob_Release(bytecode); bytecode = compile_shader(chroma_ps_code, sizeof(chroma_ps_code) - 1, "ps_4_0"); hr = ID3D11Device_CreatePixelShader(device, ID3D10Blob_GetBufferPointer(bytecode), ID3D10Blob_GetBufferSize(bytecode), NULL, &chroma_ps); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ID3D10Blob_Release(bytecode); for (test_idx = 0; test_idx < ARRAY_SIZE(tests); ++test_idx)

1 0

Elizabeth Figura : wined3d: Feed WINED3D_RS_TEXTUREFACTOR through a push constant buffer.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: e4f8fb3d003170c3c520367109a40eccff1a20ba URL: https://gitlab.winehq.org/wine/wine/-/commit/e4f8fb3d003170c3c520367109a40e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Nov 15 11:26:42 2023 -0600 wined3d: Feed WINED3D_RS_TEXTUREFACTOR through a push constant buffer. --- dlls/wined3d/ffp_gl.c | 3 +-- dlls/wined3d/glsl_shader.c | 7 +------ dlls/wined3d/shader_spirv.c | 1 - dlls/wined3d/stateblock.c | 22 ++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/ffp_gl.c b/dlls/wined3d/ffp_gl.c index b1a3c56a097..bab0f752df8 100644 --- a/dlls/wined3d/ffp_gl.c +++ b/dlls/wined3d/ffp_gl.c @@ -1678,8 +1678,7 @@ static void validate_state_table(struct wined3d_state_entry *state_table) { 30, 33}, { 39, 40}, { 42, 47}, - { 49, 59}, - { 61, 135}, + { 49, 135}, {138, 138}, {144, 144}, {149, 150}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3f7199de87d..41e6949b7af 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1894,16 +1894,12 @@ static void shader_glsl_load_constants(struct shader_glsl_priv *priv, if (update_mask & WINED3D_SHADER_CONST_FFP_PS) { const struct wined3d_ffp_ps_constants *constants; - struct wined3d_color color; constants = wined3d_buffer_load_sysmem( context_gl->c.device->push_constants[WINED3D_PUSH_CONSTANTS_PS_FFP], &context_gl->c); if (prog->ps.tex_factor_location != -1) - { - wined3d_color_from_d3dcolor(&color, state->render_states[WINED3D_RS_TEXTUREFACTOR]); - GL_EXTCALL(glUniform4fv(prog->ps.tex_factor_location, 1, &color.r)); - } + GL_EXTCALL(glUniform4fv(prog->ps.tex_factor_location, 1, &constants->texture_factor.r)); if (state->render_states[WINED3D_RS_SPECULARENABLE]) GL_EXTCALL(glUniform4f(prog->ps.specular_enable_location, 1.0f, 1.0f, 1.0f, 0.0f)); @@ -12355,7 +12351,6 @@ static const struct wined3d_state_entry_template glsl_fragment_pipe_state_templa { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_fragment_pipe_vs }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), glsl_fragment_pipe_invalidate_constants}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index 110fdfeff39..b4ef9f61f43 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1260,7 +1260,6 @@ static const struct wined3d_state_entry_template spirv_fragment_pipe_vk_fp_state {STATE_RENDER(WINED3D_RS_FOGEND), {STATE_RENDER(WINED3D_RS_FOGEND), state_nop}}, {STATE_RENDER(WINED3D_RS_FOGDENSITY), {STATE_RENDER(WINED3D_RS_FOGDENSITY), state_nop}}, {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), state_nop}}, - {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_nop}}, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), state_nop}}, {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), {STATE_RENDER(WINED3D_RS_POINTSPRITEENABLE), state_nop}}, {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), {STATE_RENDER(WINED3D_RS_SRGBWRITEENABLE), state_nop}}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 267da31ff19..28aa2a46f08 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1532,11 +1532,22 @@ void CDECL wined3d_stateblock_set_render_state(struct wined3d_stateblock *stateb stateblock->stateblock_state.rs[state] = value; stateblock->changed.renderState[state >> 5] |= 1u << (state & 0x1f); - if (state == WINED3D_RS_POINTSIZE - && (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE || value == WINED3D_ALPHA_TO_COVERAGE_DISABLE)) + switch (state) { - stateblock->changed.alpha_to_coverage = 1; - stateblock->stateblock_state.alpha_to_coverage = (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE); + case WINED3D_RS_POINTSIZE: + if (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE || value == WINED3D_ALPHA_TO_COVERAGE_DISABLE) + { + stateblock->changed.alpha_to_coverage = 1; + stateblock->stateblock_state.alpha_to_coverage = (value == WINED3D_ALPHA_TO_COVERAGE_ENABLE); + } + break; + + case WINED3D_RS_TEXTUREFACTOR: + stateblock->changed.ffp_ps_constants = 1; + break; + + default: + break; } } @@ -2805,6 +2816,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, break; case WINED3D_RS_ADAPTIVETESS_Y: + case WINED3D_RS_TEXTUREFACTOR: break; case WINED3D_RS_ANTIALIAS: @@ -3312,6 +3324,8 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, for (i = 0; i < WINED3D_MAX_FFP_TEXTURES; ++i) wined3d_color_from_d3dcolor(&constants.texture_constants[i], state->texture_states[i][WINED3D_TSS_CONSTANT]); + wined3d_color_from_d3dcolor(&constants.texture_factor, state->rs[WINED3D_RS_TEXTUREFACTOR]); + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_FFP, WINED3D_SHADER_CONST_FFP_PS, 0, sizeof(constants), &constants); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f0e1d3ed615..46cc0ec30ce 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2770,6 +2770,7 @@ BOOL wined3d_get_app_name(char *app_name, unsigned int app_name_size); struct wined3d_ffp_ps_constants { struct wined3d_color texture_constants[WINED3D_MAX_FFP_TEXTURES]; + struct wined3d_color texture_factor; }; enum wined3d_push_constants

1 0

Elizabeth Figura : wined3d: Feed WINED3D_TSS_CONSTANT through a push constant buffer.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: aeb68e5df4b340d75366bb19d5575a70a121e3cb URL: https://gitlab.winehq.org/wine/wine/-/commit/aeb68e5df4b340d75366bb19d5575a… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Nov 15 11:14:22 2023 -0600 wined3d: Feed WINED3D_TSS_CONSTANT through a push constant buffer. --- dlls/wined3d/cs.c | 13 +++++++------ dlls/wined3d/glsl_shader.c | 15 +++++---------- dlls/wined3d/stateblock.c | 36 +++++++++++++++++++++++++++++++++--- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++++ 4 files changed, 63 insertions(+), 19 deletions(-)

1 0

Elizabeth Figura : wined3d: Pass the constant update mask to wined3d_device_context_push_constants().
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: f0983f865f418055ead1b9cd9ac4d4a96b6c61f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f0983f865f418055ead1b9cd9ac4d4… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Wed Nov 15 10:31:56 2023 -0600 wined3d: Pass the constant update mask to wined3d_device_context_push_constants(). We will want to pass multiple constants in the same buffer (e.g. FFP_MODELVIEW, FFP_PROJ) covered by different update flags. --- dlls/wined3d/cs.c | 23 ++++++++++++----------- dlls/wined3d/stateblock.c | 18 ++++++++++++------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 958c23d76a7..3cf0cb6c5b1 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -414,6 +414,7 @@ struct wined3d_cs_push_constants enum wined3d_push_constants type; unsigned int start_idx; unsigned int count; + uint32_t update_mask; }; struct wined3d_cs_reset_state @@ -2140,18 +2141,17 @@ static const struct push_constant_info { size_t size; unsigned int max_count; - DWORD mask; enum wined3d_shader_type shader_type; enum vkd3d_shader_d3dbc_constant_register shader_binding; } wined3d_cs_push_constant_info[] = { - [WINED3D_PUSH_CONSTANTS_VS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_VS_CONSTS_F, WINED3D_SHADER_CONST_VS_F, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, - [WINED3D_PUSH_CONSTANTS_PS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_PS_CONSTS_F, WINED3D_SHADER_CONST_PS_F, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, - [WINED3D_PUSH_CONSTANTS_VS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_VS_I, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, - [WINED3D_PUSH_CONSTANTS_PS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_CONST_PS_I, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, - [WINED3D_PUSH_CONSTANTS_VS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_VS_B, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, - [WINED3D_PUSH_CONSTANTS_PS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_CONST_PS_B, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_VS_CONSTS_F, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_F] = {sizeof(struct wined3d_vec4), WINED3D_MAX_PS_CONSTS_F, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_FLOAT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_I] = {sizeof(struct wined3d_ivec4), WINED3D_MAX_CONSTS_I, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_INT_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_VS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_TYPE_VERTEX, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, + [WINED3D_PUSH_CONSTANTS_PS_B] = {sizeof(BOOL), WINED3D_MAX_CONSTS_B, WINED3D_SHADER_TYPE_PIXEL, VKD3D_SHADER_D3DBC_BOOL_CONSTANT_REGISTER}, }; static bool prepare_push_constant_buffer(struct wined3d_device_context *context, enum wined3d_push_constants type) @@ -2206,11 +2206,11 @@ static void wined3d_cs_exec_push_constants(struct wined3d_cs *cs, const void *da device->shader_backend->shader_update_float_pixel_constants(device, op->start_idx, op->count); for (i = 0, context_count = device->context_count; i < context_count; ++i) - device->contexts[i]->constant_update_mask |= wined3d_cs_push_constant_info[op->type].mask; + device->contexts[i]->constant_update_mask |= op->update_mask; } static void wined3d_device_context_emit_push_constants(struct wined3d_device_context *context, - enum wined3d_push_constants type, unsigned int start_idx, unsigned int count) + enum wined3d_push_constants type, uint32_t update_mask, unsigned int start_idx, unsigned int count) { struct wined3d_cs *cs = wined3d_cs_from_context(context); struct wined3d_cs_push_constants *op; @@ -2218,6 +2218,7 @@ static void wined3d_device_context_emit_push_constants(struct wined3d_device_con op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_PUSH_CONSTANTS; op->type = type; + op->update_mask = update_mask; op->start_idx = start_idx; op->count = count; @@ -2225,7 +2226,7 @@ static void wined3d_device_context_emit_push_constants(struct wined3d_device_con } void wined3d_device_context_push_constants(struct wined3d_device_context *context, - enum wined3d_push_constants type, unsigned int start_idx, + enum wined3d_push_constants type, uint32_t update_mask, unsigned int start_idx, unsigned int count, const void *constants) { const struct push_constant_info *info = &wined3d_cs_push_constant_info[type]; @@ -2239,7 +2240,7 @@ void wined3d_device_context_push_constants(struct wined3d_device_context *contex wined3d_box_set(&box, byte_offset, 0, byte_offset + byte_size, 1, 0, 1); wined3d_device_context_emit_update_sub_resource(context, &context->device->push_constants[type]->resource, 0, &box, constants, byte_size, byte_size); - wined3d_device_context_emit_push_constants(context, type, start_idx, count); + wined3d_device_context_emit_push_constants(context, type, update_mask, start_idx, count); } static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 217ebda743f..9d597e293a3 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -2287,7 +2287,8 @@ static void wined3d_device_set_vs_consts_b(struct wined3d_device *device, TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); } - wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_B, + WINED3D_SHADER_CONST_VS_B, start_idx, count, constants); } static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, @@ -2303,7 +2304,8 @@ static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); } - wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_I, + WINED3D_SHADER_CONST_VS_I, start_idx, count, constants); } static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, @@ -2319,7 +2321,8 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } - wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_F, + WINED3D_SHADER_CONST_VS_F, start_idx, count, constants); } static void wined3d_device_set_ps_consts_b(struct wined3d_device *device, @@ -2335,7 +2338,8 @@ static void wined3d_device_set_ps_consts_b(struct wined3d_device *device, TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); } - wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_B, + WINED3D_SHADER_CONST_PS_B, start_idx, count, constants); } static void wined3d_device_set_ps_consts_i(struct wined3d_device *device, @@ -2351,7 +2355,8 @@ static void wined3d_device_set_ps_consts_i(struct wined3d_device *device, TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); } - wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_I, + WINED3D_SHADER_CONST_PS_I, start_idx, count, constants); } static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, @@ -2367,7 +2372,8 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } - wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_F, + WINED3D_SHADER_CONST_PS_F, start_idx, count, constants); } /* Note lights are real special cases. Although the device caps state only diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8c36a033f6e..178911dd08f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3705,7 +3705,7 @@ void wined3d_device_context_emit_update_sub_resource(struct wined3d_device_conte HRESULT wined3d_device_context_emit_unmap(struct wined3d_device_context *context, struct wined3d_resource *resource, unsigned int sub_resource_idx); void wined3d_device_context_push_constants(struct wined3d_device_context *context, - enum wined3d_push_constants type, unsigned int start_idx, + enum wined3d_push_constants type, uint32_t update_mask, unsigned int start_idx, unsigned int count, const void *constants); static inline void wined3d_resource_reference(struct wined3d_resource *resource)

1 0

Elizabeth Figura : wined3d: Use the primary stateblock state in wined3d_device_process_vertices() where possible.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 982333b3a93f78289a03e54037f31594815b9694 URL: https://gitlab.winehq.org/wine/wine/-/commit/982333b3a93f78289a03e54037f315… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Apr 25 19:30:26 2024 -0500 wined3d: Use the primary stateblock state in wined3d_device_process_vertices() where possible. We eventually want to get things like render states out of wined3d_state, keeping them only in wined3d_stateblock. wined3d_device_process_vertices(), as a d3d < 9 function, is largely better suited to deal in wined3d_stateblock directly at this point. --- dlls/wined3d/device.c | 93 ++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 49 deletions(-)

1 0

Elizabeth Figura : wined3d: Pass the primary stateblock to wined3d_device_process_vertices().
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: e8b2eb0021b96f9e9cc73f1ccf6f5edc78588e49 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8b2eb0021b96f9e9cc73f1ccf6f5e… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Thu Apr 25 19:30:09 2024 -0500 wined3d: Pass the primary stateblock to wined3d_device_process_vertices(). --- dlls/d3d8/device.c | 3 +-- dlls/d3d9/device.c | 3 +-- dlls/ddraw/executebuffer.c | 5 ++--- dlls/ddraw/vertexbuffer.c | 3 +-- dlls/wined3d/device.c | 4 +++- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 401677e8261..e9cdfa9b4ff 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2798,8 +2798,7 @@ static HRESULT WINAPI d3d8_device_ProcessVertices(IDirect3DDevice8 *iface, UINT ERR("Failed to set stream source.\n"); } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, + hr = wined3d_device_process_vertices(device->wined3d_device, device->state, src_start_idx, dst_idx, vertex_count, dst->wined3d_buffer, NULL, flags, dst->fvf); map = device->sysmem_vb; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c3cecc4e27f..408dace48ad 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3391,8 +3391,7 @@ static HRESULT WINAPI d3d9_device_ProcessVertices(IDirect3DDevice9Ex *iface, ERR("Failed to set stream source.\n"); } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_process_vertices(device->wined3d_device, src_start_idx, dst_idx, vertex_count, + hr = wined3d_device_process_vertices(device->wined3d_device, device->state, src_start_idx, dst_idx, vertex_count, dst_impl->wined3d_buffer, decl_impl ? decl_impl->wined3d_declaration : NULL, flags, dst_impl->fvf); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 0cf0bf121f3..b0d60c6fb65 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -311,10 +311,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d wined3d_stateblock_set_vertex_declaration(device->state, ddraw_find_decl(device->ddraw, op == D3DPROCESSVERTICES_TRANSFORMLIGHT ? D3DFVF_VERTEX : D3DFVF_LVERTEX)); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_surfaces(device); - wined3d_device_process_vertices(device->wined3d_device, ci->wStart, ci->wDest, - ci->dwCount, buffer->dst_vertex_buffer, NULL, 0, D3DFVF_TLVERTEX); + wined3d_device_process_vertices(device->wined3d_device, device->state, ci->wStart, + ci->wDest, ci->dwCount, buffer->dst_vertex_buffer, NULL, 0, D3DFVF_TLVERTEX); break; case D3DPROCESSVERTICES_COPY: diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index c02d7e6e354..ccfa0c2e752 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -304,8 +304,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7 wined3d_stateblock_set_stream_source(device_impl->state, 0, src_buffer_impl->wined3d_buffer, 0, get_flexible_vertex_size(src_buffer_impl->fvf)); wined3d_stateblock_set_vertex_declaration(device_impl->state, src_buffer_impl->wined3d_declaration); - wined3d_device_apply_stateblock(device_impl->wined3d_device, device_impl->state); - hr = wined3d_device_process_vertices(device_impl->wined3d_device, src_idx, dst_idx, + hr = wined3d_device_process_vertices(device_impl->wined3d_device, device_impl->state, src_idx, dst_idx, count, dst_buffer_impl->wined3d_buffer, NULL, flags, dst_buffer_impl->fvf); /* Restore the states if needed */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c0648f2aace..5cfd4040d8e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3610,7 +3610,7 @@ static HRESULT process_vertices_strided(const struct wined3d_device *device, DWO } #undef copy_and_next -HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, +HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_stateblock *stateblock, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, const struct wined3d_vertex_declaration *declaration, uint32_t flags, uint32_t dst_fvf) { @@ -3631,6 +3631,8 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, if (declaration) FIXME("Output vertex declaration not implemented yet.\n"); + wined3d_device_apply_stateblock(device, stateblock); + vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; state->shader[WINED3D_SHADER_TYPE_VERTEX] = NULL; wined3d_stream_info_from_declaration(&stream_info, state, &device->adapter->d3d_info); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index fee5ed0dd7a..3bfe6d2b200 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -73,7 +73,7 @@ @ cdecl wined3d_device_get_swapchain_count(ptr) @ cdecl wined3d_device_get_wined3d(ptr) @ cdecl wined3d_device_incref(ptr) -@ cdecl wined3d_device_process_vertices(ptr long long long ptr ptr long long) +@ cdecl wined3d_device_process_vertices(ptr ptr long long long ptr ptr long long) @ cdecl wined3d_device_release_focus_window(ptr) @ cdecl wined3d_device_reset(ptr ptr ptr ptr long) @ cdecl wined3d_device_set_clip_status(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b3c1b2f8152..2d2d097497e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2401,7 +2401,7 @@ struct wined3d_swapchain * __cdecl wined3d_device_get_swapchain(const struct win UINT __cdecl wined3d_device_get_swapchain_count(const struct wined3d_device *device); struct wined3d * __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device); -HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_process_vertices(struct wined3d_device *device, struct wined3d_stateblock *stateblock, UINT src_start_idx, UINT dst_idx, UINT vertex_count, struct wined3d_buffer *dst_buffer, const struct wined3d_vertex_declaration *declaration, uint32_t flags, uint32_t dst_fvf); void __cdecl wined3d_device_release_focus_window(struct wined3d_device *device);

1 0

Elizabeth Figura : wined3d: Precompute direction and position in wined3d_light_state_set_light().
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: 69b20aeab1828296b3c53ee345e8a56c1e47c599 URL: https://gitlab.winehq.org/wine/wine/-/commit/69b20aeab1828296b3c53ee345e8a5… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Fri Apr 26 15:15:23 2024 -0500 wined3d: Precompute direction and position in wined3d_light_state_set_light(). So that wined3d_device_process_vertices() can just read the stateblock directly. --- dlls/wined3d/stateblock.c | 114 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 57 insertions(+), 59 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 6c44733c8bb..217ebda743f 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -655,7 +655,7 @@ static void set_light_changed(struct wined3d_stateblock *stateblock, struct wine stateblock->changed.lights = 1; } -HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, +static HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, unsigned int light_idx, const struct wined3d_light *params, struct wined3d_light_info **light_info) { struct wined3d_light_info *object; @@ -676,6 +676,62 @@ HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD l object->OriginalParms = *params; + /* Initialize the object. */ + TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " + "position {%.8e, %.8e, %.8e}, direction {%.8e, %.8e, %.8e}, " + "range %.8e, falloff %.8e, theta %.8e, phi %.8e.\n", + light_idx, params->type, debug_color(&params->diffuse), + debug_color(&params->specular), debug_color(&params->ambient), + params->position.x, params->position.y, params->position.z, + params->direction.x, params->direction.y, params->direction.z, + params->range, params->falloff, params->theta, params->phi); + + switch (params->type) + { + case WINED3D_LIGHT_POINT: + /* Position */ + object->position.x = params->position.x; + object->position.y = params->position.y; + object->position.z = params->position.z; + object->position.w = 1.0f; + /* FIXME: Range */ + break; + + case WINED3D_LIGHT_DIRECTIONAL: + /* Direction */ + object->direction.x = -params->direction.x; + object->direction.y = -params->direction.y; + object->direction.z = -params->direction.z; + object->direction.w = 0.0f; + break; + + case WINED3D_LIGHT_SPOT: + /* Position */ + object->position.x = params->position.x; + object->position.y = params->position.y; + object->position.z = params->position.z; + object->position.w = 1.0f; + + /* Direction */ + object->direction.x = params->direction.x; + object->direction.y = params->direction.y; + object->direction.z = params->direction.z; + object->direction.w = 0.0f; + + /* FIXME: Range */ + break; + + case WINED3D_LIGHT_PARALLELPOINT: + object->position.x = params->position.x; + object->position.y = params->position.y; + object->position.z = params->position.z; + object->position.w = 1.0f; + break; + + default: + FIXME("Unrecognized params type %#x.\n", params->type); + } + *light_info = object; return WINED3D_OK; } @@ -2329,62 +2385,6 @@ static void wined3d_device_context_set_light(struct wined3d_device_context *cont if (FAILED(wined3d_light_state_set_light(&context->state->light_state, light_idx, light, &object))) return; - /* Initialize the object. */ - TRACE("Light %u setting to type %#x, diffuse %s, specular %s, ambient %s, " - "position {%.8e, %.8e, %.8e}, direction {%.8e, %.8e, %.8e}, " - "range %.8e, falloff %.8e, theta %.8e, phi %.8e.\n", - light_idx, light->type, debug_color(&light->diffuse), - debug_color(&light->specular), debug_color(&light->ambient), - light->position.x, light->position.y, light->position.z, - light->direction.x, light->direction.y, light->direction.z, - light->range, light->falloff, light->theta, light->phi); - - switch (light->type) - { - case WINED3D_LIGHT_POINT: - /* Position */ - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - /* FIXME: Range */ - break; - - case WINED3D_LIGHT_DIRECTIONAL: - /* Direction */ - object->direction.x = -light->direction.x; - object->direction.y = -light->direction.y; - object->direction.z = -light->direction.z; - object->direction.w = 0.0f; - break; - - case WINED3D_LIGHT_SPOT: - /* Position */ - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - - /* Direction */ - object->direction.x = light->direction.x; - object->direction.y = light->direction.y; - object->direction.z = light->direction.z; - object->direction.w = 0.0f; - - /* FIXME: Range */ - break; - - case WINED3D_LIGHT_PARALLELPOINT: - object->position.x = light->position.x; - object->position.y = light->position.y; - object->position.z = light->position.z; - object->position.w = 1.0f; - break; - - default: - FIXME("Unrecognized light type %#x.\n", light->type); - } - wined3d_device_context_emit_set_light(context, object); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f49a604422d..8c36a033f6e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3503,8 +3503,6 @@ bool wined3d_light_state_enable_light(struct wined3d_light_state *state, const s struct wined3d_light_info *light_info, BOOL enable); struct wined3d_light_info *wined3d_light_state_get_light(const struct wined3d_light_state *state, unsigned int idx); -HRESULT wined3d_light_state_set_light(struct wined3d_light_state *state, DWORD light_idx, - const struct wined3d_light *params, struct wined3d_light_info **light_info); enum wined3d_cs_queue_id {

1 0

Giovanni Mascellani : wined3d: Compile the clear compute shaders at runtime.
by Alexandre Julliard 27 Jun '24

27 Jun '24

Module: wine Branch: master Commit: c319b874669450cc17ebe9a7f459a17b86cdcddb URL: https://gitlab.winehq.org/wine/wine/-/commit/c319b874669450cc17ebe9a7f459a1… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Mar 19 12:25:28 2024 +0100 wined3d: Compile the clear compute shaders at runtime. --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/cs_uav_clear_1d_array_float_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_1d_array_uint_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_1d_float_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_1d_uint_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_2d_array_float_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_2d_array_uint_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_2d_float_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_2d_uint_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_3d_float_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_3d_uint_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_buffer_float_code.hlsl | 33 ++ dlls/wined3d/cs_uav_clear_buffer_uint_code.hlsl | 33 ++ dlls/wined3d/resource.rc | 30 ++ dlls/wined3d/view.c | 111 +++++- dlls/wined3d/wined3d_shaders.h | 388 --------------------- 16 files changed, 520 insertions(+), 406 deletions(-)

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2024