fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 09:18:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

microsoft/compiler, d3d12: flip tess winding at caller, not in nir_to_dxil

Browse source 
get_tessellator_output_primitive used to unconditionally invert CW<->CCW
on the assumption the input was GL-origin (lower-left). That was wrong
for any upper-left caller — including spirv_to_dxil, whose SPIR-V sources
(DXC, glslang) already align with D3D winding.

Make nir_to_dxil copy info.tess.ccw through and expect upper-left. The
d3d12 gallium driver (GL) flips before the conversion to preserve its
output. spirv_to_dxil and dozen (Vulkan, UPPER_LEFT default) are unchanged.

Assisted-by: Claude Opus 4.7 <noreply@anthropic.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41028>
This commit is contained in:
Virgile Bello 2026-04-17 17:50:56 +09:00 • committed by Marge Bot
parent 1262600f0f
commit 1d923fdd2b
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gallium/drivers/d3d12/d3d12_compiler.cpp
View file

@ -1144,7 +1144,9 @@ select_shader_variant(struct d3d12_selection_context *sel_ctx, d3d12_shader_sele
if (new_nir_variant->info.stage == MESA_SHADER_TESS_CTRL) {
new_nir_variant->info.tess._primitive_mode = (tess_primitive_mode)key.hs.primitive_mode;
new_nir_variant->info.tess.ccw = key.hs.ccw;
/* GL tess domain is lower-left origin, D3D is upper-left.
* Since we invert origin, we also need to invert triangle winding. */
new_nir_variant->info.tess.ccw = !key.hs.ccw;
new_nir_variant->info.tess.point_mode = key.hs.point_mode;
new_nir_variant->info.tess.spacing = key.hs.spacing;

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

@ -1746,12 +1746,9 @@ get_tessellator_output_primitive(const struct shader_info *info)
return DXIL_TESSELLATOR_OUTPUT_PRIMITIVE_POINT;
if (info->tess._primitive_mode == TESS_PRIMITIVE_ISOLINES)
return DXIL_TESSELLATOR_OUTPUT_PRIMITIVE_LINE;
/* Note: GL tessellation domain is inverted from D3D, which means triangle
* winding needs to be inverted.
*/
if (info->tess.ccw)
return DXIL_TESSELLATOR_OUTPUT_PRIMITIVE_TRIANGLE_CW;
return DXIL_TESSELLATOR_OUTPUT_PRIMITIVE_TRIANGLE_CCW;
return DXIL_TESSELLATOR_OUTPUT_PRIMITIVE_TRIANGLE_CCW;
return DXIL_TESSELLATOR_OUTPUT_PRIMITIVE_TRIANGLE_CW;
}
static const struct dxil_mdnode *