wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

libs/vkd3d-shader: Implement relative addressing for constant buffers.

Browse Source
This commit is contained in:
Józef Kucia 2017-10-06 17:06:31 +02:00
parent 853068c84d
commit 586e1cc532
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/vkd3d-shader/spirv.c
View File

@ -2175,9 +2175,6 @@ static void vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co
assert(reg->type != VKD3DSPR_IMMCONST); assert(reg->type != VKD3DSPR_IMMCONST);
if (reg->idx[0].rel_addr || reg->idx[1].rel_addr)
FIXME("Relative indexing not implemented.\n");
if (reg->type == VKD3DSPR_TEMP) if (reg->type == VKD3DSPR_TEMP)
{ {
assert(reg->idx[0].offset < compiler->temp_count); assert(reg->idx[0].offset < compiler->temp_count);
@ -2200,9 +2197,10 @@ static void vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co
uint32_t indexes[] = uint32_t indexes[] =
{ {
vkd3d_dxbc_compiler_get_constant_uint(compiler, symbol->info.reg.member_idx), vkd3d_dxbc_compiler_get_constant_uint(compiler, symbol->info.reg.member_idx),
vkd3d_dxbc_compiler_get_constant_uint(compiler, reg->idx[1].offset), vkd3d_dxbc_compiler_emit_register_addressing(compiler, &reg->idx[1]),
}; };
assert(!reg->idx[0].rel_addr);
type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE);
ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, register_info->storage_class, type_id);
register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id,
@ -2218,6 +2216,10 @@ static void vkd3d_dxbc_compiler_get_register_info(struct vkd3d_dxbc_compiler *co
register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, register_info->id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id,
register_info->id, indexes, ARRAY_SIZE(indexes)); register_info->id, indexes, ARRAY_SIZE(indexes));
} }
else if (reg->idx[0].rel_addr || reg->idx[1].rel_addr)
{
FIXME("Relative addressing not implemented.\n");
}
} }
static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler *compiler, static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler *compiler,