- Wine-Commits - list.winehq.org

Zebediah Figura : tests: Test bounds checking in ID3D12ShaderReflection.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 694d39ffe655e1507f1b7a42a388b9d180806c1c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/694d39ffe655e1507f1b7a42a388b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:13:51 2024 -0500 tests: Test bounds checking in ID3D12ShaderReflection. --- tests/hlsl_d3d12.c | 62 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4ab08816..ffab9fdd 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -1555,7 +1555,14 @@ static void test_reflection(void) for (unsigned int t = 0; t < ARRAY_SIZE(tests); ++t) { ID3D10Blob *code = compile_shader_flags(tests[t].source, - tests[t].profile, D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + tests[t].profile, strstr(tests[t].profile, "5_1") ? 0 : D3DCOMPILE_ENABLE_BACKWARDS_COMPATIBILITY); + ID3D12ShaderReflectionConstantBuffer *cbuffer; + D3D12_SHADER_TYPE_DESC type_desc, field_desc; + D3D12_SHADER_INPUT_BIND_DESC binding_desc; + ID3D12ShaderReflectionType *type, *field; + D3D12_SHADER_BUFFER_DESC buffer_desc; + ID3D12ShaderReflectionVariable *var; + D3D12_SHADER_VARIABLE_DESC var_desc; ID3D12ShaderReflection *reflection; D3D12_SHADER_DESC shader_desc; @@ -1571,8 +1578,6 @@ static void test_reflection(void) for (unsigned int i = 0; i < shader_desc.ConstantBuffers; ++i) { const struct shader_buffer *expect_buffer = &tests[t].buffers[i]; - ID3D12ShaderReflectionConstantBuffer *cbuffer; - D3D12_SHADER_BUFFER_DESC buffer_desc; vkd3d_test_push_context("Buffer %u", i); @@ -1588,10 +1593,6 @@ static void test_reflection(void) for (unsigned int j = 0; j < buffer_desc.Variables; ++j) { const struct shader_variable *expect = &expect_buffer->vars[j]; - D3D12_SHADER_TYPE_DESC type_desc, field_desc; - ID3D12ShaderReflectionType *type, *field; - ID3D12ShaderReflectionVariable *var; - D3D12_SHADER_VARIABLE_DESC var_desc; vkd3d_test_push_context("Variable %u", j); @@ -1630,35 +1631,56 @@ static void test_reflection(void) vkd3d_test_pop_context(); } + field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, type_desc.Members); + hr = ID3D12ShaderReflectionType_GetDesc(field, &field_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + vkd3d_test_pop_context(); } + var = ID3D12ShaderReflectionConstantBuffer_GetVariableByIndex(cbuffer, buffer_desc.Variables); + hr = ID3D12ShaderReflectionVariable_GetDesc(var, &var_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + type = ID3D12ShaderReflectionVariable_GetType(var); + hr = ID3D12ShaderReflectionType_GetDesc(type, &type_desc); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + field = ID3D12ShaderReflectionType_GetMemberTypeByIndex(type, 0); + hr = ID3D12ShaderReflectionType_GetDesc(field, &type_desc); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + vkd3d_test_pop_context(); } + cbuffer = ID3D12ShaderReflection_GetConstantBufferByIndex(reflection, shader_desc.ConstantBuffers); + hr = ID3D12ShaderReflectionConstantBuffer_GetDesc(cbuffer, &buffer_desc); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + for (unsigned int i = 0; i < shader_desc.BoundResources; ++i) { const D3D12_SHADER_INPUT_BIND_DESC *expect = &tests[t].bindings[i]; - D3D12_SHADER_INPUT_BIND_DESC desc; vkd3d_test_push_context("Binding %u", i); - hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, i, &desc); + hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, i, &binding_desc); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(!strcmp(desc.Name, expect->Name), "Got name \"%s\".\n", desc.Name); - ok(desc.Type == expect->Type, "Got type %#x.\n", desc.Type); - ok(desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", desc.BindPoint); - ok(desc.BindCount == expect->BindCount, "Got bind count %u.\n", desc.BindCount); + ok(!strcmp(binding_desc.Name, expect->Name), "Got name \"%s\".\n", binding_desc.Name); + ok(binding_desc.Type == expect->Type, "Got type %#x.\n", binding_desc.Type); + ok(binding_desc.BindPoint == expect->BindPoint, "Got bind point %u.\n", binding_desc.BindPoint); + ok(binding_desc.BindCount == expect->BindCount, "Got bind count %u.\n", binding_desc.BindCount); todo_if ((expect->uFlags & D3D_SIF_USERPACKED) && expect->Type != D3D_SIT_CBUFFER) - ok(desc.uFlags == expect->uFlags, "Got flags %#x.\n", desc.uFlags); - ok(desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", desc.ReturnType); - ok(desc.Dimension == expect->Dimension, "Got dimension %#x.\n", desc.Dimension); - ok(desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", desc.NumSamples); + ok(binding_desc.uFlags == expect->uFlags, "Got flags %#x.\n", binding_desc.uFlags); + ok(binding_desc.ReturnType == expect->ReturnType, "Got return type %#x.\n", binding_desc.ReturnType); + ok(binding_desc.Dimension == expect->Dimension, "Got dimension %#x.\n", binding_desc.Dimension); + ok(binding_desc.NumSamples == expect->NumSamples, "Got multisample count %u.\n", binding_desc.NumSamples); vkd3d_test_pop_context(); } + hr = ID3D12ShaderReflection_GetResourceBindingDesc(reflection, shader_desc.BoundResources, &binding_desc); + todo ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ID3D10Blob_Release(code); refcount = ID3D12ShaderReflection_Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount); @@ -1845,6 +1867,9 @@ static void test_signature_reflection(void) vkd3d_test_pop_context(); } + hr = reflection->lpVtbl->GetInputParameterDesc(reflection, shader_desc.InputParameters, &desc); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + for (unsigned int j = 0; j < shader_desc.OutputParameters; ++j) { vkd3d_test_push_context("Output %u", j); @@ -1854,6 +1879,9 @@ static void test_signature_reflection(void) vkd3d_test_pop_context(); } + hr = reflection->lpVtbl->GetOutputParameterDesc(reflection, shader_desc.OutputParameters, &desc); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + ID3D10Blob_Release(code); refcount = reflection->lpVtbl->Release(reflection); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Zebediah Figura : vkd3d-utils: Initialize the null type vtbl.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 35d388eedd87ca3a8d53b8faded59e5ed28f86d2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/35d388eedd87ca3a8d53b8faded59… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:11:54 2024 -0500 vkd3d-utils: Initialize the null type vtbl. --- libs/vkd3d-utils/reflection.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index 4f3a1a24..0c9017a4 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -197,6 +197,8 @@ static const struct ID3D12ShaderReflectionTypeVtbl d3d12_type_vtbl = d3d12_type_ImplementsInterface, }; +static struct d3d12_type null_type = {{&d3d12_type_vtbl}}; + static struct d3d12_variable *impl_from_ID3D12ShaderReflectionVariable(ID3D12ShaderReflectionVariable *iface) { return CONTAINING_RECORD(iface, struct d3d12_variable, ID3D12ShaderReflectionVariable_iface);

1 0

Zebediah Figura : vkd3d-shader/tpf: Write the field offset in bytes.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 7b3c47ba2ec28531b1342331396c0ac28fe3e4c2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7b3c47ba2ec28531b1342331396c0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 22:07:13 2024 -0500 vkd3d-shader/tpf: Write the field offset in bytes. --- libs/vkd3d-shader/tpf.c | 2 +- tests/hlsl_d3d12.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index c98667de..4e3bef96 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -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->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)); put_u32(buffer, vkd3d_make_u32(1, hlsl_type_component_count(array_type))); diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index 4d03efd5..4ab08816 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -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->Elements == expect->Elements, "Got %u elements.\n", type->Elements); 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); } #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[] = { {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 = @@ -1519,7 +1519,7 @@ static void test_reflection(void) 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, 4, "float"}, }; 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) { const struct shader_variable *expect = &expect_buffer->vars[j]; + D3D12_SHADER_TYPE_DESC type_desc, field_desc; ID3D12ShaderReflectionType *type, *field; ID3D12ShaderReflectionVariable *var; D3D12_SHADER_VARIABLE_DESC var_desc; - D3D12_SHADER_TYPE_DESC type_desc; vkd3d_test_push_context("Variable %u", j); @@ -1623,9 +1623,9 @@ static void test_reflection(void) vkd3d_test_push_context("Field %u", 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); - check_type_desc(&type_desc, &expect->field_types[k]); + check_type_desc(&field_desc, &expect->field_types[k]); vkd3d_test_pop_context(); }

