wine-commits November 2023

wine-commits@winehq.org

1 participants
989 discussions

Zebediah Figura : wined3d: Record a dirty rect in wined3d_texture_create_dc().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: a32872870271083a0bd5caa55771be4ff1b2fff2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a32872870271083a0bd5caa55771be… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:45:07 2023 -0600 wined3d: Record a dirty rect in wined3d_texture_create_dc(). --- dlls/d3d9/tests/visual.c | 4 +-- dlls/wined3d/texture.c | 66 +++++++++++++++++++++++++----------------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 51848cecbf6..bb8381cde3d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19760,7 +19760,7 @@ static void add_dirty_rect_test(void) ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); @@ -19897,7 +19897,7 @@ static void add_dirty_rect_test(void) ok(hr == S_OK, "Got hr %#lx.\n", hr); add_dirty_rect_test_draw(device); color = getPixelColor(device, 320, 240); - todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a89fad97ed8..1f4c4b80d3c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1088,6 +1088,37 @@ static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture checkGLcall("allocate immutable storage"); } +static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, + unsigned int layer, const struct wined3d_box *box) +{ + struct wined3d_dirty_regions *regions; + unsigned int count; + + if (!texture->dirty_regions) + return; + + regions = &texture->dirty_regions[layer]; + count = regions->box_count + 1; + if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box + || (!box->left && !box->top && !box->front + && box->right == texture->resource.width + && box->bottom == texture->resource.height + && box->back == texture->resource.depth)) + { + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) + { + ERR("Failed to grow boxes array, marking entire texture dirty.\n"); + regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; + return; + } + + regions->boxes[regions->box_count++] = *box; +} + void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) { unsigned int sub_count = texture->level_count * texture->layer_count; @@ -1150,6 +1181,10 @@ static void wined3d_texture_create_dc(void *object) context = context_acquire(device, NULL, 0); wined3d_texture_load_location(texture, sub_resource_idx, context, texture->resource.map_binding); } + + if (texture->dirty_regions) + wined3d_texture_dirty_region_add(texture, sub_resource_idx / texture->level_count, NULL); + wined3d_texture_invalidate_location(texture, sub_resource_idx, ~texture->resource.map_binding); wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); wined3d_texture_get_bo_address(texture, sub_resource_idx, &data, texture->resource.map_binding); @@ -2123,37 +2158,6 @@ static struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(str return &texture->sub_resources[sub_resource_idx]; } -static void wined3d_texture_dirty_region_add(struct wined3d_texture *texture, - unsigned int layer, const struct wined3d_box *box) -{ - struct wined3d_dirty_regions *regions; - unsigned int count; - - if (!texture->dirty_regions) - return; - - regions = &texture->dirty_regions[layer]; - count = regions->box_count + 1; - if (count >= WINED3D_MAX_DIRTY_REGION_COUNT || !box - || (!box->left && !box->top && !box->front - && box->right == texture->resource.width - && box->bottom == texture->resource.height - && box->back == texture->resource.depth)) - { - regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; - return; - } - - if (!wined3d_array_reserve((void **)&regions->boxes, &regions->boxes_size, count, sizeof(*regions->boxes))) - { - WARN("Failed to grow boxes array, marking entire texture dirty.\n"); - regions->box_count = WINED3D_MAX_DIRTY_REGION_COUNT; - return; - } - - regions->boxes[regions->box_count++] = *box; -} - HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, UINT layer, const struct wined3d_box *dirty_region) {

1 0

Zebediah Figura : d3d9/tests: Test that GetDC() records a dirty rect.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: wine Branch: master Commit: 8fa82bd1f89c669bc89be7d56413adde67638a82 URL: https://gitlab.winehq.org/wine/wine/-/commit/8fa82bd1f89c669bc89be7d56413ad… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 8 17:43:55 2023 -0600 d3d9/tests: Test that GetDC() records a dirty rect. --- dlls/d3d9/tests/visual.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 0ac6b58cb36..51848cecbf6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19507,6 +19507,7 @@ static void add_dirty_rect_test(void) ULONG refcount; DWORD *texel; HWND window; + HDC dc; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; static const RECT oob_rect[] = @@ -19748,6 +19749,21 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* GetDC() records a dirty rect. */ + fill_surface(surface_src_green, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_src_green, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_src_green, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DDevice9_UpdateTexture(device, (IDirect3DBaseTexture9 *)tex_src_green, + (IDirect3DBaseTexture9 *)tex_dst2); + ok(SUCCEEDED(hr), "Failed to update texture, hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + fill_surface(surface_src_red, 0x00ff0000, 0); fill_surface(surface_src_green, 0x0000ff00, 0); @@ -19873,6 +19889,18 @@ static void add_dirty_rect_test(void) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* So does GetDC(). */ + fill_surface(surface_managed0, 0x00000080, D3DLOCK_NO_DIRTY_UPDATE); + hr = IDirect3DSurface9_GetDC(surface_managed0, &dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSurface9_ReleaseDC(surface_managed0, dc); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + add_dirty_rect_test_draw(device); + color = getPixelColor(device, 320, 240); + todo_wine ok(color_match(color, 0x00000080, 1), "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#lx.\n", hr); + /* Tests with dynamic textures */ fill_surface(surface_dynamic, 0x0000ffff, 0); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)tex_dynamic);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for IMMCONST64 registers.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 0c5c18bdce35efc460d6eb4dff4b6dfd90228237 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0c5c18bdce35efc460d6eb4dff4b6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:17:39 2023 +0100 vkd3d-shader/ir: Validate index count for IMMCONST64 registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index ffc505cd..2a334399 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1554,6 +1554,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx_count); break; + case VKD3DSPR_IMMCONST64: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a IMMCONST64 register.", + reg->idx_count); + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for IMMCONST registers.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: b74470b9d2bba1278f656e597ac40e26013c3f6f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b74470b9d2bba1278f656e597ac40… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:17:05 2023 +0100 vkd3d-shader/ir: Validate index count for IMMCONST registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 0f8d596b..ffc505cd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1548,6 +1548,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx_count); break; + case VKD3DSPR_IMMCONST: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a IMMCONST register.", + reg->idx_count); + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate index count for NULL registers.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: c8676829829514c91f078f282d474a2abdfa5aab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/c8676829829514c91f078f282d474… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:12:30 2023 +0100 vkd3d-shader/ir: Validate index count for NULL registers. --- libs/vkd3d-shader/ir.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index c2bad117..0f8d596b 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1542,6 +1542,12 @@ static void vsir_validate_register(struct validation_context *ctx, reg->idx[0].offset, temp_count); break; + case VKD3DSPR_NULL: + if (reg->idx_count != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid index count %u for a NULL register.", + reg->idx_count); + break; + default: break; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate register indices.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 12fcb8dcc6b35c6cafce6c61db4060696178d465 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/12fcb8dcc6b35c6cafce6c61db406… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 23:10:06 2023 +0100 vkd3d-shader/ir: Validate register indices. --- libs/vkd3d-shader/ir.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 1fc3f6dd..c2bad117 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1488,10 +1488,13 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c vkd3d_string_buffer_cleanup(&buf); } +static void vsir_validate_src_param(struct validation_context *ctx, + const struct vkd3d_shader_src_param *src); + static void vsir_validate_register(struct validation_context *ctx, const struct vkd3d_shader_register *reg) { - unsigned int temp_count = ctx->temp_count; + unsigned int i, temp_count = ctx->temp_count; /* SM1-3 shaders do not include a DCL_TEMPS instruction. */ if (ctx->parser->shader_version.major <= 3) @@ -1517,6 +1520,13 @@ static void vsir_validate_register(struct validation_context *ctx, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT, "Invalid register index count %u.", reg->idx_count); + for (i = 0; i < min(reg->idx_count, ARRAY_SIZE(reg->idx)); ++i) + { + const struct vkd3d_shader_src_param *param = reg->idx[i].rel_addr; + if (reg->idx[i].rel_addr) + vsir_validate_src_param(ctx, param); + } + switch (reg->type) { case VKD3DSPR_TEMP:

1 0

Giovanni Mascellani : vkd3d-shader/ir: Use vsir_register_init() to initialize a register.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: b7aeb5dd7043ebab19bb81a5ed223f3ef9abea2e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b7aeb5dd7043ebab19bb81a5ed223… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Nov 8 11:11:39 2023 +0100 vkd3d-shader/ir: Use vsir_register_init() to initialize a register. --- libs/vkd3d-shader/ir.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 45027188..1fc3f6dd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -62,17 +62,7 @@ static void shader_instruction_eliminate_phase_instance_id(struct vkd3d_shader_i reg = (struct vkd3d_shader_register *)&ins->src[i].reg; if (shader_register_is_phase_instance_id(reg)) { - reg->type = VKD3DSPR_IMMCONST; - reg->precision = VKD3D_SHADER_REGISTER_PRECISION_DEFAULT; - reg->non_uniform = false; - reg->idx[0].offset = ~0u; - reg->idx[0].rel_addr = NULL; - reg->idx[1].offset = ~0u; - reg->idx[1].rel_addr = NULL; - reg->idx[2].offset = ~0u; - reg->idx[2].rel_addr = NULL; - reg->idx_count = 0; - reg->dimension = VSIR_DIMENSION_SCALAR; + vsir_register_init(reg, VKD3DSPR_IMMCONST, reg->data_type, 0); reg->u.immconst_uint[0] = instance_id; continue; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Validate the TEMP register indices in each HS phase.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: a869069a481519c4daa76819f6eb6308884be5ef URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a869069a481519c4daa76819f6eb6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Nov 7 23:21:11 2023 +0100 vkd3d-shader/ir: Validate the TEMP register indices in each HS phase. --- libs/vkd3d-shader/ir.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index f8f56efd..45027188 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1472,6 +1472,7 @@ struct validation_context struct vkd3d_shader_parser *parser; size_t instruction_idx; bool dcl_temps_found; + unsigned int temp_count; enum vkd3d_shader_opcode phase; enum vkd3d_shader_opcode *blocks; @@ -1500,6 +1501,12 @@ static void VKD3D_PRINTF_FUNC(3, 4) validator_error(struct validation_context *c static void vsir_validate_register(struct validation_context *ctx, const struct vkd3d_shader_register *reg) { + unsigned int temp_count = ctx->temp_count; + + /* SM1-3 shaders do not include a DCL_TEMPS instruction. */ + if (ctx->parser->shader_version.major <= 3) + temp_count = ctx->parser->shader_desc.temp_count; + if (reg->type >= VKD3DSPR_COUNT) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, "Invalid register type %#x.", reg->type); @@ -1530,9 +1537,9 @@ static void vsir_validate_register(struct validation_context *ctx, if (reg->idx_count >= 1 && reg->idx[0].rel_addr) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "Non-NULL relative address for a TEMP register."); - if (reg->idx_count >= 1 && reg->idx[0].offset >= ctx->parser->shader_desc.temp_count) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the declared count %u.", - reg->idx[0].offset, ctx->parser->shader_desc.temp_count); + if (reg->idx_count >= 1 && reg->idx[0].offset >= temp_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX, "TEMP register index %u exceeds the maximum count %u.", + reg->idx[0].offset, temp_count); break; default: @@ -1636,6 +1643,8 @@ static void vsir_validate_instruction(struct validation_context *ctx) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "Phase instruction %#x must appear to top level.", instruction->handler_idx); ctx->phase = instruction->handler_idx; + ctx->dcl_temps_found = false; + ctx->temp_count = 0; return; default: @@ -1652,15 +1661,13 @@ static void vsir_validate_instruction(struct validation_context *ctx) case VKD3DSIH_DCL_TEMPS: vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_src_count(ctx, instruction, 0); - /* TODO Check that each phase in a hull shader has at most - * one occurrence. */ - if (ctx->dcl_temps_found && ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) + if (ctx->dcl_temps_found) validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS, "Duplicate DCL_TEMPS instruction."); - ctx->dcl_temps_found = true; - if (instruction->declaration.count != ctx->parser->shader_desc.temp_count && - ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) - validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, "Invalid DCL_TEMPS count %u, expected %u.", + if (instruction->declaration.count > ctx->parser->shader_desc.temp_count) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS, "Invalid DCL_TEMPS count %u, expected at most %u.", instruction->declaration.count, ctx->parser->shader_desc.temp_count); + ctx->dcl_temps_found = true; + ctx->temp_count = instruction->declaration.count; break; case VKD3DSIH_IF:

1 0

Giovanni Mascellani : vkd3d-shader/ir: Keep track of hull shader phases.
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 0f4bda9c9d5b4d301ac96c7168c1ab1928fa0c59 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f4bda9c9d5b4d301ac96c7168c1a… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Nov 6 23:11:03 2023 +0100 vkd3d-shader/ir: Keep track of hull shader phases. --- libs/vkd3d-shader/ir.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 72ba057d..f8f56efd 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1472,6 +1472,7 @@ struct validation_context struct vkd3d_shader_parser *parser; size_t instruction_idx; bool dcl_temps_found; + enum vkd3d_shader_opcode phase; enum vkd3d_shader_opcode *blocks; size_t depth; @@ -1620,6 +1621,32 @@ static void vsir_validate_instruction(struct validation_context *ctx) instruction->handler_idx); } + switch (instruction->handler_idx) + { + case VKD3DSIH_HS_DECLS: + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + vsir_validate_dst_count(ctx, instruction, 0); + vsir_validate_src_count(ctx, instruction, 0); + if (ctx->parser->shader_version.type != VKD3D_SHADER_TYPE_HULL) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Phase instruction %#x is only valid in a hull shader.", + instruction->handler_idx); + if (ctx->depth != 0) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INSTRUCTION_NESTING, "Phase instruction %#x must appear to top level.", + instruction->handler_idx); + ctx->phase = instruction->handler_idx; + return; + + default: + break; + } + + if (ctx->parser->shader_version.type == VKD3D_SHADER_TYPE_HULL && + ctx->phase == VKD3DSIH_INVALID) + validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, "Instruction %#x appear before any phase instruction in a hull shader.", + instruction->handler_idx); + switch (instruction->handler_idx) { case VKD3DSIH_DCL_TEMPS: @@ -1720,7 +1747,11 @@ static void vsir_validate_instruction(struct validation_context *ctx) void vsir_validate(struct vkd3d_shader_parser *parser) { - struct validation_context ctx = { .parser = parser }; + struct validation_context ctx = + { + .parser = parser, + .phase = VKD3DSIH_INVALID, + }; if (!(parser->config_flags & VKD3D_SHADER_CONFIG_FLAG_FORCE_VALIDATION)) return;

1 0

Conor McCarthy : vkd3d-shader/ir: Check the handler before changing it to NOP in remove_dead_code().
by Alexandre Julliard 09 Nov '23

09 Nov '23

Module: vkd3d Branch: master Commit: 5768c019c1b486d25c7eb17cc826bb3eaa0d8c22 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5768c019c1b486d25c7eb17cc826b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Nov 9 14:07:03 2023 +1000 vkd3d-shader/ir: Check the handler before changing it to NOP in remove_dead_code(). --- libs/vkd3d-shader/ir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index abc8b1cd..72ba057d 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -1295,9 +1295,9 @@ static void remove_dead_code(struct vkd3d_shader_parser *parser) { if (depth > 0) { - vkd3d_shader_instruction_make_nop(ins); if (ins->handler_idx != VKD3DSIH_ELSE) --depth; + vkd3d_shader_instruction_make_nop(ins); } else {

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
99
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 November 2023