wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Use vkd3d_make_u32() in more places.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura
2021-08-19 18:44:25 -05:00
committed by Alexandre Julliard
parent 04a08088ec
commit 62c60776b9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libs/vkd3d-shader/hlsl_sm4.c
View File

@@ -163,9 +163,9 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
} }
} }
type->bytecode_offset = put_u32(buffer, sm4_class(type) | (sm4_base_type(type) << 16)); type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(sm4_class(type), sm4_base_type(type)));
put_u32(buffer, type->dimy | (type->dimx << 16)); put_u32(buffer, vkd3d_make_u32(type->dimy, type->dimx));
put_u32(buffer, array_size | (field_count << 16)); put_u32(buffer, vkd3d_make_u32(array_size, field_count));
put_u32(buffer, fields_offset); put_u32(buffer, fields_offset);
if (profile->major_version >= 5) if (profile->major_version >= 5)
@@ -207,7 +207,8 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
cbuffer_position = put_u32(&buffer, 0); cbuffer_position = put_u32(&buffer, 0);
put_u32(&buffer, cbuffer_count); /* bound resource count */ put_u32(&buffer, cbuffer_count); /* bound resource count */
resource_position = put_u32(&buffer, 0); resource_position = put_u32(&buffer, 0);
put_u32(&buffer, (target_types[profile->type] << 16) | (profile->major_version << 8) | profile->minor_version); put_u32(&buffer, vkd3d_make_u32(vkd3d_make_u16(profile->minor_version, profile->major_version),
target_types[profile->type]));
put_u32(&buffer, 0); /* FIXME: compilation flags */ put_u32(&buffer, 0); /* FIXME: compilation flags */
creator_position = put_u32(&buffer, 0); creator_position = put_u32(&buffer, 0);
@@ -371,7 +372,7 @@ static void write_sm4_shdr(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc)
VKD3D_SM4_LIB, VKD3D_SM4_LIB,
}; };
put_u32(&buffer, (shader_types[profile->type] << 16) | (profile->major_version << 4) | profile->minor_version); put_u32(&buffer, vkd3d_make_u32((profile->major_version << 4) | profile->minor_version, shader_types[profile->type]));
put_u32(&buffer, 0); /* FIXME: instruction token count */ put_u32(&buffer, 0); /* FIXME: instruction token count */
dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size); dxbc_writer_add_section(dxbc, TAG_SHDR, buffer.data, buffer.size);