1 0

Zebediah Figura : vkd3d-utils: Fix bounds comparison against element counts.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 68562d375e0fba682bf6bfa32397c43d210ef602 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/68562d375e0fba682bf6bfa32397c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 2 20:56:40 2024 -0500 vkd3d-utils: Fix bounds comparison against element counts. --- libs/vkd3d-utils/reflection.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-utils/reflection.c b/libs/vkd3d-utils/reflection.c index f4cc78bc..4f3a1a24 100644 --- a/libs/vkd3d-utils/reflection.c +++ b/libs/vkd3d-utils/reflection.c @@ -102,7 +102,7 @@ static ID3D12ShaderReflectionType * STDMETHODCALLTYPE d3d12_type_GetMemberTypeBy TRACE("iface %p, index %u.\n", iface, index); - if (index > type->desc.Members) + if (index >= type->desc.Members) { WARN("Invalid index %u.\n", index); return &null_type.ID3D12ShaderReflectionType_iface; @@ -301,7 +301,7 @@ static ID3D12ShaderReflectionVariable * STDMETHODCALLTYPE d3d12_buffer_GetVariab TRACE("iface %p, index %u.\n", iface, index); - if (index > buffer->desc.Variables) + if (index >= buffer->desc.Variables) { WARN("Invalid index %u.\n", index); return &null_variable.ID3D12ShaderReflectionVariable_iface; @@ -422,7 +422,7 @@ static struct ID3D12ShaderReflectionConstantBuffer * STDMETHODCALLTYPE d3d12_ref TRACE("iface %p, index %u.\n", iface, index); - if (index > reflection->desc.ConstantBuffers) + if (index >= reflection->desc.ConstantBuffers) { WARN("Invalid index %u.\n", index); return &null_buffer.ID3D12ShaderReflectionConstantBuffer_iface;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 2480eec98bf75fed34af39bbbe1fd9d2520ef674 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2480eec98bf75fed34af39bbbe1fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 27 17:30:51 2024 -0600 vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union. --- libs/vkd3d-shader/d3dbc.c | 10 +- libs/vkd3d-shader/fx.c | 8 +- libs/vkd3d-shader/hlsl.c | 45 +++++---- libs/vkd3d-shader/hlsl.h | 8 +- libs/vkd3d-shader/hlsl.y | 51 +++++----- libs/vkd3d-shader/hlsl_codegen.c | 64 ++++++------- libs/vkd3d-shader/hlsl_constant_ops.c | 170 +++++++++++++++++----------------- libs/vkd3d-shader/tpf.c | 74 +++++++-------- 8 files changed, 218 insertions(+), 212 deletions(-)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Use a switch in hlsl_types_are_equal().
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 4fd3f46109f95d6804c6f072416ef7a0c476a8d9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fd3f46109f95d6804c6f072416ef… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 27 17:20:28 2024 -0600 vkd3d-shader/hlsl: Use a switch in hlsl_types_are_equal(). --- libs/vkd3d-shader/hlsl.c | 102 ++++++++++++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 42 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index da7029c5..97da23c1 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -979,55 +979,73 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 if (t1->class != t2->class) return false; - if (t1->base_type != t2->base_type) - return false; - if (t1->class == HLSL_CLASS_SAMPLER || t1->class == HLSL_CLASS_TEXTURE || t1->class == HLSL_CLASS_UAV) - { - if (t1->sampler_dim != t2->sampler_dim) - return false; - if ((t1->class == HLSL_CLASS_TEXTURE || t1->class == HLSL_CLASS_UAV) - && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC - && !hlsl_types_are_equal(t1->e.resource.format, t2->e.resource.format)) - return false; - if (t1->class == HLSL_CLASS_UAV && t1->e.resource.rasteriser_ordered != t2->e.resource.rasteriser_ordered) - return false; - } - if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) - != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) - return false; - if (t1->dimx != t2->dimx) - return false; - if (t1->dimy != t2->dimy) - return false; - if (t1->class == HLSL_CLASS_STRUCT) - { - size_t i; - - if (t1->e.record.field_count != t2->e.record.field_count) - return false; - for (i = 0; i < t1->e.record.field_count; ++i) - { - const struct hlsl_struct_field *field1 = &t1->e.record.fields[i]; - const struct hlsl_struct_field *field2 = &t2->e.record.fields[i]; + switch (t1->class) + { + case HLSL_CLASS_SCALAR: + case HLSL_CLASS_VECTOR: + case HLSL_CLASS_MATRIX: + if (t1->base_type != t2->base_type) + return false; + if ((t1->modifiers & HLSL_MODIFIER_ROW_MAJOR) + != (t2->modifiers & HLSL_MODIFIER_ROW_MAJOR)) + return false; + if (t1->dimx != t2->dimx) + return false; + if (t1->dimy != t2->dimy) + return false; + return true; - if (!hlsl_types_are_equal(field1->type, field2->type)) + case HLSL_CLASS_UAV: + if (t1->e.resource.rasteriser_ordered != t2->e.resource.rasteriser_ordered) return false; + /* fall through */ + case HLSL_CLASS_TEXTURE: + if (t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + && !hlsl_types_are_equal(t1->e.resource.format, t2->e.resource.format)) + return false; + /* fall through */ + case HLSL_CLASS_SAMPLER: + if (t1->sampler_dim != t2->sampler_dim) + return false; + return true; - if (strcmp(field1->name, field2->name)) + case HLSL_CLASS_STRUCT: + if (t1->e.record.field_count != t2->e.record.field_count) return false; - } - } - if (t1->class == HLSL_CLASS_ARRAY) - return t1->e.array.elements_count == t2->e.array.elements_count - && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); - if (t1->class == HLSL_CLASS_TECHNIQUE) - { - if (t1->e.version != t2->e.version) - return false; + + for (size_t i = 0; i < t1->e.record.field_count; ++i) + { + const struct hlsl_struct_field *field1 = &t1->e.record.fields[i]; + const struct hlsl_struct_field *field2 = &t2->e.record.fields[i]; + + if (!hlsl_types_are_equal(field1->type, field2->type)) + return false; + + if (strcmp(field1->name, field2->name)) + return false; + } + return true; + + case HLSL_CLASS_ARRAY: + return t1->e.array.elements_count == t2->e.array.elements_count + && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); + + case HLSL_CLASS_TECHNIQUE: + return t1->e.version == t2->e.version; + + case HLSL_CLASS_DEPTH_STENCIL_VIEW: + case HLSL_CLASS_EFFECT_GROUP: + case HLSL_CLASS_PASS: + case HLSL_CLASS_PIXEL_SHADER: + case HLSL_CLASS_RENDER_TARGET_VIEW: + case HLSL_CLASS_STRING: + case HLSL_CLASS_VERTEX_SHADER: + case HLSL_CLASS_VOID: + return true; } - return true; + vkd3d_unreachable(); } struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old,

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_VERTEXSHADER into a separate class.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: 874937dab48aedbef1fa99cb2fa60fdcc0d804ac URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/874937dab48aedbef1fa99cb2fa60… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 17:33:26 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_VERTEXSHADER into a separate class. --- libs/vkd3d-shader/d3dbc.c | 6 ++++-- libs/vkd3d-shader/fx.c | 24 +++++++++++++++++------- libs/vkd3d-shader/hlsl.c | 7 ++++++- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl_codegen.c | 1 + libs/vkd3d-shader/tpf.c | 1 + 6 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/d3dbc.c b/libs/vkd3d-shader/d3dbc.c index aa235844..145ebd85 100644 --- a/libs/vkd3d-shader/d3dbc.c +++ b/libs/vkd3d-shader/d3dbc.c @@ -1518,6 +1518,7 @@ D3DXPARAMETER_CLASS hlsl_sm1_class(const struct hlsl_type *type) case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE: + case HLSL_CLASS_VERTEX_SHADER: return D3DXPC_OBJECT; case HLSL_CLASS_DEPTH_STENCIL_VIEW: case HLSL_CLASS_EFFECT_GROUP: @@ -1605,8 +1606,6 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) { case HLSL_TYPE_PIXELSHADER: return D3DXPT_PIXELSHADER; - case HLSL_TYPE_VERTEXSHADER: - return D3DXPT_VERTEXSHADER; default: vkd3d_unreachable(); } @@ -1621,6 +1620,9 @@ D3DXPARAMETER_TYPE hlsl_sm1_base_type(const struct hlsl_type *type) case HLSL_CLASS_STRING: return D3DXPT_STRING; + case HLSL_CLASS_VERTEX_SHADER: + return D3DXPT_VERTEXSHADER; + case HLSL_CLASS_DEPTH_STENCIL_VIEW: case HLSL_CLASS_EFFECT_GROUP: case HLSL_CLASS_PASS: diff --git a/libs/vkd3d-shader/fx.c b/libs/vkd3d-shader/fx.c index 168378e6..4f94f428 100644 --- a/libs/vkd3d-shader/fx.c +++ b/libs/vkd3d-shader/fx.c @@ -352,7 +352,6 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type) static const char * const object_type_names[] = { [HLSL_TYPE_PIXELSHADER] = "PixelShader", - [HLSL_TYPE_VERTEXSHADER] = "VertexShader", }; static const char * const texture_type_names[] = { @@ -392,11 +391,13 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type) case HLSL_CLASS_RENDER_TARGET_VIEW: return "RenderTargetView"; + case HLSL_CLASS_VERTEX_SHADER: + return "VertexShader"; + case HLSL_CLASS_OBJECT: switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: return object_type_names[type->base_type]; default: return type->name; @@ -440,6 +441,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: put_u32_unaligned(buffer, 2); break; @@ -532,18 +534,20 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co { put_u32_unaligned(buffer, 19); } + else if (type->class == HLSL_CLASS_VERTEX_SHADER) + { + put_u32_unaligned(buffer, 6); + } else if (type->class == HLSL_CLASS_OBJECT) { static const uint32_t object_type[] = { [HLSL_TYPE_PIXELSHADER] = 5, - [HLSL_TYPE_VERTEXSHADER] = 6, }; switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: put_u32_unaligned(buffer, object_type[type->base_type]); break; default: @@ -842,7 +846,6 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: hlsl_fixme(ctx, loc, "Write fx 2.0 parameter object type %#x.", type->base_type); return false; @@ -852,6 +855,7 @@ static bool is_type_supported_fx_2(struct hlsl_ctx *ctx, const struct hlsl_type case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: + case HLSL_CLASS_VERTEX_SHADER: hlsl_fixme(ctx, loc, "Write fx 2.0 parameter class %#x.", type->class); return false; @@ -1052,7 +1056,6 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: /* FIXME: write shader blobs, once parser support works. */ for (i = 0; i < elements_count; ++i) put_u32(buffer, 0); @@ -1064,6 +1067,13 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_ } break; + case HLSL_CLASS_VERTEX_SHADER: + /* FIXME: write shader blobs, once parser support works. */ + for (i = 0; i < elements_count; ++i) + put_u32(buffer, 0); + ++fx->shader_variable_count; + break; + default: hlsl_fixme(ctx, &ctx->location, "Writing initializer for object type %u is not implemented.", type->base_type); @@ -1153,13 +1163,13 @@ static bool is_object_variable(const struct hlsl_ir_var *var) case HLSL_CLASS_SAMPLER: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: return true; case HLSL_CLASS_OBJECT: switch (type->base_type) { case HLSL_TYPE_PIXELSHADER: - case HLSL_TYPE_VERTEXSHADER: return true; default: return false; diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 0b48b17d..20ae3a64 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -370,6 +370,7 @@ static void hlsl_type_calculate_reg_size(struct hlsl_ctx *ctx, struct hlsl_type case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_STRING: case HLSL_CLASS_TECHNIQUE: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VOID: break; } @@ -438,6 +439,7 @@ static bool type_is_single_component(const struct hlsl_type *type) case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: return true; case HLSL_CLASS_VECTOR: @@ -578,6 +580,7 @@ unsigned int hlsl_type_get_component_offset(struct hlsl_ctx *ctx, struct hlsl_ty case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: assert(idx == 0); break; @@ -956,6 +959,7 @@ unsigned int hlsl_type_component_count(const struct hlsl_type *type) case HLSL_CLASS_STRING: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: return 1; case HLSL_CLASS_EFFECT_GROUP: @@ -2382,6 +2386,7 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru case HLSL_CLASS_SAMPLER: case HLSL_CLASS_STRING: case HLSL_CLASS_TECHNIQUE: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VOID: break; } @@ -3558,7 +3563,6 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) {"vector", HLSL_CLASS_VECTOR, HLSL_TYPE_FLOAT, 4, 1}, {"matrix", HLSL_CLASS_MATRIX, HLSL_TYPE_FLOAT, 4, 4}, {"pixelshader", HLSL_CLASS_OBJECT, HLSL_TYPE_PIXELSHADER, 1, 1}, - {"vertexshader", HLSL_CLASS_OBJECT, HLSL_TYPE_VERTEXSHADER, 1, 1}, }; static const struct @@ -3685,6 +3689,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "RenderTargetView", HLSL_CLASS_RENDER_TARGET_VIEW)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "STRING", HLSL_CLASS_STRING)); hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "texture", HLSL_CLASS_TEXTURE)); + hlsl_scope_add_type(ctx->globals, hlsl_new_simple_type(ctx, "vertexshader", HLSL_CLASS_VERTEX_SHADER)); for (i = 0; i < ARRAY_SIZE(effect_types); ++i) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index ec3f5826..ac8ccd61 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -88,6 +88,7 @@ enum hlsl_type_class HLSL_CLASS_TECHNIQUE, HLSL_CLASS_TEXTURE, HLSL_CLASS_UAV, + HLSL_CLASS_VERTEX_SHADER, HLSL_CLASS_VOID, }; @@ -101,7 +102,6 @@ enum hlsl_base_type HLSL_TYPE_BOOL, HLSL_TYPE_LAST_SCALAR = HLSL_TYPE_BOOL, HLSL_TYPE_PIXELSHADER, - HLSL_TYPE_VERTEXSHADER, }; enum hlsl_sampler_dim diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 94acb70f..ff114c32 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -1628,6 +1628,7 @@ static bool copy_propagation_transform_load(struct hlsl_ctx *ctx, case HLSL_CLASS_SAMPLER: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_OBJECT: break; diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 708ab626..ffc0d9d5 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -3017,6 +3017,7 @@ static D3D_SHADER_VARIABLE_CLASS sm4_class(const struct hlsl_type *type) case HLSL_CLASS_TECHNIQUE: case HLSL_CLASS_TEXTURE: case HLSL_CLASS_UAV: + case HLSL_CLASS_VERTEX_SHADER: case HLSL_CLASS_VOID: break; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Ensure that the type is numeric before calling expr_common_base_type().
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: e904b4596a2f7d0b83d203cd03c5bec14f14c5e0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e904b4596a2f7d0b83d203cd03c5b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 7 13:37:53 2024 -0600 vkd3d-shader/hlsl: Ensure that the type is numeric before calling expr_common_base_type(). --- libs/vkd3d-shader/hlsl.y | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 0eed15c5..930929ad 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1386,10 +1386,6 @@ static bool expr_compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t static enum hlsl_base_type expr_common_base_type(enum hlsl_base_type t1, enum hlsl_base_type t2) { - if (t1 > HLSL_TYPE_LAST_SCALAR || t2 > HLSL_TYPE_LAST_SCALAR) { - FIXME("Unexpected base type.\n"); - return HLSL_TYPE_FLOAT; - } if (t1 == t2) return t1 == HLSL_TYPE_BOOL ? HLSL_TYPE_INT : t1; if (t1 == HLSL_TYPE_DOUBLE || t2 == HLSL_TYPE_DOUBLE) @@ -1593,13 +1589,13 @@ static struct hlsl_ir_node *add_unary_logical_expr(struct hlsl_ctx *ctx, struct static struct hlsl_type *get_common_numeric_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *arg1, const struct hlsl_ir_node *arg2, const struct vkd3d_shader_location *loc) { - enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); enum hlsl_type_class type; + enum hlsl_base_type base; unsigned int dimx, dimy; if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) return NULL; - + base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); return hlsl_get_numeric_type(ctx, type, base, dimx, dimy); } @@ -1636,14 +1632,15 @@ static struct hlsl_ir_node *add_binary_comparison_expr(struct hlsl_ctx *ctx, str const struct vkd3d_shader_location *loc) { struct hlsl_type *common_type, *return_type; - enum hlsl_base_type base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); enum hlsl_type_class type; + enum hlsl_base_type base; unsigned int dimx, dimy; struct hlsl_ir_node *args[HLSL_MAX_OPERANDS] = {0}; if (!expr_common_shape(ctx, arg1->data_type, arg2->data_type, loc, &type, &dimx, &dimy)) return NULL; + base = expr_common_base_type(arg1->data_type->base_type, arg2->data_type->base_type); common_type = hlsl_get_numeric_type(ctx, type, base, dimx, dimy); return_type = hlsl_get_numeric_type(ctx, type, HLSL_TYPE_BOOL, dimx, dimy);

