wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/d3dbc: Fix writing vertex input semantics.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-10-14 15:28:26 -05:00
committed by Henri Verbeet
parent cb514ef6e0
commit 507990d3c5
Notes: Henri Verbeet 2025-10-15 13:01:02 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1791
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/d3dbc.c
View File

@@ -2174,11 +2174,11 @@ static void d3dbc_write_semantic_dcl(struct d3dbc_compiler *d3dbc,
VKD3D_ASSERT(ret); VKD3D_ASSERT(ret);
reg.reg.type = output ? VKD3DSPR_OUTPUT : VKD3DSPR_INPUT; reg.reg.type = output ? VKD3DSPR_OUTPUT : VKD3DSPR_INPUT;
reg.reg.idx[0].offset = element->register_index; reg.reg.idx[0].offset = element->register_index;
if (!vkd3d_shader_ver_ge(version, 3, 0)) if ((version->type == VKD3D_SHADER_TYPE_PIXEL || output) && !vkd3d_shader_ver_ge(version, 3, 0))
{ {
if (reg.reg.idx[0].offset > SM1_RASTOUT_REGISTER_OFFSET) if (reg.reg.idx[0].offset >= SM1_RASTOUT_REGISTER_OFFSET)
reg.reg.idx[0].offset -= SM1_RASTOUT_REGISTER_OFFSET; reg.reg.idx[0].offset -= SM1_RASTOUT_REGISTER_OFFSET;
else if (reg.reg.idx[0].offset > SM1_COLOR_REGISTER_OFFSET) else if (reg.reg.idx[0].offset >= SM1_COLOR_REGISTER_OFFSET)
reg.reg.idx[0].offset -= SM1_COLOR_REGISTER_OFFSET; reg.reg.idx[0].offset -= SM1_COLOR_REGISTER_OFFSET;
} }
} }

2
tests/hlsl/many-semantics.shader_test
View File

@@ -33,5 +33,5 @@ float4 main(float color[2] : color, float texcoord[8] : texcoord) : sv_target
} }
[test] [test]
todo(sm<4 | msl & sm>=6) draw triangle strip 4 todo(msl & sm>=6) draw triangle strip 4
probe (0,0) f32(.65, .86, .37, .48) 1 probe (0,0) f32(.65, .86, .37, .48) 1