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: Use the size from struct vkd3d_shader_constant_buffer when declaring push constant buffers.

Browse Source 
Signed-off-by: Zebediah Figura <zfigura@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
2020-05-26 15:16:43 -05:00
committed by Alexandre Julliard
parent 4c993c672a
commit d08107da90
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2029,6 +2029,7 @@ struct vkd3d_push_constant_buffer_binding
{ {
struct vkd3d_shader_register reg; struct vkd3d_shader_register reg;
struct vkd3d_shader_push_constant_buffer pc; struct vkd3d_shader_push_constant_buffer pc;
unsigned int size;
}; };
struct vkd3d_shader_phase struct vkd3d_shader_phase
@ -4892,7 +4893,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com
const SpvStorageClass storage_class = SpvStorageClassPushConstant; const SpvStorageClass storage_class = SpvStorageClassPushConstant;
uint32_t vec4_id, length_id, struct_id, pointer_type_id, var_id; uint32_t vec4_id, length_id, struct_id, pointer_type_id, var_id;
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
unsigned int i, j, count, reg_idx, cb_size; unsigned int i, j, count, reg_idx;
struct vkd3d_symbol reg_symbol; struct vkd3d_symbol reg_symbol;
uint32_t *member_ids; uint32_t *member_ids;
@ -4918,8 +4919,7 @@ static void vkd3d_dxbc_compiler_emit_push_constant_buffers(struct vkd3d_dxbc_com
if (!cb->reg.type) if (!cb->reg.type)
continue; continue;
cb_size = cb->reg.idx[1].offset; length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb->size);
length_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, cb_size);
member_ids[j] = vkd3d_spirv_build_op_type_array(builder, vec4_id, length_id); member_ids[j] = vkd3d_spirv_build_op_type_array(builder, vec4_id, length_id);
vkd3d_spirv_build_op_decorate1(builder, member_ids[j], SpvDecorationArrayStride, 16); vkd3d_spirv_build_op_decorate1(builder, member_ids[j], SpvDecorationArrayStride, 16);
@ -4979,6 +4979,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_constant_buffer(struct vkd3d_dxbc_compi
*/ */
unsigned int cb_size_in_bytes = cb->size * VKD3D_VEC4_SIZE * sizeof(uint32_t); unsigned int cb_size_in_bytes = cb->size * VKD3D_VEC4_SIZE * sizeof(uint32_t);
push_cb->reg = *reg; push_cb->reg = *reg;
push_cb->size = cb->size;
if (cb_size_in_bytes > push_cb->pc.size) if (cb_size_in_bytes > push_cb->pc.size)
{ {
WARN("Constant buffer size %u exceeds push constant size %u.\n", WARN("Constant buffer size %u exceeds push constant size %u.\n",