1 0

Zebediah Figura : vkd3d-shader/hlsl: Make HLSL_TYPE_PIXELSHADER into a separate class.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: vkd3d Branch: master Commit: d9f7a883295141a35de9a7e0b4e6c2d2744c525e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d9f7a883295141a35de9a7e0b4e6c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 19:41:15 2024 -0600 vkd3d-shader/hlsl: Make HLSL_TYPE_PIXELSHADER into a separate class. --- libs/vkd3d-shader/d3dbc.c | 15 +++----- libs/vkd3d-shader/fx.c | 76 ++++++---------------------------------- libs/vkd3d-shader/hlsl.c | 12 +++---- libs/vkd3d-shader/hlsl.h | 4 +-- libs/vkd3d-shader/hlsl_codegen.c | 2 +- libs/vkd3d-shader/tpf.c | 2 +- 6 files changed, 23 insertions(+), 88 deletions(-)

1 0

Fotios Valasiadis : ntdll/unix: Fix building on musl by explicitly including asm/ioctls.h.
by Alexandre Julliard May 6, 2024

May 6, 2024

Module: wine Branch: master Commit: 24ca848c568d5a2786abd26f2e7314b2e3f509f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314… Author: Fotios Valasiadis <fvalasiad(a)gmail.com> Date: Sun May 5 03:34:57 2024 +0300 ntdll/unix: Fix building on musl by explicitly including asm/ioctls.h. After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer build on musl. Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h. A little digging shows that glibc goes ahead and includes asm/ioctls.h in sys/ioctl.h, providing said macro. Musl on the other hand doesn't and relies on bits/ioctl.h, which lacks said macro. Signed-off-by: Fotios Valasiadis <fvalasiad(a)gmail.com> --- dlls/ntdll/unix/serial.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/serial.c b/dlls/ntdll/unix/serial.c index d48c49c87f6..bb8d52cc627 100644 --- a/dlls/ntdll/unix/serial.c +++ b/dlls/ntdll/unix/serial.c @@ -33,6 +33,7 @@ #include <stdio.h> #ifdef HAVE_ASM_TERMBITS_H # include <asm/termbits.h> +# include <asm/ioctls.h> #else # include <termios.h> #endif

1 0