wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/tpf: Write the field offset in bytes.

Browse Source
This commit is contained in:
Zebediah Figura 2024-05-02 22:07:13 -05:00 committed by Alexandre Julliard
parent 68562d375e
commit 7b3c47ba2e
Notes: Alexandre Julliard 2024-05-06 22:37:40 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/848
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/vkd3d-shader/tpf.c
View File

@ -3090,7 +3090,7 @@ static void write_sm4_type(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b
put_u32(buffer, field->name_bytecode_offset); put_u32(buffer, field->name_bytecode_offset);
put_u32(buffer, field->type->bytecode_offset); put_u32(buffer, field->type->bytecode_offset);
put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC]); put_u32(buffer, field->reg_offset[HLSL_REGSET_NUMERIC] * sizeof(float));
} }
type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(D3D_SVC_STRUCT, D3D_SVT_VOID)); type->bytecode_offset = put_u32(buffer, vkd3d_make_u32(D3D_SVC_STRUCT, D3D_SVT_VOID));
put_u32(buffer, vkd3d_make_u32(1, hlsl_type_component_count(array_type))); put_u32(buffer, vkd3d_make_u32(1, hlsl_type_component_count(array_type)));

12
tests/hlsl_d3d12.c
View File

@ -1333,7 +1333,7 @@ static void check_type_desc_(int line, const D3D12_SHADER_TYPE_DESC *type, const
ok_(line)(type->Columns == expect->Columns, "Got %u columns.\n", type->Columns); ok_(line)(type->Columns == expect->Columns, "Got %u columns.\n", type->Columns);
ok_(line)(type->Elements == expect->Elements, "Got %u elements.\n", type->Elements); ok_(line)(type->Elements == expect->Elements, "Got %u elements.\n", type->Elements);
ok_(line)(type->Members == expect->Members, "Got %u members.\n", type->Members); ok_(line)(type->Members == expect->Members, "Got %u members.\n", type->Members);
ok_(line)(type->Offset == expect->Offset, "Got %u members.\n", type->Members); ok_(line)(type->Offset == expect->Offset, "Got offset %u.\n", type->Offset);
ok_(line)(!strcmp(type->Name, expect->Name), "Got name \"%s\".\n", type->Name); ok_(line)(!strcmp(type->Name, expect->Name), "Got name \"%s\".\n", type->Name);
} }
#define check_type_desc(a, b) check_type_desc_(__LINE__, a, b) #define check_type_desc(a, b) check_type_desc_(__LINE__, a, b)
@ -1407,7 +1407,7 @@ static void test_reflection(void)
static const D3D12_SHADER_TYPE_DESC r_field_types[] = static const D3D12_SHADER_TYPE_DESC r_field_types[] =
{ {
{D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"},
{D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 4, 0, 0, 0, "float4"}, {D3D_SVC_VECTOR, D3D_SVT_FLOAT, 1, 4, 0, 0, 16, "float4"},
}; };
static const struct shader_variable globals_vars = static const struct shader_variable globals_vars =
@ -1519,7 +1519,7 @@ static void test_reflection(void)
static const D3D12_SHADER_TYPE_DESC ps_h_field_types[] = static const D3D12_SHADER_TYPE_DESC ps_h_field_types[] =
{ {
{D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"},
{D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 0, "float"}, {D3D_SVC_SCALAR, D3D_SVT_FLOAT, 1, 1, 0, 0, 4, "float"},
}; };
static const D3D12_SHADER_TYPE_DESC ps_i_field_types[] = static const D3D12_SHADER_TYPE_DESC ps_i_field_types[] =
@ -1588,10 +1588,10 @@ static void test_reflection(void)
for (unsigned int j = 0; j < buffer_desc.Variables; ++j) for (unsigned int j = 0; j < buffer_desc.Variables; ++j)
{ {
const struct shader_variable *expect = &expect_buffer->vars[j]; const struct shader_variable *expect = &expect_buffer->vars[j];
D3D12_SHADER_TYPE_DESC type_desc, field_desc;
ID3D12ShaderReflectionType *type, *field; ID3D12ShaderReflectionType *type, *field;
ID3D12ShaderReflectionVariable *var; ID3D12ShaderReflectionVariable *var;
D3D12_SHADER_VARIABLE_DESC var_desc; D3D12_SHADER_VARIABLE_DESC var_desc;
D3D12_SHADER_TYPE_DESC type_desc;
vkd3d_test_push_context("Variable %u", j); vkd3d_test_push_context("Variable %u", j);
@ -1623,9 +1623,9 @@ static void test_reflection(void)
vkd3d_test_push_context("Field %u", k); vkd3d_test_push_context("Field %u", k);
field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, k); field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, k);
hr = ID3D12ShaderReflectionType_GetDesc(field, &type_desc); hr = ID3D12ShaderReflectionType_GetDesc(field, &field_desc);
ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);
check_type_desc(&type_desc, &expect->field_types[k]); check_type_desc(&field_desc, &expect->field_types[k]);
vkd3d_test_pop_context(); vkd3d_test_pop_context();
} }