fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 04:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

microsoft/compiler: Fix PSV struct when numthreads is 0

Browse source 
Fixes: d9e575d4 ("microsoft/compiler: DXIL validator 1.6 uses a new PSV struct version")
Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18023>
(cherry picked from commit 04e4de6fae)
This commit is contained in:
Jesse Natalie 2022-08-11 15:55:19 -07:00 • committed by Dylan Baker
parent e7ed89f1bc
commit 9634e7cdf6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -364,7 +364,7 @@
"description": "microsoft/compiler: Fix PSV struct when numthreads is 0",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "d9e575d4d7d33157b696c4b71fbe8a1a5dc22822"
},

6
src/microsoft/compiler/nir_to_dxil.c
View file

@ -5649,9 +5649,9 @@ void dxil_fill_validation_state(struct ntd_context *ctx,
ctx->mod.info.has_per_sample_input;
break;
case DXIL_COMPUTE_SHADER:
state->state.num_threads_x = ctx->shader->info.workgroup_size[0];
state->state.num_threads_y = ctx->shader->info.workgroup_size[1];
state->state.num_threads_z = ctx->shader->info.workgroup_size[2];
state->state.num_threads_x = MAX2(ctx->shader->info.workgroup_size[0], 1);
state->state.num_threads_y = MAX2(ctx->shader->info.workgroup_size[1], 1);
state->state.num_threads_z = MAX2(ctx->shader->info.workgroup_size[2], 1);
break;
case DXIL_GEOMETRY_SHADER:
state->state.psv1.max_vertex_count = ctx->shader->info.gs.vertices_out;