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

Compare commits

base: wine:vkd3d-1.11
Branches Tags
wine:master wine:vkd3d-1.7.x
wine:vkd3d-1.15 wine:vkd3d-1.14 wine:vkd3d-1.13 wine:vkd3d-1.12 wine:vkd3d-1.11 wine:vkd3d-1.10 wine:vkd3d-1.9 wine:vkd3d-1.8 wine:vkd3d-1.7.1 wine:vkd3d-1.7 wine:vkd3d-1.6 wine:vkd3d-1.5 wine:vkd3d-1.4 wine:vkd3d-1.3 wine:vkd3d-1.2 wine:vkd3d-1.1 wine:vkd3d-1.0 wine:vkd3d-0.0.1
..
compare: wine:vkd3d-1.13
Branches Tags
wine:master wine:vkd3d-1.7.x
wine:vkd3d-1.15 wine:vkd3d-1.14 wine:vkd3d-1.13 wine:vkd3d-1.12 wine:vkd3d-1.11 wine:vkd3d-1.10 wine:vkd3d-1.9 wine:vkd3d-1.8 wine:vkd3d-1.7.1 wine:vkd3d-1.7 wine:vkd3d-1.6 wine:vkd3d-1.5 wine:vkd3d-1.4 wine:vkd3d-1.3 wine:vkd3d-1.2 wine:vkd3d-1.1 wine:vkd3d-1.0 wine:vkd3d-0.0.1

864 Commits
vkd3d-1.11 ... vkd3d-1.13

Author SHA1 Message Date
Henri Verbeet
0e72aba0bc Release 1.13. 2024-08-29 12:08:46 +02:00
Elizabeth Figura
eb71a1722a vkd3d-shader: Use an extended version of vkd3d_shader_immediate_constant in vkd3d_shader_parameter1. 
This is a proposed API change in 946, which won't make it into this release.

The intent is to allow slightly larger constants to be specified in the updated
vkd3d_shader_parameter1 structure. In particular, this is large enough to pass
4-dimensional integer or float vectors inline, which the proposed clip plane
implementation will use, as well as other Direct3D FFP parameters.

We could also simply add vkd3d_shader_immediate_constant1 as a separate union
member in vkd3d_shader_parameter1, but this API is a bit cleaner and simpler.
 2024-08-28 12:08:37 +02:00
Henri Verbeet
f318e565f2 vkd3d-shader/spirv: Decorate non-array descriptor variables as well. 
Commits 343c7942e1 and
94c74d2c00 moved applying the NonReadable
and Coherent decorations from spirv_compiler_emit_resource_declaration()
to spirv_compiler_build_descriptor_variable(), but unfortunately missed
the non-array path in the latter function.

The missing NonReadable decoration causes segmentation faults in
rasteriser-ordered-views.shader_test (among others) on my Intel SKL GT2
setup in particular.
 2024-08-26 11:24:01 +02:00
Conor McCarthy
80e607e3e7 vkd3d: Free descriptor range information on error paths in d3d12_root_signature_info_from_desc(). (Valgrind) 
Fixes memory leaks in test_create_root_signature().
 2024-08-26 11:20:54 +02:00
Henri Verbeet
32dc7ff43b build: Actually run bitwise-assignment.shader_test. 
Also fix the order of a couple of tests while we're touching this.
 2024-08-22 16:32:40 +02:00
Francisco Casas
f5ed0d9efd tests/test-driver: Avoid double space when printing details. 
Save screen real estate.
 2024-08-22 16:22:29 +02:00
Francisco Casas
b701f8d393 tests/shader_runner: Explicitly require UAV load support. 
The used UAV formats are explicitly added in the [require] section of
every test that uses them.

Some of these tests were failing on Intel UHD graphics 770 because of
missing support for additional UAV load types, explicitly requiring
these formats allows these tests to be skipped.
 2024-08-22 16:22:18 +02:00
Francisco Casas
fb153bf5d4 tests/shader_runner: Don't skip shader compilation on missing caps. 
Currently we are skipping compilation tests ([* shader] blocks) on
missing capabilities. This is not really necessary and it is useful to
test shader compilation even on machines that can't run these tests.

So, this commit moves the checks to the [test] blocks, skipping them
entirely when caps are not met.

To make the effects of enum test_action values more explicit, these
are renamed to TEST_ACTION_SKIP_COMPILATION and
TEST_ACTION_SKIP_EXECUTION.
 2024-08-22 16:01:37 +02:00
Francisco Casas
19c23ca6f2 tests/shader_runner: Replace spaces with dashes in format names. 
Probably good if we want to allow specifying several formats in the same
line, separated by spaces.

While at it, rename "r32g32 int" to "r32g32-sint".
 2024-08-22 16:01:37 +02:00
Francisco Casas
cec62c54ad tests/shader_runner: Move parse_format() up. 2024-08-22 16:01:32 +02:00
Francisco Casas
164076d176 tests/shader_runner: Require explicit formats for UAV resources. 
The current default is r32g32b32a32 but it requires special support
which is not available on all GPUs, so it is not a very convenient
default.

Instead of changing the default making it different from RTV resoures,
the format is required to always be explicit for UAVs.

The exceptions are counter_buffer and buffers with "stride", which don't
require a format because it is already implied.
 2024-08-22 16:01:26 +02:00
Conor McCarthy
738ecc9eb1 vkd3d-shader/spirv: Free the spirv parameter info. 2024-08-20 21:27:58 +02:00
Francisco Casas
56cd64ccba tests: Test shader compilation with default values. 2024-08-20 21:26:26 +02:00
Francisco Casas
9fa8921b50 tests: Test shader compilation within braces. 2024-08-20 21:26:26 +02:00
Francisco Casas
1d24587405 tests: Test compile syntax on effects. 2024-08-20 21:26:26 +02:00
Francisco Casas
e9260bba3a tests: Test shader compilation within function definitions. 2024-08-20 21:26:26 +02:00
Francisco Casas
7363fd2816 tests: Add additional tests for function calls in state block rhs. 2024-08-20 21:26:26 +02:00
Francisco Casas
becdcec147 vkd3d-shader: Avoid div by zero on assert in vkd3d_calloc() (ubsan). 2024-08-20 21:26:26 +02:00
Anna (navi) Figueiredo Gomes
94c74d2c00 vkd3d-shader/spirv: Avoid decorating variables multiple times with Coherent. 2024-08-20 21:25:15 +02:00
Anna (navi) Figueiredo Gomes
a47c23fa1f vkd3d-shader/spirv: Use unique SPIR-V variables for descriptors where visibility differs. 
In the case two uav descriptors are mapped to the same variable, and one is
read from while the other is not, the variable would get the NonReadable
decorator, while being read from later.
 2024-08-20 21:23:31 +02:00
Anna (navi) Figueiredo Gomes
343c7942e1 vkd3d-shader/spirv: Avoid decorating variables multiple times with NonReadable. 
The existing code reuses the same SPIR-V variable for all descriptors mapped to
the same Vulkan binding, and applies the NonReadable decoration based on the
VKD3D_SHADER_DESCRIPTOR_INFO_FLAG_UAV_READ only. This potentially causes the
decoration to be applied twice, should two non-read descriptors be mapped to
the same variable, which isn't allowed in SPIR-V, and the validator complains.
 2024-08-20 21:20:33 +02:00
Nikolay Sivov
c8cc1b1a24 vkd3d-shader/fx: Fix the matrix type class for fx_2_0. 
CTAB type correctly reflects matrix majority, unlike effects
type data that does not respond to majority modifiers at all.
It doesn't transpose default values either.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-19 14:21:59 +02:00
Nikolay Sivov
b9e894f232 include: Fix a few typos in the IDL files. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-19 14:20:28 +02:00
Nikolay Sivov
f0a2e4bc25 vkd3d-shader/glsl: Fix a typo in a few messages. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-19 14:20:21 +02:00
Nikolay Sivov
d1b8a7e745 vkd3d: Fix a few typos in the comments. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-19 14:17:41 +02:00
Petrichor Park
4467c655f0 vkd3d-shader/hlsl: Factor out add_binary_expr() and use it for assignment operators. 
This fixes a lot of internal compiler errors with assignment operators,
especially bitwise ones. The bitwise-assignment test has the motivating
examples.
 2024-08-19 14:15:43 +02:00
Nikolay Sivov
ebc039d128 vkd3d-shader/fx: Resolve NULL values for SamplerState.Texture field. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-15 17:53:46 +02:00
Nikolay Sivov
873b182021 vkd3d-shader/fx: Support NULL constants for object fields. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-15 17:53:46 +02:00
Nikolay Sivov
c3075d6fb4 vkd3d-shader/hlsl: Adjust NULL type properties to make it usable in transformations. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-15 17:53:46 +02:00
Nikolay Sivov
aa0ea548e4 vkd3d-shader/fx: Handle SetPixelShader() and SetVertexShader(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-15 17:53:46 +02:00
Nikolay Sivov
2c533e494a vkd3d-shader/fx: Handle SetBlendState(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-15 17:53:46 +02:00
Anna (navi) Figueiredo Gomes
16e9872718 vkd3d: Use D3D12_SHADER_VISIBILITY_ALL for 32-bit root constants when using vk_heaps. 
The existing code sets "stageFlags" to VK_SHADER_STAGE_ALL when
"use_vk_heaps" is true, but doesn't adjust the visibility. This
potentially violates the "Any two elements of pPushConstantRanges must
not include the same stage in stageFlags" constraint, and causes the
validation layers to complain accordingly.
 2024-08-15 17:53:46 +02:00
Anna (navi) Figueiredo Gomes
6226f533af Add a .editorconfig file. 2024-08-14 22:05:59 +02:00
Nikolay Sivov
60ce81112b vkd3d-shader/fx: Support string annotations for fx_4+. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-14 22:00:35 +02:00
Nikolay Sivov
d4ae844bb6 vkd3d-shader/fx: Enable writing string objects for fx_4+. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-14 22:00:35 +02:00
Nikolay Sivov
89be723ad7 vkd3d-shader/hlsl: Treat "string" type name as case-insensitive. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-14 22:00:35 +02:00
Nikolay Sivov
1ce68cee2c vkd3d-shader/hlsl: Tokenize 'String' the same as 'string'. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-14 22:00:35 +02:00
Francisco Casas
412f91a14c vkd3d-shader/hlsl: Always work with the extern resource's component type. 
We need to distinguish between the data type of a resource and the data
type of its components. These are usually the same except for 4.0
profiles where an array (or multi-dimensional array) of resources is
still considered a single resource, so it is possible for it to hold
more than one component.

In the latter case, we often need to access the type of a single
component (all components have the same type) instead of the type of the
whole array which often doesn't contain the required information, such
as sampler dimension.

This patch replaces the extern_resource.data_type field with the
extern_resource.component_type field, which points to the type of a
single component in the resource. Using it relieves many other code
paths from considering the possibility of the resource being an array.

This fixes runtime errors reported by UBSan, such as this:

    vkd3d/libs/vkd3d-shader/tpf.c:6075:87: runtime error: load of value 7, which is not a valid value for type '_Bool'

when trying to compile shaders that contain UAV arrays on 4.0 profiles.

Before this commit, tpf.c accesses the

    hlsl_type->e.resource.rasteriser_ordered

field, but on 4.0 and 4.1 profiles these code paths can also be reached
by UAV arrays which are HLSL_CLASS_ARRAY and this field is not supposed
to be accessed.

By coincidence, the value of hlsl_type->e.array.elements_count was being
read because these fields have the same offset in the hlsl_type.e union.
 2024-08-14 21:57:21 +02:00
Henri Verbeet
9cf479d4bb vkd3d: Do not include assert.h. 2024-08-13 21:20:28 +02:00
Henri Verbeet
114578fc8a vkd3d-shader/fx: Replace assert() with VKD3D_ASSERT(). 2024-08-13 21:20:28 +02:00
Henri Verbeet
cd9879f237 vkd3d-common: Replace assert() with VKD3D_ASSERT(). 2024-08-13 21:20:28 +02:00
Francisco Casas
355d4c4a86 vkd3d-shader/hlsl: Skip writing string default values. 
This causes a crash in the native compiler, but can only happen in
ps_5_0 were it is possible to declare structs that are both used in the
shader and contain strings.

    struct
    {
        float a;
        string b;
    } apple = {1, "foobar"};

    float4 main() : sv_target
    {
        return apple.a;
    }

In our case, hlsl_type_get_component_offset() triggered an assertion
failure because it does not expect the string type. So this is replaced
by an hlsl_error().
 2024-08-13 21:19:04 +02:00
Francisco Casas
094e298c1c vkd3d-shader/hlsl: Parse string default values. 2024-08-13 21:19:01 +02:00
Francisco Casas
f8108a4753 tests: Add additional string tests. 2024-08-13 21:16:46 +02:00
Nikolay Sivov
e0b5fe1288 vkd3d-shader/hlsl: Add a test for assigning to DSV and RTV variables. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-13 21:11:48 +02:00
Nikolay Sivov
b4d957f848 vkd3d-shader/hlsl: Handle NULL constants. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-13 21:10:45 +02:00
Nikolay Sivov
d945d5e78c vkd3d-shader/hlsl: Check MS texture declaration without sample count only for used variables. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-13 21:10:29 +02:00
Anna (navi) Figueiredo Gomes
80b2a2eb55 vkd3d-shader/ir: Periodically flush buffers when tracing blocks. 
Avoids overflowing the output buffer for the trace in cases where the
output is too long, which raises an exception.
 2024-08-12 14:19:13 +02:00
Nikolay Sivov
b0ca3627bf vkd3d-shader/fx: Turn assignments to arrays to element assignments for certain states. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
25e1c3e374 vkd3d-shader/fx: Explicitly handle bool values in state entries. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
c81223d086 vkd3d-shader/fx: Handle states of a BlendState object. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
2affc8f5c5 vkd3d-shader/fx: Run full set of constants passes on state block entries values. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
f1e65ecc83 vkd3d-shader/fx: Enable writing BlendState variables. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
91e88fac2e vkd3d-shader/hlsl: Add parser support for BlendState type. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
1be0d99b76 vkd3d-shader/fx: Check destination array index when checking for duplicate state entries. 2024-08-12 14:15:14 +02:00
Nikolay Sivov
b23874dad6 vkd3d-shader/hlsl: Add parser support for GeometryShader type. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-08 23:42:37 +02:00
Nikolay Sivov
de48960b33 vkd3d-shader/fx: Add support for the OMSetRenderTargets() state. 2024-08-08 23:42:37 +02:00
Nikolay Sivov
c565a60b9e vkd3d-shader/fx: Add an array size field to the states description table. 2024-08-08 23:42:37 +02:00
Nikolay Sivov
d55a709992 vkd3d-shader/fx: Use more descriptive names for FX-specific types. 2024-08-08 23:42:37 +02:00
Nikolay Sivov
9fb23b9090 vkd3d-shader/fx: Handle "Texture" field of the sampler state objects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-08 23:42:37 +02:00
Giovanni Mascellani
8b6ab9627d vkd3d-shader: Replace assert() with VKD3D_ASSERT() in vkd3d_shader_private.h. 2024-08-08 23:39:23 +02:00
Giovanni Mascellani
27bceec965 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in vkd3d_shader_main.c. 2024-08-08 23:39:23 +02:00
Giovanni Mascellani
0294aa62f3 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in tpf.c. 2024-08-08 23:38:02 +02:00
Giovanni Mascellani
d5126b4d98 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in spirv.c. 2024-08-08 23:36:23 +02:00
Victor Chiletto
8c3a5e5458 vkd3d-shader/hlsl: Implement f16tof32 intrinsic. 2024-08-08 23:35:02 +02:00
Victor Chiletto
693e89c74e vkd3d-shader/hlsl: Push a new scope when compiling internal functions. 
This allows for typedef usage without interfering with user code.
Thanks Zeb for the suggestion.
 2024-08-08 23:35:02 +02:00
Francisco Casas
016be7e591 vkd3d-shader/hlsl: Lower non-constant row_major matrix loads for SM1. 2024-08-08 23:33:33 +02:00
Francisco Casas
87f01f5205 vkd3d-shader/hlsl: Remove SM1 fixme for matrix writemasks. 
hlsl_ir_store instructions don't use writemasks for whole matrices.
 2024-08-08 23:32:03 +02:00
Francisco Casas
9f515a9daa vkd3d-shader/hlsl: Lower non-constant array loads for SM1. 
This is achieved by means of creating a variable storing zero,
loading every array element, comparing if the non-constant index
matches the index of that element at runtime, and in that case
store the corresponding element in the variable.

This seems to be the same strategy that the native compiler uses.
 2024-08-08 23:30:39 +02:00
Francisco Casas
e0cfd8f86a tests: Add additional non-constant array indexing tests. 2024-08-08 23:28:31 +02:00
Francisco Casas
eb2d320596 vkd3d-shader/hlsl: Avoid dereferencing rel_offset if it is NULL. 
We are currently using &offset_node->loc when offset_node is NULL.

A NULL dereference of rel_offset can also happen if
hlsl_offset_from_deref() fails because the dereference is out of
bounds.
 2024-08-08 23:28:31 +02:00
Francisco Casas
51abec8c99 tests: Introduce VKD3D_TEST_DETAILED for the test driver. 
Useful to know which tests on which backends were skipped.
 2024-08-07 15:54:36 +02:00
Francisco Casas
9dec7403d9 tests/shader-runner: Add missing trace for wave_ops caps. 2024-08-07 15:54:36 +02:00
Francisco Casas
2efc79bb81 tests: Report tests skipped because of missing capabilities. 2024-08-07 15:54:36 +02:00
Francisco Casas
84676c378f tests: Add missing double precission require directives. 
Otherwise these tests fail on Intel UHD Graphics 770.
 2024-08-07 15:54:36 +02:00
Francisco Casas
e8354ac499 vkd3d-shader/hlsl: Parse string type. 2024-08-07 15:53:07 +02:00
Francisco Casas
652db433e1 vkd3d-shader/hlsl: Parse string escape sequences. 2024-08-07 15:51:43 +02:00
Francisco Casas
090df488ba vkd3d-shader/hlsl: Parse string constants. 2024-08-07 15:48:59 +02:00
Francisco Casas
4b2e847d11 tests: Test string escape sequences. 2024-08-07 15:45:24 +02:00
Nikolay Sivov
c44a18b3d1 vkd3d-shader/fx: Add support for SetDomainShader(), SetComputeShader(), and SetHullShader() states. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-06 16:54:19 +02:00
Nikolay Sivov
1559237780 vkd3d-shader/fx: Fix state block entry array shifting when decomposing. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-06 16:54:19 +02:00
Nikolay Sivov
7c3677b114 vkd3d-shader/hlsl: Add parser support for ComputeShader, DomainShader, and HullShader types. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-06 16:54:19 +02:00
Nikolay Sivov
2cbad81b55 vkd3d-shader/fx: Handle SetRasterizerState(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-06 16:54:19 +02:00
Giovanni Mascellani
784e69a366 vkd3d: Check the entire root signature for register conflicts. 
Not just each descriptor table individually.
 2024-08-06 16:53:06 +02:00
Nikolay Sivov
a3f4785720 vkd3d-shader/fx: Decompose function-style state assignments to individual states. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-08-05 16:01:33 +02:00
Stefan Dösinger
d4c2a7f22b vkd3d: Pass a proper struct shader_cache_key * to rb_put() in vkd3d_shader_cache_add_entry(). 2024-08-05 15:59:53 +02:00
Giovanni Mascellani
46aec9fba8 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in preproc.y. 2024-08-05 15:57:56 +02:00
Giovanni Mascellani
625327653b vkd3d-shader: Replace assert() with VKD3D_ASSERT() in preproc.l. 2024-08-05 15:57:56 +02:00
Giovanni Mascellani
351220f182 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in preproc.h. 2024-08-05 15:57:56 +02:00
Giovanni Mascellani
4a04324ecc vkd3d-shader: Replace assert() with VKD3D_ASSERT() in ir.c. 2024-08-05 15:57:56 +02:00
Giovanni Mascellani
5e1ae5aaa3 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in hlsl.y. 2024-08-05 15:57:56 +02:00
Giovanni Mascellani
97a7ec8914 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in hlsl.h. 2024-08-05 15:57:56 +02:00
Conor McCarthy
969cae8b67 vkd3d: Add support for the ID3D12CommandList6 interface. 2024-08-05 15:56:09 +02:00
Giovanni Mascellani
9ff5b2ce7a vkd3d-shader: Replace assert() with VKD3D_ASSERT() in hlsl.c. 2024-08-01 15:18:15 +02:00
Giovanni Mascellani
4e7d0faaf0 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in hlsl_constant_ops.c. 2024-08-01 15:18:15 +02:00
Giovanni Mascellani
eff30577af vkd3d-shader: Replace assert() with VKD3D_ASSERT() in hlsl_codegen.c. 2024-08-01 15:18:15 +02:00
Giovanni Mascellani
02ef731b9a vkd3d-shader: Replace assert() with VKD3D_ASSERT() in fx.c. 2024-08-01 15:18:15 +02:00
Giovanni Mascellani
7d3e8f49e4 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in dxil.c. 2024-08-01 15:18:15 +02:00
Francisco Casas
e6e82ad3f6 vkd3d-shader/hlsl: Add missing src1 and src2 constants to sincos on SM2. 
The sincos instruction expects two specific constants on 2.0 and 2.1 profiles.

Consider the following shader:

    uniform float u;
    float4 main() : sv_target
    {
        return sin(u);
    }

On native, with ps_2_0, this compiles as:

    ps_2_0
    def c3, 0.159154937, 0.5, 6.28318548, -3.14159274
    def c1, -1.55009923e-006, -2.17013894e-005, 0.00260416674, 0.00026041668
    def c2, -0.020833334, -0.125, 1, 0.5
    mov r0.xy, c3
    mad r0.x, c0.x, r0.x, r0.y
    frc r0.x, r0.x
    mad r0.x, r0.x, c3.z, c3.w
    sincos r1.y, r0.x, c1, c2
    mov r0, r1.y
    mov oC0, r0

We are not emitting the src1 and src2 constant arguments before this
patch.
 2024-07-31 22:22:38 +02:00
Giovanni Mascellani
9f4a568868 tests: Mark a couple of tests as working on recent NVIDIA GPUs. 
I don't know the exact version that fixed this todo, but on the
same hardware this test was failing a couple of years ago, so
I presume something was fixed at some point. I am writing my
current driver version, but a lower one might turn out to be
sufficient.
 2024-07-31 20:50:58 +02:00
Giovanni Mascellani
4094e5dbeb vkd3d-shader: Replace assert() with VKD3D_ASSERT() in dxbc.c. 2024-07-30 16:32:59 +02:00
Giovanni Mascellani
bcffcb4a29 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in d3dbc.c 2024-07-30 16:32:59 +02:00
Giovanni Mascellani
8e08fa6bf2 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in d3d_asm.c. 2024-07-30 16:32:59 +02:00
Giovanni Mascellani
5af138b247 vkd3d-shader: Replace assert() with VKD3D_ASSERT() in checksum.c. 2024-07-30 16:32:59 +02:00
Giovanni Mascellani
ba381497cc vkd3d-common: Remove an assertion in vkd3d_dbg_printf(). 
We want to get rid of assertions and only use the new VKD3D_ASSERT(),
but this cannot be done here, because a failing VKD3D_ASSERT() would
call back again to vkd3d_dbg_printf().

At the same time the asserted condition should be simple enough to
debug even without the assertion, since logging with a bad level
will likely result in either a crash or writing garbage to the log.
 2024-07-30 16:32:59 +02:00
Atharva Nimbalkar
2170fdc633 vkd3d-shader/glsl: Implement support for VKD3DSPR_TEMP registers. 2024-07-30 16:31:59 +02:00
Atharva Nimbalkar
337a030908 vkd3d-shader/glsl: Implement VKD3DSIH_MOV. 2024-07-30 16:31:59 +02:00
Henri Verbeet
c7589d8f19 vkd3d-shader/ir: Remove VKD3DSIH_DCL_SAMPLER instructions. 2024-07-30 16:31:44 +02:00
Henri Verbeet
fffe521b80 vkd3d-shader/ir: Remove VKD3DSIH_DCL instructions. 2024-07-30 16:31:44 +02:00
Giovanni Mascellani
240d31c793 vkd3d: Replace assert() with VKD3D_ASSERT() in vkd3d_private.h. 2024-07-29 19:12:13 +02:00
Giovanni Mascellani
529647142c vkd3d: Replace assert() with VKD3D_ASSERT() in utils.c. 2024-07-29 19:12:13 +02:00
Giovanni Mascellani
bd75396b38 vkd3d: Replace assert() with VKD3D_ASSERT() in state.c. 2024-07-29 19:12:13 +02:00
Giovanni Mascellani
02b898bec0 vkd3d: Replace assert() with VKD3D_ASSERT() in resource.c. 2024-07-29 19:12:13 +02:00
Giovanni Mascellani
150bf69da9 vkd3d: Replace assert() with VKD3D_ASSERT() in command.c. 2024-07-29 19:12:13 +02:00
Giovanni Mascellani
507cc2976f tests: Test register conflicts in a root signature. 2024-07-29 13:19:10 +02:00
Giovanni Mascellani
51b65688e1 ci: Abort on assertions on the CI. 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
fb55c2b227 vkd3d: Emit an ERR() when reaching unreachable code. 
This way the ERR() configuration is reused for unreachable code.
 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
4ada72a397 vkd3d: Allow aborting on ERR(). 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
d7fc2693c4 vkd3d: Introduce a softer form of assertion. 
Triggering an ERR() instead of aborting the program.
 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
a484063cd2 vkd3d: Introduce debug severity MESSAGE. 
That's intended for messages that it's pretty important that the
user receives, but that are not proper error messages.
 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
021a7f030a vkd3d: Allow disabling ERR() by defining VKD3D_NO_ERROR_MESSAGES. 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
60ecf8c12b vkd3d: Disable FIXME_ONCE() when VKD3D_NO_DEBUG_MESSAGES is defined. 
Similarly to FIXME().
 2024-07-29 13:17:19 +02:00
Giovanni Mascellani
4c1cc6101f vkd3d: Disable WARN_ON() when VKD3D_NO_DEBUG_MESSAGES is defined. 
Similarly to WARN().
 2024-07-29 13:17:19 +02:00
Elizabeth Figura
947b937a1a tests: Test shade mode. 2024-07-24 16:08:10 +02:00
Elizabeth Figura
ae5cd6573f vkd3d-shader: Allow controlling d3d color shade mode through vkd3d-shader parameters. 2024-07-24 16:08:10 +02:00
Elizabeth Figura
d20d0fc69f vkd3d-shader: Use the program parameters in spirv_compiler_alloc_spec_constant_id(). 2024-07-24 16:07:13 +02:00
Victor Chiletto
a0de05f0b4 vkd3d-shader/hlsl: Implement the asint() intrinsic. 2024-07-24 16:06:03 +02:00
Nikolay Sivov
91dce79227 vkd3d-shader/fx: Correct one of the object counters in the fx_2_0 header. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-24 16:04:21 +02:00
Elizabeth Figura
97cd941710 vkd3d-shader: Do not make the alpha test ref parameter VSIR_DIMENSION_VEC4. 2024-07-23 21:12:28 +02:00
Elizabeth Figura
1db7c03185 vkd3d-shader/spirv: Pass a vkd3d_data_type to spirv_compiler_emit_shader_parameter(). 2024-07-23 21:11:15 +02:00
Elizabeth Figura
f6dd6d52b3 vkd3d-shader: Factor out a vsir_program_get_parameter() helper. 2024-07-23 21:10:00 +02:00
Elizabeth Figura
6b58b6f261 vkd3d-shader/spirv: Allocate output_info after normalization. 
Normalization may change the signatures.
 2024-07-23 21:09:00 +02:00
Shaun Ren
49caeee1fd vkd3d-shader/hlsl: Support default values for function parameters. 2024-07-23 15:36:32 +02:00
Nikolay Sivov
29699d3d22 vkd3d-shader/fx: Set total pass count for fx_2_0. 
Binaries with that field set incorrectly fail to load on Windows.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-23 15:23:54 +02:00
Nikolay Sivov
dcf4ce753b vkd3d-shader/fx: Correct empty pass check. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-23 15:23:54 +02:00
Nikolay Sivov
958117df2f vkd3d-shader/hlsl: Allow annotations on global variables. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-23 15:23:54 +02:00
Giovanni Mascellani
ba0fec4c51 vkd3d: Propagate errors out of d3d12_root_signature_append_vk_binding(). 2024-07-22 16:01:37 +02:00
Giovanni Mascellani
4b7fe26b33 vkd3d: Remove the temporary pointers in vkd3d_physical_device_info_init(). 
They were rather pointless now.
 2024-07-22 16:00:28 +02:00
Giovanni Mascellani
75c64e55cd vkd3d: Rebuild the vkd3d_physical_device_info chain before creating the device. 
vkd3d might decide to disable some extensions after the chain is created,
so the chain must be recreated with only the structures corresponding to
enabled extensions.
 2024-07-22 16:00:28 +02:00
Giovanni Mascellani
7eb63a7c0d vkd3d: Document how to install "Graphics Tools" to use the Agility SDK. 
This is a required step, otherwise the debug layer will not work.
 2024-07-17 15:54:31 +02:00
Giovanni Mascellani
7e557420b1 tests: Terminate the Agility SDK path with a slash. 
That's what the documentation recommends. It used to work for me without
the slash, but maybe they changed something in recent versions.
 2024-07-17 15:54:31 +02:00
Giovanni Mascellani
e4e7368c1c tests: Pad the constant buffer in test_update_compute_descriptor_tables() to 256 bytes. 
The D3D12 debug layer signals an error otherwise.
 2024-07-17 15:53:31 +02:00
Giovanni Mascellani
a876e0b192 vkd3d: Allocate temporary arrays on the stack in d3d12_command_list_update_push_descriptors(). 2024-07-17 15:52:37 +02:00
Conor McCarthy
ae0faf4500 vkd3d: Limit the workgroup X count for buffer UAV clears to the supported max. 2024-07-17 15:51:39 +02:00
Conor McCarthy
3e25356abb tests: Add a test for clearing a large buffer UAV. 
Large buffers can exceed the maximum workgroup X count.
 2024-07-17 15:51:39 +02:00
Conor McCarthy
15f8657d74 vkd3d: Create a descriptor pool for static samplers when Vulkan-backed heaps are used. 
Static samplers may be allocated from these pools.
 2024-07-17 15:50:24 +02:00
Shaun Ren
0202393d41 vkd3d-shader/d3dbc: Implement HLSL_OP1_{COS,SIN}_REDUCED for SM1. 
Also enable SM1 trigonometry function tests.
 2024-07-16 19:03:52 +02:00
Shaun Ren
ea2ffc0b6c vkd3d-shader/hlsl: Allocate registers for HLSL_OP1_{COS,SIN}_REDUCED with the required writemasks. 2024-07-16 19:02:01 +02:00
Shaun Ren
8724cbe5d5 vkd3d-shader/d3dbc: Implement HLSL_OP3_MAD for SM1. 2024-07-16 18:56:44 +02:00
Shaun Ren
b4845b9dca vkd3d-shader/hlsl: Implement sin/cos for SM1. 
Also introduce HLSL_OP3_MAD.
 2024-07-16 18:55:22 +02:00
Shaun Ren
b3a11a9ec4 vkd3d-shader/ir: Lower SM1 SINCOS to SM4 SINCOS. 2024-07-16 15:24:58 +02:00
Elizabeth Figura
5a53b73995 tests: Test alpha test. 2024-07-11 17:02:53 +02:00
Elizabeth Figura
7e868f1f4b tests: Factor out a set_default_target() helper. 2024-07-11 17:02:45 +02:00
Elizabeth Figura
ded0733ff8 tests: Offset the viewport by 0.5 when running d3dbc shaders. 2024-07-11 17:02:40 +02:00
Elizabeth Figura
806363b765 vkd3d-shader: Allow controlling alpha test through vkd3d-shader parameters. 2024-07-11 17:02:11 +02:00
Elizabeth Figura
c2ce15b623 vkd3d-shader/spirv: Respect VKD3D_SHADER_CONDITIONAL_OP_Z when discard has a bool argument. 2024-07-11 16:59:06 +02:00
Elizabeth Figura
9e59e57cb3 tests: Add a test for the vkd3d_shader_parameter APIs. 2024-07-11 16:58:56 +02:00
Elizabeth Figura
e8bdac8147 vkd3d-shader/spirv: Support passing shader parameters through uniform buffers. 2024-07-11 16:58:52 +02:00
Elizabeth Figura
3dff608bf8 include: Document shader parameters. 2024-07-11 16:48:09 +02:00
Elizabeth Figura
98def3214b vkd3d-shader: Introduce struct vkd3d_shader_parameter_info and struct vkd3d_shader_parameter1. 
As the newly added documentation describes, this reroll serves two purposes:

* to allow shader parameters to be used for any target type (which allows using
  parameters for things like Direct3D 8-9 alpha test),

* to allow the union in struct vkd3d_shader_parameter to contain types larger
  than 32 bits (by specifying them indirectly through a pointer).
 2024-07-11 16:48:09 +02:00
Petrichor Park
bec4f413dc vkd3d-shader/tpf: Implmenent HLSL_OP1_RCP. 
SM5 comes with a RCP opcode; for SM4, implement it as `DIV dst, 1, x`.
 2024-07-11 16:44:16 +02:00
Petrichor Park
b3f0cd5788 vkd3d-shader/hlsl: Implement the rcp() intrinisic. 
SM1 already has the RCP opcode implemented; SM4 implementation is in the
next commit.
 2024-07-11 16:44:02 +02:00
Petrichor Park
3a49852075 vkd3d-shader/hlsl: Implement tests for the rcp() intrinsic. 2024-07-11 16:43:48 +02:00
Nikolay Sivov
c792114a6a vkd3d-shader/fx: Do not output empty strings for missing semantics for fx_2_0. 
This is directly visible in parameter description. For a parameter without semantic
it should return null, instead of a pointer to an empty string.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-11 00:36:05 +02:00
Giovanni Mascellani
85fe4c421b tests: Define WIDL macros in utils.h. 
This way other headers including utils.h, like d3d12_test_utils.h,
are self-contained.
 2024-07-11 00:34:58 +02:00
Giovanni Mascellani
9ebf779ef0 vkd3d: Propagate a failure in d3d12_descriptor_heap_init(). 2024-07-11 00:34:58 +02:00
Elizabeth Figura
59f770214a vkd3d-shader/hlsl: Implement output SV_Coverage. 2024-07-11 00:33:57 +02:00
Elizabeth Figura
71a3d55e8c vkd3d-shader/hlsl: Implement the GetRenderTargetSampleCount() intrinsic. 2024-07-11 00:33:57 +02:00
Elizabeth Figura
a5a75d45d3 tests: Implement multisampling in the GL renderer. 2024-07-11 00:33:57 +02:00
Elizabeth Figura
737967604e tests: Implement multisampling in the Vulkan renderer. 2024-07-11 00:33:57 +02:00
Elizabeth Figura
fe21318b5f tests/shader_runner: Factor out a resource_desc structure. 2024-07-11 00:33:57 +02:00
Elizabeth Figura
fa570ee1f3 tests/shader_runner: Use resource->width instead of resource->size for buffer width. 2024-07-11 00:33:57 +02:00
Victor Chiletto
76ae871f5b tests/hlsl: Test loop unrolling edge cases. 2024-07-11 00:32:53 +02:00
Victor Chiletto
2034a8bab9 vkd3d-shader/hlsl: Implement loop unrolling. 
Based on a patch by Nikolay Sivov.

Co-authored-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-11 00:32:53 +02:00
Victor Chiletto
7edd7dcf79 vkd3d-shader/hlsl: Allow cloned blocks to contain external references. 2024-07-11 00:32:53 +02:00
Victor Chiletto
5bc56d43bb vkd3d-shader/hlsl: Parse loop and unroll loop attributes. 
Based on a patch by Nikolay Sivov.

Co-authored-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-11 00:32:53 +02:00
Victor Chiletto
323f53bd7d vkd3d-shader/hlsl: Pull evaluate_static_expression_as_uint() upwards. 2024-07-11 00:32:53 +02:00
Victor Chiletto
50e28f70ed vkd3d-shader/hlsl: Defer bounds checks to after copy propagation. 
We potentially generate OOB accesses during loop unrolling that are later deleted.
 2024-07-11 00:32:53 +02:00
Victor Chiletto
317bd46efd vkd3d-shader/hlsl: Use a switch in validate_static_object_references(). 2024-07-11 00:32:49 +02:00
Victor Chiletto
900433e371 tests/hlsl: Add a test for dynamically indexed multisampled texture loads. 2024-07-11 00:31:06 +02:00
Victor Chiletto
67c690aa07 vkd3d-shader/d3dbc: Fix implicit enum conversion warning. 
This slipped through and broke CI.
 2024-07-10 00:06:14 +02:00
Petrichor Park
746222b349 vkd3d-shader/hlsl: Implement the faceforward() intrinsic. 2024-07-09 20:43:41 +02:00
Francisco Casas
60c8a813a3 vkd3d-shader/hlsl: Validate state block function calls. 2024-07-09 20:38:08 +02:00
Francisco Casas
af7c4010f4 tests: Test whether valid state block function names are case-sensitive. 2024-07-09 20:37:20 +02:00
Francisco Casas
b5f2e7daeb vkd3d-shader/hlsl: Parse function call syntax on state blocks. 2024-07-09 20:36:28 +02:00
Francisco Casas
f15d8dc9e9 tests: Separate the valid stateblock function names test from the string arg test. 
This test is important because it checks that all the valid names for
stateblock functions with the expected amount of arguments are tested,
but, after parsing state block function calls, the only reason it is
not passing is that we don't parse strings yet.
 2024-07-09 20:34:17 +02:00
Francisco Casas
7bd53cf6d9 vkd3d-shader/hlsl: Free array sizes on function parameters (Valgrind). 2024-07-09 20:32:25 +02:00
Francisco Casas
b92baa40ec vkd3d-shader/d3dbc: Don't write inconsequential MOVs. 
CASTs from floats to integers are implemented as mere MOVs. These often,
but not always, end up moving the value from one register to the same
register.

This patch avoids writing the MOV instructions if they have no effect.
 2024-07-09 20:32:25 +02:00
Francisco Casas
daa13934a4 vkd3d-shader/d3dbc: Use vsir_program I/O signatures to write dcls. 
Instead of relying on ctx->extern vars, semantics are now stored in the
vsir_program signatures, and then read to write the declarations.
 2024-07-09 20:31:14 +02:00
Francisco Casas
704ce03561 vkd3d-shader/d3dbc: Don't require a hlsl_semantic to get register and usage. 2024-07-09 20:12:47 +02:00
Francisco Casas
003f4c7600 vkd3d-shader/d3dbc: Use program->shader_version instead of ctx->profile. 2024-07-09 20:06:23 +02:00
Francisco Casas
a333090288 vkd3d-shader/d3dbc: Introduce struct d3dbc_compiler. 2024-07-09 19:44:03 +02:00
Francisco Casas
dd8aa2ec91 vkd3d-shader/hlsl: Generate CTAB outside d3dbc_compile(). 
There is no way to store this information from the vsir_program alone,
so we make d3dbc_compile() expect the CTAB blob.
 2024-07-09 18:59:54 +02:00
Francisco Casas
130b3335cb vkd3d-shader/d3dbc: Split hlsl_sm1_write(). 
The idea is to start splitting the

    HLSL IR -> d3dbc

translation into

    HLSL IR -> vsir -> d3dbc

So hlsl_sm1_write is split into two functions, sm1_generate_vsir()
which should handle the first part and d3dbc_compile() which should
handle the second part.

This translation should be completed once the hlsl_ctx and entry_func
are no longer used in d3dbc_compile().
 2024-07-09 18:38:00 +02:00
Zebediah Figura
6db2bc3eff vkd3d-shader/d3dbc: Use enum vkd3d_shader_register_type in struct sm1_instruction. 2024-07-09 16:59:02 +02:00
Giovanni Mascellani
4f67675a51 tests: Support using the Agility SDK in the crosstests. 2024-07-09 16:57:03 +02:00
Giovanni Mascellani
c49daadce1 tests: Enable the d3d12 debug layer message callbacks. 2024-07-09 15:24:18 +02:00
Giovanni Mascellani
e3ddb76a3e tests: Improve feedback when enabling d3d12 debug layers. 2024-07-09 14:55:55 +02:00
Nikolay Sivov
3dc43e8945 vkd3d-shader: Disallow object structure fields for fx profiles. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:49:28 +02:00
Nikolay Sivov
c8720f1229 tests: Add some fx profiles tests for structure types containing objects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:49:28 +02:00
Giovanni Mascellani
7958babb39 vkd3d: Do not synchronize with the tessellation shader stages if they're not enabled. 
Similarly to a54187f3c9, this fixes some validation
errors on devices that do not support tessellation; the Adreno 540 on my OnePlus 5
phone in my specific case.
 2024-07-08 18:49:28 +02:00
Giovanni Mascellani
3ff8130566 tests: Check that depth/stencil formats are supported before using them. 
This fixes a crash with the Qualcomm proprietary driver on an Adreno 540
GPU on my OnePlus 5 phone.
 2024-07-08 18:49:28 +02:00
Giovanni Mascellani
9f056f3989 tests: Transition resources to PIXEL_SHADER_RESOURCE in test_sample_c_lz(). 2024-07-08 18:49:28 +02:00
Giovanni Mascellani
fe787cf77f tests: Skip sampling cube textures on Qualcomm. 
They seem to always crash on the Adreno 540 on my OnePlus 5 phone with the
Qualcomm proprietary driver.
 2024-07-08 18:49:28 +02:00
Nikolay Sivov
937a80ead6 vkd3d-shader/fx: Write annotations for fx_4+ profiles. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:49:28 +02:00
Nikolay Sivov
0f7ac0a054 vkd3d-shader/hlsl: Set default values for annotations variables. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:49:06 +02:00
Nikolay Sivov
4d2ce385a7 vkd3d-shader/hlsl: Do not crash on initialization of a redefined variable. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:24:46 +02:00
Nikolay Sivov
0a344bd3c9 vkd3d-shader/fx: Add missing fields for structure types on fx_5_0. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:24:46 +02:00
Nikolay Sivov
8738e4662e vkd3d-shader/fx: Preserve parsing order of initializer components. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:24:46 +02:00
Nikolay Sivov
c97c652ff0 vkd3d-shader/fx: Fix packed size for fx_4+ types. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:24:46 +02:00
Nikolay Sivov
856686b2a2 vkd3d-shader/fx: Write default numeric values. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:24:46 +02:00
Nikolay Sivov
aea36be94c vkd3d-shader/fx: Fix structure type data written for fx_4. 
Strings and field types are written to the same unstructured area
as structure type itself, so it has to be done in two passes.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:24:46 +02:00
Nikolay Sivov
2176294df8 vkd3d-shader/hlsl: Implement tex*grad() functions. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:23:38 +02:00
Nikolay Sivov
4ff288bd32 vkd3d-shader: Implement tex*() functions variants with gradient arguments. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:23:38 +02:00
Elizabeth Figura
4cd2dd50f9 vkd3d-shader/hlsl: Separate an "array" rule. 2024-07-08 18:22:39 +02:00
Nikolay Sivov
94130c2394 vkd3d-shader/fx: Add support for writing RasterizerState objects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:12:03 +02:00
Nikolay Sivov
f03cb7e911 vkd3d-shader/hlsl: Add RasterizerState type. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:12:03 +02:00
Nikolay Sivov
12947aa50d vkd3d-shader/fx: Add support for writing DepthStencilState objects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:12:03 +02:00
Nikolay Sivov
1008c49ce6 vkd3d-shader/fx: Cast state block field values to target type. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:12:03 +02:00
Francisco Casas
597e55691a vkd3d-shader/hlsl: Only error out on bind_count register reservation overlaps for SM1. 
While on SM1 a register reservation reserves the whole size in
registers of the variable's data type, overlapping conflicts are only
checked up to the bind_count (used size) for each variable.
 2024-07-08 18:12:03 +02:00
Francisco Casas
2179c79c91 tests: Test register reservations on unused variables. 2024-07-08 18:12:03 +02:00
Nikolay Sivov
48ff7de8ef vkd3d-shader/hlsl: Add support for ConstantBuffer<> type. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-07-08 18:12:03 +02:00
Victor Chiletto
44725a651b tests: Add reflection tests for register expressions. 2024-07-03 17:09:16 -03:00
Victor Chiletto
abbcf0461f vkd3d-shader/hlsl: Reserve register slots for unused buffers. 2024-07-03 17:09:16 -03:00
Victor Chiletto
da36a447b8 vkd3d-shader/hlsl: Validate cbuffer register allocations. 2024-07-03 17:09:16 -03:00
Victor Chiletto
27414ef928 vkd3d-shader/hlsl: Do not immediately fail parsing for malformed 'b' register reservations. 
This is a fxc quirk. In most cases, this throws an error, but for global
variables it's completely ignored.
 2024-07-03 17:09:16 -03:00
Victor Chiletto
b5b3c8b9ff vkd3d-shader/hlsl: Ignore bracket offsets for 'b' register types prior to SM 5.1. 
This is a fxc quirk that was fixed for SM >= 5.1 only.
 2024-07-03 14:34:45 -03:00
Victor Chiletto
8fb3b604bf vkd3d-shader/hlsl: Pass a pointer to struct hlsl_reg_reservation in parse_reservation_index. 
Instead of passing the struct components individually.
 2024-07-03 14:05:58 -03:00
Victor Chiletto
e13eb64d4c vkd3d-shader/hlsl: Support expressions as register offsets. 2024-07-03 14:05:58 -03:00
Victor Chiletto
d11c777092 tests: Add more register reservations tests. 2024-07-03 14:05:58 -03:00
Yuxuan Shui
ccb6150aab vkd3d-shader/hlsl: Implement storing to a swizzled matrix. 2024-06-20 12:39:46 +02:00
Elizabeth Figura
acc9d79fbb vkd3d-shader/hlsl: Only allocate the aligned size for uniforms. 2024-06-18 13:19:44 -05:00
Elizabeth Figura
7fe581203b vkd3d-shader/hlsl: Respect the coords writemask in write_sm1_resource_load(). 
Spotted by Francisco Casas.
 2024-06-18 13:19:44 -05:00
Elizabeth Figura
8d946f3c20 tests: Add another combined sampler test. 
Shader provided by Francisco Casas.
 2024-06-18 13:01:31 -05:00
Elizabeth Figura
669e85171e tests: Run combined-samplers.shader_test on sm1 as well. 
Now that we have if() this is easier.
 2024-06-18 13:00:59 -05:00
Giovanni Mascellani
46a1b66df7 ci: Assume an Apple Silicon-based environment for the macOS CI job. 
The previous Intel-based macOS runner was replaced with another one
running as a virtual machine on top of an Apple Silicon host.

Since the current macOS runner is not yet able to deal with
different exit codes, we temporarily allow failure unconditionally.
This will be reverted as soon as the runner issue is fixed.
 2024-06-17 12:32:33 +02:00
Elizabeth Figura
d3ba810c98 tests: Stop probing all pixels when drawing a uniform colour. 
This is simply unnecessary and wastes time.

As part of this, simply remove the "all" directive. Only for a couple of tests
is it even potentially interesting to validate all pixels (e.g.
nointerpolation.shader_test), and for those "all" is replaced with an explicit
(0, 0, 640, 480) rect.

In all other cases we just probe (0, 0).
 2024-06-13 23:55:31 +02:00
Stefan Dösinger
021eb28584 include: Get rid of the RB_FOR_EACH* macros. 
They're largely unused, and RB_FOR_EACH_ENTRY_DESTRUCTOR is broken
because it uses WINE_RB_ENTRY_VALUE which doesn't exist in vkd3d.
 2024-06-13 23:44:43 +02:00
Henri Verbeet
90f26759b5 vkd3d: Always use UINT views to clear UAVs with integer formats. 
We would previously try to use float pipelines for SINT formats.
 2024-06-13 23:26:35 +02:00
Giovanni Mascellani
a54187f3c9 vkd3d: Do not synchronize with the geometry shader stage if it's not enabled. 2024-06-13 23:24:22 +02:00
Giovanni Mascellani
a1a07de8ca vkd3d: Enable VK_KHR_portability_subset if available. 
We don't check it, but at least the validation layer does not complain
when using MoltenVK.
 2024-06-13 23:24:22 +02:00
Giovanni Mascellani
3254eff328 vkd3d: Do not request VK_EXT_debug_marker if debug is disabled. 
Because it requires VK_EXT_debug_report.
 2024-06-13 23:24:22 +02:00
Giovanni Mascellani
3ad4d984ad tests: Mark some root signature unbounded range failures as todo on MoltenVK. 2024-06-13 23:24:22 +02:00
Yuxuan Shui
8a459f5903 tests: Pass the correct buffer size to vsnprintf() in vkd3d_test_push_context(). 2024-06-12 19:04:22 +02:00
Nikolay Sivov
222c52380b vkd3d-shader/fx: Fix variable buffer offset value. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-12 19:02:20 +02:00
Nikolay Sivov
402dc94259 vkd3d-shader/fx: Set EXPLICIT_BIND_POINT flag for packoffset() reservations as well. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-12 19:02:20 +02:00
Conor McCarthy
da1d96f708 tests/shader-runner: Create a new runner object for the shader model 6 tests. 
If cleaning up the old runner is not completed, descriptors for
destroyed resources may remain on the heap.
 2024-06-11 15:56:43 +02:00
Conor McCarthy
7534b88a15 tests/shader-runner: Set the correct flag and format for raw UAVs. 2024-06-11 15:55:48 +02:00
Elizabeth Figura
2f88442d7d vkd3d-shader/hlsl: Always initialize $$ when parsing modifiers from an arbitrary string. 
This avoids spurious errors like "row_major and column_major are mutually
exclusive" when an invalid modifier is used.

Fixes: cf7c05f431
 2024-06-11 15:54:10 +02:00
Nikolay Sivov
72ddea6030 vkd3d-shader/fx: Use original full semantic name. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-11 15:53:19 +02:00
Nikolay Sivov
1124ea46ee vkd3d-shader/hlsl: Store original semantic name. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-11 15:53:19 +02:00
Conor McCarthy
47d077e5ce vkd3d: Interpret a null vertex buffer 'views' pointer as a null buffer. 2024-06-11 15:52:28 +02:00
Conor McCarthy
c3ea43b619 tests/d3d12: Test a null vertex buffer 'views' pointer on multiple slots. 2024-06-11 15:52:28 +02:00
Conor McCarthy
589ed1e358 vkd3d: Allow block compressed textures to have unaligned width and height. 2024-06-11 15:51:34 +02:00
Conor McCarthy
9244f2b536 tests/d3d12: Check for unaligned block texture support in test_create_committed_resource(). 2024-06-11 15:51:33 +02:00
Nikolay Sivov
ba18035260 vkd3d-shader/d3dbc: Write load instruction for tex2Dbias(). 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-11 15:50:34 +02:00
Nikolay Sivov
a289393fe7 vkd3d-shader/asm: Output 'bias' flag for 'texld'. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-11 15:50:34 +02:00
Nikolay Sivov
ccbe36fb8d vkd3d-shader/hlsl: Implement tex2Dbias(). 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56701
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-06-11 15:50:34 +02:00
Elizabeth Figura
f0cd35b40d tests: Add reflection tests for register space. 2024-06-11 15:49:30 +02:00
Elizabeth Figura
33e5553158 vkd3d-shader/hlsl: Write SM5.1 binding reflection data. 2024-06-11 15:49:30 +02:00
Elizabeth Figura
bb41947fc6 vkd3d-shader: Write SM5.1 register spaces. 2024-06-11 15:49:30 +02:00
Elizabeth Figura
4355e6ca69 vkd3d-shader/hlsl: Allocate register spaces for objects. 2024-06-11 15:49:30 +02:00
Elizabeth Figura
7b61b0219e vkd3d-shader/hlsl: Allocate register spaces for constant buffers. 2024-06-11 15:49:30 +02:00
Elizabeth Figura
28a5e23814 vkd3d-shader: Write SM5.1 register indices. 
Separate ID and index. Allocate IDs for all external resources (but ignore them
for shader models other than 5).
 2024-06-11 15:49:30 +02:00
Elizabeth Figura
19a13740de vkd3d-shader/hlsl: Put constant buffers into the extern_resources struct. 
Mostly to get the same sorting logic.
 2024-06-11 15:49:30 +02:00
Elizabeth Figura
558320b52f vkd3d-shader/hlsl: Add a hlsl_fixme() for 5.1 resource arrays. 
These are a bit trickier to handle, and need more tests.
 2024-06-11 15:49:30 +02:00
Conor McCarthy
9b070edf01 vkd3d-shader/spirv: Implement the QUAD_READ_LANE_AT instruction. 2024-06-11 15:48:21 +02:00
Conor McCarthy
0b8b5b2d0f vkd3d-shader/dxil: Implement DX intrinsic QuadReadLaneAt. 2024-06-11 15:48:21 +02:00
Conor McCarthy
c298493e4f vkd3d-shader/spirv: Implement the QUAD_READ_ACROSS_* instructions. 2024-06-11 15:48:21 +02:00
Conor McCarthy
8a15642f45 vkd3d-shader/dxil: Implement DX intrinsic QuadOp. 2024-06-11 15:48:21 +02:00
Francisco Casas
f5bfa728eb vkd3d-shader/hlsl: Reorder default values for matrices for SM4. 
Default value initializers behave differently than regular initializers
for matrices on SM4 profiles.

While regular initializers assign the rhs elements in reading-order
(completing one row at the time), default initializers assing the rhs
elements in Chinese reading-order (completing one column at the time).

So after lowering a default value to a constant, the index of the
component to which this default value is stored is computed to meet
this expectation. This can be done because the default values.

For reference, compiling this shader:

    row_major int2x3 m = {1, 2, 3, 4, 5, 6};

    float4 main() : sv_target
    {
        return float4(m[0][0], 99, 99, 99);
    }

gives the following buffer definition:

    // cbuffer $Globals
    // {
    //
    //   row_major int2x3 m;                // Offset:    0 Size:    28
    //      = 0x00000001 0x00000003 0x00000005 0x00000000
    //        0x00000002 0x00000004 0x00000006
    //
    // }

Given that the matrix is column-major, m's default value is actually
{{1, 3, 5}, {2, 4, 6}}, unlike the {{1, 2, 3}, {4, 5, 6}} one would
expect in a regular initializer.

SM1 profiles assign the elements in regular reading order.
 2024-06-11 15:46:40 +02:00
Francisco Casas
ab01fedc5d vkd3d-shader/hlsl: Fix numeric register offset for matrix components. 2024-06-11 15:46:40 +02:00
Francisco Casas
ade3daa311 tests: Test matrix default value initializers. 2024-06-11 15:46:40 +02:00
Francisco Casas
affadf319c vkd3d-shader/d3dbc: Write default values for SM1. 2024-06-11 15:46:40 +02:00
Francisco Casas
253c994155 vkd3d-shader/tpf: Write default values for SM4. 2024-06-11 15:46:40 +02:00
Francisco Casas
b44a25ce19 tests: Test default values using reflection. 2024-06-11 15:46:40 +02:00
Francisco Casas
099a64aeb2 vkd3d-shader/hlsl: Initialize default values with braceless initializers. 
It is hard to initialize default values on add_assignment() and calling
add_assignment() for initializers is not really necessary: the only
thing we need from it the implicit cast.
 2024-06-11 15:46:40 +02:00
Francisco Casas
e8dbc36bd2 vkd3d-shader/hlsl: Record default values for uniforms and constant buffers. 2024-06-11 15:46:40 +02:00
Henri Verbeet
1fe7a6581b vkd3d-shader/ir: Rename the "handler_idx" field of struct vkd3d_shader_instruction to "opcode". 2024-05-30 19:57:01 +02:00
Nikolay Sivov
5265fbb789 vkd3d-shader/fx: Do not write shared buffers block when not compiling as a child effect. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-30 19:56:50 +02:00
Nikolay Sivov
727aacca18 tests: Add a few tests for the NULL value. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-30 19:56:44 +02:00
Nikolay Sivov
163aaf9729 tests: Add some basic tests for ConstantBuffer type. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-30 19:56:39 +02:00
Nikolay Sivov
ea177a7750 vkd3d-shader/hlsl: Handle "unsigned int" type. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-30 19:56:29 +02:00
Henri Verbeet
36c123c005 Release 1.12. 2024-05-29 22:05:28 +02:00
Henri Verbeet
9693271dcf tests: Rename VKD3D_TESTS_SKIP_DXC to VKD3D_TEST_SKIP_DXC. 
For consistency with the other VKD3D_TEST_* environment variables.
 2024-05-27 21:08:14 +02:00
Henri Verbeet
695ef722e8 build: Fix the order of a couple of shader runner tests. 2024-05-27 21:08:06 +02:00
Henri Verbeet
b363fdbb21 include: Add a \since tag for VKD3D_FALSE. 2024-05-27 21:08:00 +02:00
Henri Verbeet
007233a016 include: Document the additional HLSL transformations supported by vkd3d_shader_compile(). 2024-05-27 21:08:00 +02:00
Nikolay Sivov
308d735923 vkd3d-shader/ir: Set texture register dimension as VEC4 when normalising combined samplers. 
Thanks, Giovanni.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-27 21:07:51 +02:00
Giovanni Mascellani
9a3fa67c1f tests: Skip a test that freezes the GPU on NVIDIA. 2024-05-27 21:07:43 +02:00
Conor McCarthy
ae25c80498 vkd3d: Check for mutable descriptor set allocation failure in d3d12_descriptor_heap_create_descriptor_set(). 2024-05-27 21:07:30 +02:00
Nikolay Sivov
f090d1e80d vkd3d-shader: Remove explicit newlines from hlsl_fixme() messages. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-23 23:12:10 +02:00
Henri Verbeet
b5ac6ac636 vkd3d-shader: Use a separate allocation for the "semantic_name" field of shader signature elements. 
For tpf shader this would previously be a pointer into the original
shader code, and for d3dbc shaders we'd use static strings.
Unfortunately the dxil parser creates shader signatures where these
are pointers to metadata strings, and those go away when we call
sm6_parser_cleanup().

We could conceivably store a flag in the shader signature to indicate
whether shader_signature_cleanup()/vkd3d_shader_free_shader_signature()
should free the "semantic_name" field. It'd be a little ugly, and seems
unlikely to be worth it, but I'd be willing to be convinced.
 2024-05-23 23:12:06 +02:00
Victor Chiletto
105ef28273 vkd3d-shader/preproc: Treat CR as whitespace. 2024-05-23 23:11:58 +02:00
Giovanni Mascellani
a64426edf9 tests: Check device support for all the 16 bit image formats. 
Otherwise the test crash on llvmpipe.
 2024-05-22 22:15:32 +02:00
Giovanni Mascellani
dfa3ee25e0 vkd3d: Move the full stops before the newline. 2024-05-22 22:15:27 +02:00
Victor Chiletto
fa5708d3b5 vkd3d-shader/hlsl: Fix XOR assign operator lexing. 2024-05-22 22:15:20 +02:00
Victor Chiletto
d8d2414132 tests/hlsl: Add a test for the XOR assign operator. 2024-05-22 22:15:19 +02:00
Conor McCarthy
7d3c286e9b tests/d3d12: Add a separate null 'views' pointer test in test_null_vbv(). 2024-05-22 22:15:14 +02:00
Conor McCarthy
fd416b492c tests/d3d12: Use get_cpu_sampler_handle() for the sampler heap in test_unbounded_samplers(). 2024-05-22 22:15:12 +02:00
Conor McCarthy
cc1877dadb tests/d3d12: Ensure stream output BufferFilledSizeLocation is always valid. 2024-05-22 22:15:11 +02:00
Conor McCarthy
42d369d595 tests/d3d12: Check UnalignedBlockTexturesSupported when testing GetCopyableFootprints(). 2024-05-22 22:15:09 +02:00
Conor McCarthy
0daba96025 tests/d3d12: Test format D32_FLOAT_S8X24_UINT in test_get_copyable_footprints(). 2024-05-22 22:15:07 +02:00
Conor McCarthy
f6db3330c8 tests/d3d12: Check the correct depth/stencil plane format and alignment in test_get_copyable_footprints(). 2024-05-22 22:15:05 +02:00
Conor McCarthy
23881bad7a tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters(). 2024-05-22 22:15:04 +02:00
Conor McCarthy
dcc715b4d1 tests/d3d12: Do not clear UAVs via a structured view. 2024-05-22 22:15:02 +02:00
Conor McCarthy
42eee382ec tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints(). 2024-05-22 22:15:00 +02:00
Conor McCarthy
bb2a79a8fb tests/d3d12: Do not test a typed UAV in test_atomic_instructions(). 
A shader typed UAV declaration must not map to a root descriptor UAV. We
now have shader runner tests for typed UAV atomics, so there is no need
to modify this test to use a descriptor heap.
 2024-05-22 22:14:58 +02:00
Nikolay Sivov
9c83caeda6 vkd3d-shader/fx: Use correct type name when reusing types. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-16 21:49:50 +02:00
Nikolay Sivov
a913ac7844 vkd3d-shader/fx: Implement writing shared buffers. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-16 21:49:48 +02:00
Henri Verbeet
ce6f8a6a30 vkd3d-shader/dxil: Parse the shader into a vsir program in vkd3d_shader_sm6_parser_create(). 2024-05-16 21:49:40 +02:00
Henri Verbeet
6474e8cc7b vkd3d-shader/tpf: Parse the shader into a vsir program in vkd3d_shader_sm4_parser_create(). 2024-05-16 21:49:39 +02:00
Henri Verbeet
402b96ef3b vkd3d-shader/d3dbc: Parse the shader into a vsir program in vkd3d_shader_sm1_parser_create(). 2024-05-16 21:49:38 +02:00
Henri Verbeet
efe9dfd73a vkd3d-shader/ir: Do not store the vkd3d-shader configuration flags in struct vkd3d_shader_parser. 2024-05-16 21:49:37 +02:00
Henri Verbeet
19b552ce1b vkd3d-shader/ir: Pass an initialised vsir_program structure to vkd3d_shader_parser_init(). 2024-05-16 21:49:36 +02:00
Henri Verbeet
9e4a790de1 vkd3d-shader/ir: Use a separate allocation for the vsir program in struct vkd3d_shader_parser. 2024-05-16 21:49:34 +02:00
Francisco Casas
061dc39036 vkd3d-shader/hlsl: Also lower matrix swizzles and index loads in const passes. 2024-05-15 21:17:51 +02:00
Francisco Casas
dff2f746bc tests: Test complex array size expression. 2024-05-15 21:17:51 +02:00
Francisco Casas
0d252f894a vkd3d-shader/hlsl: Run more constant passes on static expressions eval. 2024-05-15 21:17:50 +02:00
Francisco Casas
4f60c7167e vkd3d-shader/hlsl: Run constant passes in a separate function. 2024-05-15 21:17:49 +02:00
Francisco Casas
58a6db5589 tests: Test default values for constant buffer variables. 2024-05-15 21:17:49 +02:00
Francisco Casas
499b44a193 tests: Test default values for uniform variables. 2024-05-15 21:17:47 +02:00
Conor McCarthy
9e57039fce vkd3d-shader/dxil: Handle SV_ClipDistance and SV_CullDistance. 2024-05-14 20:44:22 +02:00
Conor McCarthy
01af0f94bb tests/hlsl: Add a test for SV_ClipDistance. 2024-05-14 20:44:20 +02:00
Conor McCarthy
4f50af4c83 vkd3d-shader/dxil: Handle SV_Coverage out. 2024-05-14 20:44:18 +02:00
Conor McCarthy
e4724b4635 tests/hlsl: Add a test for SV_Coverage out. 2024-05-14 20:44:16 +02:00
Conor McCarthy
e1c774bfeb vkd3d-shader/spirv: Implement the WAVE_READ_LANE_FIRST instruction. 2024-05-14 20:44:10 +02:00
Conor McCarthy
cb9b10bf4d tests/hlsl: Clear the RTV before the WaveReadLaneFirst() test. 2024-05-14 20:44:08 +02:00
Conor McCarthy
47f0483267 vkd3d-shader/dxil: Implement DX intrinsic WaveReadLaneFirst. 2024-05-14 20:44:06 +02:00
Conor McCarthy
936d8e4f61 vkd3d-shader/spirv: Implement the WAVE_READ_LANE_AT instruction. 2024-05-14 20:44:04 +02:00
Conor McCarthy
e41643ab8f vkd3d-shader/dxil: Implement DX intrinsic WaveReadLaneAt. 2024-05-14 20:44:02 +02:00
Conor McCarthy
5790056c44 tests/hlsl: Add a test for WaveReadLaneAt() with a non-uniform index. 2024-05-14 20:44:00 +02:00
Victor Chiletto
c9af34ab28 vkd3d-shader/hlsl: Avoid a null pointer dereference in hlsl_block_cleanup (UBSan). 
destroy_block() is called with a NULL block from:

* create_loop, through the loop rules for while and do-while loops.
* The selection_statement rule, in the case $6.else_block is NULL.
* free_parse_initializer.
 2024-05-14 20:43:48 +02:00
Conor McCarthy
98f73ca2e5 vkd3d-shader/ir: Allow all DCL instructions to occur outside hull shader phases. 2024-05-13 22:27:13 +02:00
Conor McCarthy
def87539de vkd3d-shader/dxil: Delete bool not-equal-to-false comparison instructions. 2024-05-13 22:27:13 +02:00
Conor McCarthy
f47ac703ab vkd3d-shader/spirv: Emit a trace instead of a warning message for ignored alignment. 2024-05-13 22:27:13 +02:00
Conor McCarthy
e340855122 vkd3d-shader/spirv: Do not warn if no global flags are unhandled. 2024-05-13 22:27:13 +02:00
Conor McCarthy
ea5624e5e8 vkd3d-shader/dxil: Emit bool inputs and outputs as uint. 
DXIL reads/writes uint for these.
 2024-05-13 22:27:13 +02:00
Francisco Casas
5b7191280b vkd3d-shader: Return a valid pointer when count=0 in param allocator (ubsan). 
After compiling and linking with '-fsanitize=undefined' the following
error pops up in many tests:

    vkd3d_shader_main.c:2024:12: runtime error: member access within null pointer of type 'struct vkd3d_shader_param_node'

This happens in the scenario where shader_param_allocator_get() gets
called with 'count = 0' but no allocation has been made yet, so
allocator->current is NULL.

In this case the result of the function, given by:

    params = &allocator->current->param[allocator->index * allocator->stride];

is an invalid non-NULL pointer.

Functions like shader_sm4_read_instruction() may call
vsir_program_get_src_params() or vsir_program_get_dst_params() with 0
counts for various DCL_ instructions, as well as things like NOP,
ELSE, and SYNC.

We could avoid calling the functions in question with 0 counts, but it
doesn't seem worth the effort.

Alternatively, we could just return NULL on 'count == 0', but this is
also complicated because NULL is interpreted as a memory allocation
failure on the callers.

So we force allocation of the next node even if 'count = 0' when
allocator->current is NULL.
 2024-05-13 22:27:13 +02:00
Francisco Casas
28d267b7c0 vkd3d-shader/hlsl: Allocate SM1 numeric uniforms in decreasing bind count. 2024-05-13 22:26:21 +02:00
Francisco Casas
e7450ce539 vkd3d-shader/d3dbc: Write used bind count for numeric uniforms. 2024-05-13 22:26:13 +02:00
Francisco Casas
f548644222 vkd3d-shader/hlsl: Only allocate numeric bind count for SM1 numeric uniforms. 
Unless they have register reservations, in which case the whole
variable is still reserved.
 2024-05-13 22:26:08 +02:00
Francisco Casas
573d511344 vkd3d-shader/hlsl: Track bind count according to usage for uniforms. 
Where bind count means the number of registers required to include all
dereferences to the variable within the shader as in
hlsl_ir_var.bind_count[].
 2024-05-13 22:26:07 +02:00
Francisco Casas
e0a801e796 vkd3d-shader/hlsl: Improve tracking of used components running DCE before. 
track_object_components_usage() had to be improved to also
register derefs on resource stores.
It was not doing it because it assumed that for every resource store
there was a resource load already, which was true, before calling DCE.
 2024-05-13 22:26:05 +02:00
Francisco Casas
657e460d11 vkd3d-shader/hlsl: Allocate unused variables with register reservations on SM1. 2024-05-13 22:26:03 +02:00
Francisco Casas
7b3644d9f2 tests: Test SM1 const register allocation with relative addressing. 2024-05-13 22:26:03 +02:00
Francisco Casas
b56ae0f1c8 tests: Test SM1 constant register allocation with reservations. 2024-05-13 22:26:03 +02:00
Nikolay Sivov
9dcb74341f tests: Test SM1 constant register allocation with a row_major matrix. 
Co-authored-by: Francisco Casas <fcasas@codeweavers.com>
 2024-05-13 22:26:01 +02:00
Francisco Casas
7debe25a8b tests: Test SM1 constant register allocation. 2024-05-13 22:26:01 +02:00
Giovanni Mascellani
05394b624a vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS18 in CheckFeatureSupport(). 2024-05-13 11:50:37 +02:00
Giovanni Mascellani
7c7503713a vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS17 in CheckFeatureSupport(). 2024-05-13 11:50:37 +02:00
Giovanni Mascellani
d528fdbebf vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS16 in CheckFeatureSupport(). 2024-05-13 11:50:37 +02:00
Giovanni Mascellani
5445c4c8aa vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS15 in CheckFeatureSupport(). 2024-05-13 11:50:37 +02:00
Giovanni Mascellani
761ee1e487 vkd3d: Handle D3D12_FEATURE_D3D12_OPTIONS14 in CheckFeatureSupport(). 2024-05-13 11:50:37 +02:00
Conor McCarthy
fb20639eb4 vkd3d: Return E_INVALIDARG if the requested shader model is unknown. 2024-05-13 11:50:33 +02:00
Conor McCarthy
d17956ced8 vkd3d: Return a shader model no higher than the requested one for D3D12_FEATURE_SHADER_MODEL. 2024-05-13 11:50:32 +02:00
Conor McCarthy
677c23f1fe tests: Add tests for D3D12_FEATURE_SHADER_MODEL. 2024-05-13 11:50:32 +02:00
Conor McCarthy
77259da1ad vkd3d-shader/spirv: Implement the WAVE_PREFIX_BIT_COUNT instruction. 2024-05-13 11:50:23 +02:00
Conor McCarthy
2810edf45b vkd3d-shader/dxil: Implement DX intrinsic WavePrefixBitCount. 2024-05-13 11:50:22 +02:00
Conor McCarthy
065ef0c5e4 vkd3d-shader/spirv: Implement the WAVE_IS_FIRST_LANE instruction. 2024-05-13 11:50:21 +02:00
Conor McCarthy
c30976e5c2 vkd3d-shader/dxil: Implement DX intrinsic WaveIsFirstLane. 2024-05-13 11:50:20 +02:00
Conor McCarthy
feef2577ef vkd3d-shader/spirv: Implement the WAVE_ALL_BIT_COUNT instruction. 2024-05-13 11:50:19 +02:00
Conor McCarthy
cb5163f9a4 vkd3d-shader/dxil: Implement DX intrinsic WaveAllBitCount. 2024-05-13 11:50:17 +02:00
Elizabeth Figura
4b3a948edc authors: Change the full form of my name. 2024-05-08 21:08:35 +02:00
Giovanni Mascellani
ca35023ed0 vkd3d: Only request properties and features when the corresponding extension is available. 
This fixes a number of validation errors.
 2024-05-08 21:08:30 +02:00
Giovanni Mascellani
ea090a34cd vkd3d: Init physical device information after checking available extensions. 2024-05-08 21:08:30 +02:00
Giovanni Mascellani
826b75722b vkd3d: Do not automatically succeed if no extensions are available. 
So error messages for missing required extensions are emitted.
 2024-05-08 21:08:28 +02:00
Giovanni Mascellani
dbe3384609 vkd3d: Move checking device extensions to a dedicated function. 2024-05-08 21:08:28 +02:00
Giovanni Mascellani
29c63906bc vkd3d: Warn about missing extensions only when meaningful. 2024-05-08 21:08:28 +02:00
Stefan Dösinger
d6b1e62ffc vkd3d: Add a win32 version of vkd3d_get_program_name. 2024-05-08 21:08:22 +02:00
Conor McCarthy
962096f179 vkd3d-shader/dxil: Implement DX intrinsics EmitStream, CutStream and EmitThenCutStream. 2024-05-08 21:08:16 +02:00
Conor McCarthy
cc49f26af1 vkd3d-shader/ir: Validate geometry shader properties. 2024-05-08 21:08:15 +02:00
Conor McCarthy
4fd2d5aa77 vkd3d-shader/dxil: Load geometry shader properties. 2024-05-08 21:08:14 +02:00
Conor McCarthy
00b0b8d65c tests/hlsl: Add a geometry shader test. 2024-05-08 21:08:13 +02:00
Conor McCarthy
e6c802e713 tests/shader-runner: Free the hull and domain shader source code. 2024-05-08 21:08:11 +02:00
Nikolay Sivov
0053cc52b7 vkd3d-shader/fx: Initial support for writing sample state objects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:08:05 +02:00
Nikolay Sivov
3c6470e3b2 vkd3d-shader/fx: Set UAV count in the header. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:08:04 +02:00
Nikolay Sivov
1a79d1e945 vkd3d-shader/fx: Filter out unsupported object types. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:08:03 +02:00
Nikolay Sivov
9bbed14987 vkd3d-shader/fx: Fix shader counter in the header. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:08:02 +02:00
Nikolay Sivov
cb1a271151 vkd3d-shader/fx: Set texture count in the header. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:08:01 +02:00
Nikolay Sivov
162d8760be vkd3d-shader/fx: Set RTV counter in the header. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:08:00 +02:00
Nikolay Sivov
a879ac5536 vkd3d-shader/fx: Write depth stencil view object variables. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:07:59 +02:00
Zebediah Figura
c2eb563e50 vkd3d-shader/fx: Skip uniform copy logic for global variables. 2024-05-08 21:07:58 +02:00
Francisco Casas
68483d070f vkd3d-shader/hlsl: Turn hlsl_state_block_entry arguments into hlsl_src. 
This allows to apply passes that replace instructions in
hlsl_state_block_entry.instrs.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-05-08 21:07:57 +02:00
Zebediah Figura
cefd6f9de6 vkd3d-utils: Implement ID3D12ShaderReflection::GetResourceBindingDesc(). 2024-05-06 22:12:50 +02:00
Zebediah Figura
694d39ffe6 tests: Test bounds checking in ID3D12ShaderReflection. 2024-05-06 22:12:50 +02:00
Zebediah Figura
35d388eedd vkd3d-utils: Initialize the null type vtbl. 2024-05-06 22:12:50 +02:00
Zebediah Figura
7b3c47ba2e vkd3d-shader/tpf: Write the field offset in bytes. 2024-05-06 22:12:48 +02:00
Zebediah Figura
68562d375e vkd3d-utils: Fix bounds comparison against element counts. 2024-05-06 22:12:48 +02:00
Zebediah Figura
2480eec98b vkd3d-shader/hlsl: Move the "base_type" member to the class-specific union. 2024-05-06 22:12:41 +02:00
Zebediah Figura
4fd3f46109 vkd3d-shader/hlsl: Use a switch in hlsl_types_are_equal(). 2024-05-06 22:12:39 +02:00
Zebediah Figura
d9f7a88329 vkd3d-shader/hlsl: Make HLSL_TYPE_PIXELSHADER into a separate class. 2024-05-06 22:12:37 +02:00
Zebediah Figura
874937dab4 vkd3d-shader/hlsl: Make HLSL_TYPE_VERTEXSHADER into a separate class. 2024-05-06 22:12:34 +02:00
Zebediah Figura
e904b4596a vkd3d-shader/hlsl: Ensure that the type is numeric before calling expr_common_base_type(). 2024-05-06 22:12:33 +02:00
Conor McCarthy
cfcc789b42 vkd3d-shader/spirv: Implement the WAVE_OP_* instructions. 2024-05-06 22:12:27 +02:00
Conor McCarthy
c71751edc9 vkd3d-shader/dxil: Implement DX intrinsics WaveActiveOp and WavePrefixOp. 2024-05-06 22:12:25 +02:00
Conor McCarthy
fef5760af0 vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BIT_* instructions. 2024-05-06 22:12:24 +02:00
Conor McCarthy
af208135f3 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBit. 2024-05-06 22:12:22 +02:00
Conor McCarthy
1c49b3a779 vkd3d-shader/spirv: Implement the WAVE_ACTIVE_BALLOT instruction. 2024-05-06 22:12:21 +02:00
Conor McCarthy
174a692a17 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveBallot. 2024-05-06 22:12:19 +02:00
Henri Verbeet
62a512c4f8 tests/shader_runner: Get rid of some redundant "| glsl" conditions. 
We don't run shader model 6 GLSL tests.
 2024-05-02 22:19:30 +02:00
Henri Verbeet
592e902d47 vkd3d-shader: Pass a struct vsir_program to vkd3d_shader_parser_compile(). 2024-05-02 22:19:18 +02:00
Henri Verbeet
fa7b623eac vkd3d-shader: Pass a struct vsir_program to scan_with_parser(). 2024-05-02 22:19:18 +02:00
Henri Verbeet
f948520504 vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compile(). 2024-05-02 22:19:17 +02:00
Henri Verbeet
e21215f466 vkd3d-shader/spirv: Pass a struct vsir_program to spirv_compiler_generate_spirv(). 2024-05-02 22:19:16 +02:00
Giovanni Mascellani
3f43d06f5c include: Document structure vkd3d_image_resource_create_info. 2024-05-02 22:19:08 +02:00
Giovanni Mascellani
2679b10fcb include: Document structure vkd3d_optional_device_extensions_info. 2024-05-02 22:19:08 +02:00
Giovanni Mascellani
2b1abc5d7b include: Document structure vkd3d_device_create_info. 2024-05-02 22:19:08 +02:00
Giovanni Mascellani
5d78eeb6d3 vkd3d: Simplify control flow for swapchain images. 2024-05-02 22:19:08 +02:00
Conor McCarthy
95489899be vkd3d-shader/spirv: Handle the WAVE_ANY_TRUE instruction. 2024-05-02 22:19:02 +02:00
Conor McCarthy
fb5eb3159d vkd3d-shader/dxil: Implement DX intrinsic WaveAnyTrue. 2024-05-02 22:19:00 +02:00
Conor McCarthy
77ec2a5caa vkd3d-shader/spirv: Handle the WAVE_ALL_TRUE instruction. 2024-05-02 22:18:59 +02:00
Conor McCarthy
8e2b351538 vkd3d-shader/dxil: Implement DX intrinsic WaveAllTrue. 2024-05-02 22:18:58 +02:00
Conor McCarthy
78f2d2936d vkd3d-shader/spirv: Handle the WAVE_ACTIVE_ALL_EQUAL instruction. 2024-05-02 22:18:57 +02:00
Conor McCarthy
9aa9b112e6 vkd3d-shader/dxil: Implement DX intrinsic WaveActiveAllEqual. 2024-05-02 22:18:55 +02:00
Conor McCarthy
c770efc530 vkd3d-shader/spirv: Handle the WAVELANEINDEX register. 2024-05-02 22:18:54 +02:00
Conor McCarthy
29786d7efb tests/shader-runner: Add a 'require' directive for wave ops. 2024-05-02 22:18:53 +02:00
Conor McCarthy
9315bcb6a1 tests/shader-runner: Skip shader model 6.0 tests if the device does not support them. 2024-05-02 22:18:52 +02:00
Conor McCarthy
fd590c2593 vkd3d: Initialise wave ops feature options. 
Based in part on a vkd3d-proton patch by Philip Rebohle.
 2024-05-02 22:18:50 +02:00
Conor McCarthy
a130c970a6 vkd3d-shader/spirv: Handle the WAVELANECOUNT register. 2024-05-02 22:18:49 +02:00
Conor McCarthy
6a56b4e5d8 vkd3d-shader/dxil: Implement DX intrinsics WaveGetLaneCount and WaveGetLaneIndex. 2024-05-02 22:18:48 +02:00
Giovanni Mascellani
766913f911 tests: Add missing test file. 2024-04-30 22:59:47 +02:00
Giovanni Mascellani
5e6bcc4f9d tests: Test wave reconvergence after selections and loops. 
Tangled instructions, like wave operations, are sensitive to how the
invocations in a wave reconverge after having diverged. Here we test
for some of those scenarios.
 2024-04-30 22:59:44 +02:00
Henri Verbeet
a52a91d756 configure: Build with -flto=auto when available. 2024-04-30 16:32:10 +02:00
Conor McCarthy
127bcf90e4 vkd3d-shader/dxil: Implement DX intrinsic Coverage. 2024-04-30 16:32:10 +02:00
Conor McCarthy
c2a787181f tests/hlsl: Add SV_Coverage tests. 2024-04-30 16:32:10 +02:00
Conor McCarthy
36c76e1557 vkd3d-shader/dxil: Handle SV_PrimitiveId. 2024-04-30 16:32:10 +02:00
Conor McCarthy
eef0f7c29e vkd3d-shader/dxil: Handle SV_InstanceId. 2024-04-30 16:32:10 +02:00
Conor McCarthy
0bd6083785 tests/hlsl: Add an SV_InstanceId test. 2024-04-30 16:32:10 +02:00
Conor McCarthy
fb730b11cf vkd3d-shader/dxil: Handle constexpr pointer cast. 2024-04-30 16:31:44 +02:00
Conor McCarthy
2fc32c3d1d tests/hlsl: Add a test for constexpr pointer cast. 2024-04-30 16:31:43 +02:00
Conor McCarthy
05510c118a vkd3d-shader/dxil: Emit an error if a CMPXCHG instruction uses a forward-referenced pointer. 2024-04-30 16:31:42 +02:00
Conor McCarthy
b67a68b486 vkd3d-shader/dxil: Emit an error if a ATOMICRMW instruction uses a forward-referenced pointer. 2024-04-30 16:31:41 +02:00
Conor McCarthy
9615c38968 vkd3d-shader/dxil: Emit an error if a STORE instruction uses a forward-referenced pointer. 2024-04-30 16:31:40 +02:00
Conor McCarthy
b4b5af66ef vkd3d-shader/dxil: Emit an error if a LOAD instruction uses a forward-referenced pointer. 2024-04-30 16:31:39 +02:00
Alexandre Julliard
91762a62c6 vkd3d-shader: Avoid non-constant initializer. 
Fixes "initializer element is not constant" error with gcc < 8.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56508
 2024-04-30 16:31:32 +02:00
Henri Verbeet
87c83e2ae2 vkd3d-shader: Get rid of struct vkd3d_shader_desc. 2024-04-30 16:31:19 +02:00
Henri Verbeet
b761f1a263 vkd3d-shader/spirv: Use location information from the current instruction. 2024-04-30 16:31:14 +02:00
Henri Verbeet
8b8ad07057 vkd3d-shader/hlsl: Use vkd3d_string_buffer_printf() in declare_predefined_types(). 2024-04-30 16:31:09 +02:00
Francisco Casas
ee735e8eed vkd3d-shader/hlsl: Fold x * 1 identities. 2024-04-30 16:31:05 +02:00
Francisco Casas
b14f935d0f vkd3d-shader/hlsl: Fold x + 0 identities. 2024-04-30 16:31:02 +02:00
Francisco Casas
c43c900a30 tests: Test x + 0 and x * 1 indentities. 2024-04-30 16:31:01 +02:00
Stefan Dösinger
13e1491941 tests/d3d12: Add tests for storing and retrieving cache values. 2024-04-24 23:49:23 +02:00
Stefan Dösinger
cb6c868460 vkd3d: Implement cache locking. 2024-04-24 23:49:20 +02:00
Stefan Dösinger
71f1955cd6 vkd3d: Implement vkd3d_shader_cache_get. 2024-04-24 23:49:20 +02:00
Stefan Dösinger
aad76f4ed2 vkd3d: Implement vkd3d_shader_cache_put. 2024-04-24 23:49:15 +02:00
Henri Verbeet
af33caf036 vkd3d-common: Introduce vkd3d_atomic_exchange_ptr(). 2024-04-24 23:49:12 +02:00
Henri Verbeet
b1c326ce56 vkd3d-common: Introduce vkd3d_atomic_exchange_u32(). 2024-04-24 23:49:11 +02:00
Henri Verbeet
5c8a90a6c9 vkd3d-common: Introduce vkd3d_atomic_compare_exchange_u32(). 2024-04-24 23:49:11 +02:00
Henri Verbeet
bfbd29efe6 vkd3d: Get rid of vkd3d_atomic_compare_exchange_pointer(). 
The only uses of this were remove by commit
3ca2259807.
 2024-04-24 23:49:10 +02:00
Henri Verbeet
2b6012df7d tests/shader_runner: Use WIDL_C_INLINE_WRAPPERS. 2024-04-24 23:48:44 +02:00
Henri Verbeet
11db8c1719 vkd3d-common: Use WIDL_C_INLINE_WRAPPERS. 2024-04-24 23:48:44 +02:00
Henri Verbeet
534044181b vkd3d-utils: Use WIDL_C_INLINE_WRAPPERS. 2024-04-24 23:48:44 +02:00
Henri Verbeet
d5717d333b vkd3d: Use WIDL_C_INLINE_WRAPPERS. 2024-04-24 23:48:44 +02:00
Conor McCarthy
075979fa21 vkd3d-shader/ir: Always check for undominated SSA use in register relative addresses. 2024-04-24 23:48:13 +02:00
Francisco Casas
5e3515f191 vkd3d-shader/d3dbc: Support SM1 if conditionals. 
According to the documentation, if_comp is available from 2_x pixel
and vertex shaders and, unlike "if bool" it doesn't expect a constant
boolean register (from the input signature), so:

if_neq cond -cond

seems like a convenient way to write these, for profiles above 2.0.
 2024-04-24 23:48:06 +02:00
Francisco Casas
d2427ea1bd vkd3d-shader/ir: Lower IFC instructions to IF instructions. 2024-04-24 23:48:05 +02:00
Francisco Casas
e370ce5bf2 vkd3d-shader/d3dbc: Pass hlsl_block instead of function declaration. 2024-04-24 23:48:04 +02:00
Francisco Casas
74c998a2a4 tests: Add additional conditional tests for shader model 3.0. 2024-04-24 23:48:04 +02:00
Francisco Casas
dbb9cfd958 tests/shader-runner: Report whole-block errors on the block's starting line. 
So, if there is an error or a trace on "[pixel shader]" or similar
blocks, they get reported in the line with the tag at the beginning of
the block and no on the line where the next block starts.
 2024-04-24 23:47:55 +02:00
Henri Verbeet
46fca3f9f4 vkd3d-common: Introduce VKD3D_BITMAP_SIZE. 2024-04-23 22:41:25 +02:00
Francisco Casas
aa35b2cecb vkd3d-shader/hlsl: Cleanup parse_attribute_list structs (valgrind). 2024-04-23 22:38:03 +02:00
Conor McCarthy
e3dde09bb9 vkd3d-shader/ir: Accept undefined PHI incomings as valid. 
An incoming can be undefined if the PHI result is not used if the
incoming's path was taken, or if the undefined value is consumed by
an instruction (dxc will compile such code without errors).
 2024-04-23 22:37:33 +02:00
Nikolay Sivov
836fe05916 tests: Add some tests for string variables. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-04-23 22:37:19 +02:00
Zebediah Figura
d7da278693 vkd3d-shader/hlsl: Make HLSL_TYPE_RENDERTARGETVIEW into a separate class. 2024-04-23 22:37:09 +02:00
Zebediah Figura
ee2bde3aba vkd3d-shader/hlsl: Make HLSL_TYPE_DEPTHSTENCILVIEW into a separate class. 2024-04-23 22:37:06 +02:00
Zebediah Figura
76971d811e vkd3d-shader/hlsl: Make HLSL_TYPE_TECHNIQUE into a separate class. 2024-04-23 22:36:51 +02:00
Zebediah Figura
3c8c7426df vkd3d-shader/hlsl: Make HLSL_TYPE_PASS into a separate class. 2024-04-23 22:36:38 +02:00
Zebediah Figura
24d3a352a6 vkd3d-shader/hlsl: Make HLSL_TYPE_EFFECT_GROUP into a separate class. 2024-04-23 22:36:32 +02:00
Giovanni Mascellani
6b841486d4 vkd3d-shader/ir: Materialize SSAs in each function of a hull shader. 2024-04-23 22:36:17 +02:00
Giovanni Mascellani
c8af142bb0 vkd3d-shader/ir: Structurize each function of a hull shader. 2024-04-23 22:36:16 +02:00
Giovanni Mascellani
d8e4b19cdc vkd3d-shader/ir: Skip invalid blocks when materializing undominated SSAs. 2024-04-23 22:36:14 +02:00
Conor McCarthy
eae1411cdc tests/hlsl: Add tests for texture UAV signed atomics. 2024-04-23 22:36:08 +02:00
Conor McCarthy
ee8ca0e9c2 tests/hlsl: Add tests for texture UAV atomics. 2024-04-23 22:36:06 +02:00
Conor McCarthy
1c73ac668f tests/hlsl: Add a test for UAV InterlockedExchange(). 2024-04-23 22:36:05 +02:00
Conor McCarthy
7e4fee658b tests/hlsl: Add a test for a structured UAV scalar store. 2024-04-23 22:36:02 +02:00
Conor McCarthy
0f7095d2aa tests/hlsl: Add tests for min() and integer max(). 2024-04-23 22:35:51 +02:00
Henri Verbeet
7b4a1fdfbc vkd3d: Move the vkd3d_cond implementation to vkd3d-common. 
Much like the vkd3d_mutex implementation.
 2024-04-22 23:15:20 +02:00
Henri Verbeet
8345b9b6f5 vkd3d-shader/glsl: Implement VKD3DSIH_NOP. 2024-04-22 23:14:30 +02:00
Henri Verbeet
037e8436c9 tests/shader_runner: Pass only valid stages to vkCreateGraphicsPipelines(). 
The first thing that's broken is that the "sType" field isn't
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO, but we're also
passing invalid "module" handles.
 2024-04-22 23:14:20 +02:00
Giovanni Mascellani
7fbd753cf7 include: Document structure vkd3d_host_time_domain_info. 2024-04-22 23:14:15 +02:00
Giovanni Mascellani
d2d4ed9f63 include: Document structure vkd3d_application_info. 2024-04-22 23:14:15 +02:00
Giovanni Mascellani
d27bbce0e1 include: Document struct vkd3d_optional_instance_extensions_info. 2024-04-22 23:14:15 +02:00
Giovanni Mascellani
a1ebb3925b include: Document struct vkd3d_structure_type. 2024-04-22 23:14:15 +02:00
Giovanni Mascellani
995a316fba include: Document struct vkd3d_instance_create_info. 2024-04-22 23:14:15 +02:00
Giovanni Mascellani
9241e1bcd3 ci: Run crosstests with DXC too. 
This is added as a new job because some tests currently fail. A 32 bit
job is not created, instead, because a 32 bit dxcompiler.dll is not
available.
 2024-04-22 23:13:50 +02:00
Giovanni Mascellani
09630ada90 tests: Allow compiling shaders with DXC on crosstests. 
This is currently disabled on the CI because dxcompiler.dll is not
available.
 2024-04-22 23:13:48 +02:00
Giovanni Mascellani
53fd1a95fc tests: Allow skipping DXC tests at runtime. 2024-04-22 23:13:48 +02:00
Conor McCarthy
079f8e4d52 vkd3d-shader/dxil: Implement DX intrinsic OutputControlPointID. 2024-04-22 23:13:31 +02:00
Conor McCarthy
3976738baf vkd3d-shader/dxil: Implement DX intrinsic DomainLocation. 2024-04-22 23:13:30 +02:00
Conor McCarthy
e165f9cefc vkd3d-shader/dxil: Implement DX intrinsic StorePatchConstant. 2024-04-22 23:13:29 +02:00
Conor McCarthy
3479962983 vkd3d-shader/dxil: Implement DX intrinsics LoadOutputControlPoint and LoadPatchConstant. 2024-04-22 23:13:28 +02:00
Conor McCarthy
4457181b2a vkd3d-shader/dxil: Support patch constant functions and signatures. 2024-04-22 23:13:26 +02:00
Conor McCarthy
d5c6e12dd3 tests/hlsl: Add wave op tests. 2024-04-22 23:13:20 +02:00
Zebediah Figura
6cf065e7fd tests: Add tests for register space reservation syntax. 2024-04-22 23:13:16 +02:00
Zebediah Figura
f7a79517ae tests: Add tests for profile syntax in register reservations. 2024-04-22 23:13:16 +02:00
Zebediah Figura
e3e93b76d2 tests: Do not run the d3d11 backend with shader model 5.1. 2024-04-22 23:13:16 +02:00
Zebediah Figura
833c897aac vkd3d-shader/hlsl: Parse register space reservations. 2024-04-22 23:13:15 +02:00
Zebediah Figura
29f6a7e5f7 vkd3d-shader/hlsl: Rename register_opt and packoffset_opt to register_reservation and packoffset_reservation. 
"opt" seems to imply "optional", but the optional aspect of these reservations
is not (and never has been) encoded into these rules.
 2024-04-22 23:13:13 +02:00
Henri Verbeet
4a209efb62 vkd3d-shader/hlsl: Support spirv-binary and spirv-text as target formats. 2024-04-19 22:24:07 +02:00
Henri Verbeet
0116e49d9b vkd3d-shader/hlsl: Support d3d-asm as target format. 2024-04-19 22:24:06 +02:00
Henri Verbeet
414bb99542 vkd3d-shader/glsl: Add vkd3d-shader version information to the generated shader. 2024-04-19 22:23:55 +02:00
Conor McCarthy
3205e08fb1 vkd3d-shader/dxil: Support SV_Depth, SV_DepthGreaterEqual and SV_DepthLessEqual. 2024-04-19 22:23:43 +02:00
Conor McCarthy
7eeca3fa39 tests/hlsl: Add tests for SV_DepthLessEqual and SV_DepthGreaterEqual. 2024-04-19 22:23:42 +02:00
Conor McCarthy
b68a9ae3ec tests/hlsl: Add tests for SV_Depth. 2024-04-19 22:23:40 +02:00
Giovanni Mascellani
dbe3c00a77 tests/shader-runner: Use OpDemoteToHelperInvocationEXT when available. 2024-04-19 22:23:35 +02:00
Giovanni Mascellani
7196484e59 tests: Check that derivatives are still computed after discarding. 2024-04-19 22:23:35 +02:00
Giovanni Mascellani
12c457b43f tests: Avoid using a different UAV for SM<6 and SM>=6. 2024-04-19 22:23:35 +02:00
Giovanni Mascellani
296edf0d68 vkd3d-utils: Make all extensions optional in D3D12CreateDeviceVKD3D(). 
A D3D12 device can be useful even without a surface and swapchain.
On the other hand, just having the surface and swapchain extensions
doesn't give any feature (the client still has to manage them), so
there is no point in making them a requirement.
 2024-04-19 22:23:28 +02:00
Zebediah Figura
171e097268 vkd3d-shader/hlsl: Make HLSL_TYPE_UAV into a separate class. 2024-04-19 22:23:20 +02:00
Zebediah Figura
93d7cd1785 vkd3d-shader/hlsl: Make HLSL_TYPE_TEXTURE into a separate class. 2024-04-19 22:23:19 +02:00
Zebediah Figura
220362cbad vkd3d-shader/hlsl: Make HLSL_TYPE_SAMPLER into a separate class. 2024-04-19 22:23:18 +02:00
Zebediah Figura
f57db442b0 vkd3d-shader/hlsl: Make HLSL_TYPE_STRING into a separate class. 2024-04-19 22:23:16 +02:00
Zebediah Figura
cdcf2da2eb vkd3d-shader/hlsl: Make HLSL_TYPE_VOID into a separate class. 2024-04-19 22:23:14 +02:00
Henri Verbeet
e17e481130 vkd3d-shader/glsl: Call vkd3d_shader_normalise(). 2024-04-17 22:52:20 +02:00
Henri Verbeet
c7fc60a237 vkd3d: Avoid leaking "messages" when "error_blob" is NULL in vkd3d_serialize_versioned_root_signature(). (Valgrind). 2024-04-17 22:52:07 +02:00
Henri Verbeet
8a7cb0295a vkd3d: Avoid leaking "messages" when "error_blob" is NULL in vkd3d_serialize_root_signature(). (Valgrind). 2024-04-17 22:52:05 +02:00
Conor McCarthy
742288127f vkd3d: Support DXGI_FORMAT_B4G4R4A4_UNORM. 2024-04-17 22:51:57 +02:00
Conor McCarthy
8879521679 vkd3d: Support DXGI_FORMAT_B5G5R5A1_UNORM. 2024-04-17 22:51:57 +02:00
Conor McCarthy
4cdf38d392 vkd3d: Support DXGI_FORMAT_B5G6R5_UNORM. 2024-04-17 22:51:57 +02:00
Conor McCarthy
6205d96c3b tests: Add UNORM formats B5G6R5, B5G5R5A1 and B4G4R4A4 to the UAV image clear tests. 2024-04-17 22:51:56 +02:00
Conor McCarthy
b0145ad96e vkd3d-shader: Introduce a wave ops feature flag. 2024-04-17 22:51:52 +02:00
Conor McCarthy
270aa22d0b vkd3d: Use Vulkan 1.1 if available. 2024-04-17 22:51:51 +02:00
Conor McCarthy
6975a8d726 vkd3d-shader: Introduce SPIRV_ENVIRONMENT_VULKAN_1_1. 
The SPIR-V backend may emit SPIR-V 1.3 if Vulkan 1.1 is available.
Some extensions which provide wave op instructions are available in
SPIR-V 1.0, but these are not sufficient to implement all Shader Model 6
wave op intrinsics. SPIR-V 1.3 has all of the required instructions, but
does not support reading from a quad at a non-constant (but uniform) lane
index, so it may later prove necessary to introduce a Vulkan 1.2
environment.
 2024-04-17 22:51:49 +02:00
Conor McCarthy
a7870e1793 vkd3d-shader/spirv: Emit a compiler warning if an atomic op is flagged volatile. 2024-04-17 22:51:43 +02:00
Conor McCarthy
d9f42b2c51 vkd3d-shader/dxil: Implement the DXIL CMPXCHG instruction. 2024-04-17 22:51:41 +02:00
Conor McCarthy
f13c65abb0 tests/hlsl: Add an InterlockedCompareExchange() TGSM test. 2024-04-17 22:51:40 +02:00
Conor McCarthy
99996ed5b5 vkd3d-shader/dxil: Implement DX intrinsic RenderTargetGetSampleCount. 2024-04-17 22:51:34 +02:00
Conor McCarthy
fe5e821cca vkd3d-shader/dxil: Implement DX intrinsics Texture2DMSGetSamplePosition and RenderTargetGetSamplePosition. 2024-04-17 22:51:32 +02:00
Conor McCarthy
696fc12061 tests/hlsl: Add tests for GetSamplePosition() and GetSampleCount(). 2024-04-17 22:51:30 +02:00
Henri Verbeet
1d6c3eae78 vkd3d-shader/ir: Remove VKD3DSIH_DCL_CONSTANT_BUFFER instructions. 2024-04-16 22:18:52 +02:00
Henri Verbeet
8a9364c124 vkd3d-shader/d3d-asm: Get rid of shader_addline(). 2024-04-16 22:18:44 +02:00
Giovanni Mascellani
a359c42795 vkd3d-shader/ir: Only emit launchers when needed. 2024-04-16 22:18:33 +02:00
Giovanni Mascellani
df4731dc17 vkd3d-shader/ir: Only emit trampolines when needed. 2024-04-16 22:18:26 +02:00
Giovanni Mascellani
d6ba8b88fa vkd3d-shader/ir: Swap selection branches if the if branch is empty. 2024-04-16 22:18:25 +02:00
Conor McCarthy
0515482e82 vkd3d-shader/ir: Validate tessellation declarations. 2024-04-16 22:18:18 +02:00
Conor McCarthy
e1abf1e48a vkd3d-shader/dxil: Implement DX intrinsic PrimitiveID. 2024-04-16 22:18:17 +02:00
Conor McCarthy
54016b3ced vkd3d-shader/dxil: Load hull shader properties. 2024-04-16 22:18:15 +02:00
Conor McCarthy
02cbc511bb vkd3d-shader/dxil: Load domain shader properties. 2024-04-16 22:18:14 +02:00
Conor McCarthy
2379bda36f tests/hlsl: Add a tessellation test. 2024-04-16 22:18:12 +02:00
Henri Verbeet
7d6f0f2592 vkd3d: Implement creating compute pipeline states from shaders with embedded root signatures. 2024-04-15 21:34:09 +02:00
Henri Verbeet
18986ddb50 tests: Test creating compute pipeline states from shaders with embedded root signatures. 2024-04-15 21:34:09 +02:00
Henri Verbeet
b8eadf4bab vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_interpolation_mode(). 2024-04-15 21:33:58 +02:00
Henri Verbeet
1ad524072d vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_primitive_type(). 2024-04-15 21:33:57 +02:00
Henri Verbeet
7d72accce2 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_decl_usage(). 2024-04-15 21:33:56 +02:00
Henri Verbeet
4d8c966ff4 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_shader_input_sysval_semantic(). 2024-04-15 21:33:55 +02:00
Henri Verbeet
37401fa11c vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_reg_type(). 2024-04-15 21:33:54 +02:00
Henri Verbeet
7c66c9122d vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_register(). 2024-04-15 21:33:52 +02:00
Conor McCarthy
425e0aa6c3 tests/hlsl: Supply data for all mip levels in calculate-lod.shader_test. 
Fixes invalid read in the GL runner.
 2024-04-15 21:33:40 +02:00
Conor McCarthy
23db066922 vkd3d-shader/ir: Implement MAD in two operations if flagged as precise. 
With some changes by Giovanni Mascellani.
 2024-04-15 21:33:35 +02:00
Giovanni Mascellani
9112a5be58 vkd3d-shader/ir: Move DCL_TEMPS removal to the generic instruction lowering pass. 2024-04-15 21:33:34 +02:00
Giovanni Mascellani
8a17a5a08b vkd3d-shader/ir: Introduce vsir_program_lower_instructions(). 
It is meant as generic pass to host all program changes to single
instructions that do not require keeping a global state, intstead
of having to loop through the whole program many times.
 2024-04-15 21:33:32 +02:00
Giovanni Mascellani
a7dc6dcce2 vkd3d-shader/ir: Split handling jumps when emitting a structured program. 2024-04-15 21:33:28 +02:00
Giovanni Mascellani
1a8a4c7787 vkd3d-shader/ir: Split handling selections when emitting a structured program. 2024-04-15 21:33:26 +02:00
Giovanni Mascellani
052df4d693 vkd3d-shader/ir: Split handling loops when emitting a structured program. 2024-04-15 21:33:16 +02:00
Giovanni Mascellani
5e42f6779a vkd3d-shader/ir: Split handling blocks when emitting a structured program. 2024-04-15 21:33:15 +02:00
Giovanni Mascellani
b4cfc24f67 vkd3d-shader/ir: Refactor declaration emission outside of the CFG structure. 
This is in preparation of handling more than one function (as
it happens for Hull Shaders), which will require having a single
row of declarations, but handling more than one CFG.
 2024-04-15 21:33:14 +02:00
Giovanni Mascellani
27801e5612 vkd3d-shader/ir: Split undominated SSA materialization. 2024-04-15 21:33:13 +02:00
Giovanni Mascellani
d891ac5017 vkd3d-shader/ir: Split program structurization. 2024-04-15 21:33:12 +02:00
Giovanni Mascellani
eb15f97083 vkd3d-shader/ir: Move breaks out of selections again after having optimized loops. 2024-04-15 21:33:08 +02:00
Giovanni Mascellani
be7eec75dc vkd3d-shader/ir: Append code to the non-breaking branch if there is breaking one. 2024-04-15 21:33:07 +02:00
Giovanni Mascellani
a2c6b5450b vkd3d-shader/ir: Prepare for changing the destination list in vsir_cfg_optimize_recurse(). 2024-04-15 21:33:05 +02:00
Petrichor Park
1fb9e7526b vkd3d-shader/hlsl: Implement tanh. 2024-04-15 21:32:59 +02:00
Petrichor Park
c4182cc272 vkd3d-shader/hlsl: Implement hyperbolic sin and cos. 2024-04-15 21:32:56 +02:00
Henri Verbeet
2b7d9790d6 configure: Use AC_CHECK_TOOL to check for widl. 
In particular, this will automatically pick up
x86_64-w64-mingw32-widl/i686-w64-mingw32-widl (provided by mingw-w64-tools on
Debian) when present and building for the corresponding hosts.
 2024-04-11 16:12:22 -05:00
Giovanni Mascellani
aad040af05 vkd3d-shader/ir: Remove loops that terminate with a `break'. 2024-04-11 09:22:14 -05:00
Giovanni Mascellani
105ccc4769 vkd3d-shader/ir: Count how many jumps target each loop. 2024-04-11 09:22:13 -05:00
Giovanni Mascellani
f5d1b5d263 vkd3d-shader/ir: Move `break's out of selection constructs when possible. 2024-04-11 09:22:11 -05:00
Giovanni Mascellani
e29706d366 tests: Check that side effects do not happen after discard. 2024-04-10 08:55:33 -05:00
Nikolay Sivov
8d78e3a821 vkd3d-shader/hlsl: Support refract() intrinsic. 
With some changes by Giovanni Mascellani.
 2024-04-10 08:55:27 -05:00
Nikolay Sivov
fd9e1a87ff vkd3d-shader/hlsl: Test refract() intrinsic. 
With some changes by Giovanni Mascellani.
 2024-04-10 08:55:26 -05:00
Giovanni Mascellani
ecad299ba4 vkd3d-shader/hlsl: Emit half results when operating on half arguments. 2024-04-10 08:55:24 -05:00
Zebediah Figura
280bea9033 vkd3d-shader/fx: Use a switch in write_fx_2_initial_value(). 2024-04-10 08:55:20 -05:00
Zebediah Figura
6c6106f780 vkd3d-shader/fx: Move unimplemented type checks into is_type_supported_fx_2(). 2024-04-10 08:55:19 -05:00
Zebediah Figura
047040fc63 vkd3d-shader/fx: Don't use an array to write the type class. 2024-04-10 08:55:18 -05:00
Zebediah Figura
285059ef11 vkd3d-shader/d3dbc: Consider the class in sm1_base_type(). 
We want the base type to stop being a property of all types, and to stop using
the same enumeration for objects and numeric types. The backend should do the
work of translation; we want a more sensible and convenient representation for
the compiler itself.
 2024-04-10 08:55:17 -05:00
Zebediah Figura
a882d60534 vkd3d-shader/hlsl: Map HLSL_TYPE_DOUBLE to D3DXPT_FLOAT. 2024-04-10 08:55:15 -05:00
Conor McCarthy
9d7f63dc26 vkd3d: Validate that a resource with initial state RENDER_TARGET is a render target. 2024-04-10 08:55:11 -05:00
Conor McCarthy
78301d7202 vkd3d: Validate presence of flag ALLOW_RENDER_TARGET or ALLOW_DEPTH_STENCIL for multisampled resources. 2024-04-10 08:55:11 -05:00
Conor McCarthy
e46de1daa2 tests/d3d12: Test resource flags for multisampled resources. 2024-04-10 08:55:09 -05:00
Stefan Dösinger
a7860ae752 vkd3d: Implement reopening existing caches. 2024-04-10 08:54:58 -05:00
Stefan Dösinger
f24005507c vkd3d: Implement opening and closing shader caches. 2024-04-10 08:54:58 -05:00
Stefan Dösinger
26387e1d4b tests: Add CreateShaderCacheSession pointer clearing tests. 
Native's behavior is inconsistent. It sets the pointer to NULL when it
fails to open an existing cache due to a version mismatch, but leaves
the pointer untouched when the description fails validation.
 2024-04-10 08:54:56 -05:00
Giovanni Mascellani
42f07352a0 ci: Build Mesa for release. 
Otherwise it trips on a few failed assertions in d3d12.c.
 2024-04-10 08:54:51 -05:00
Giovanni Mascellani
0be29f78c0 tests: Pop the test context when leaving its scope. 2024-04-10 08:54:51 -05:00
Giovanni Mascellani
59a5d8f852 tests: Add llvmpipe among the Mesa drivers. 2024-04-10 08:54:50 -05:00
Giovanni Mascellani
ecd38f3d1b tests: Print the device name. 2024-04-10 08:54:50 -05:00
Giovanni Mascellani
7cfb02cfd3 tests: Skip some tests that crash on llvmpipe. 2024-04-10 08:54:50 -05:00
Giovanni Mascellani
0b2ce5c13a tests: Mark some test failures as todo on llvmpipe. 2024-04-10 08:54:50 -05:00
Giovanni Mascellani
a2bb4ef301 vkd3d-shader/d3d-asm: Reset indent level on HS phases. 2024-04-10 08:54:29 -05:00
Conor McCarthy
cb5411408a vkd3d-shader/dxil: Implement DX intrinsic CalculateLOD. 2024-04-10 08:54:23 -05:00
Conor McCarthy
bdfa14d219 tests/hlsl: Add tests for CalculateLevelOfDetail(). 
Includes improvements made by Giovanni Mascellani.
 2024-04-10 08:54:23 -05:00
Francisco Casas
e9559c394b vkd3d-shader/hlsl: Allow KW_PIXELSHADER and KW_VERTEXSHADER as stateblock lhs. 2024-04-10 08:54:23 -05:00
Francisco Casas
ef9ae22ed0 vkd3d-shader/hlsl: Store state block on pass variables. 2024-04-10 08:54:23 -05:00
Francisco Casas
a99bcb1196 vkd3d-shader/hlsl: Parse list of state blocks. 2024-04-10 08:54:23 -05:00
Francisco Casas
80320f6129 vkd3d-shader/hlsl: Introduce hlsl_ir_stateblock_constant. 2024-04-10 08:54:23 -05:00
Francisco Casas
ee0d439a1b vkd3d-shader/hlsl: Parse and store state blocks on variables. 2024-04-10 08:54:23 -05:00
Francisco Casas
73ef6907bc tests: Add tests for "compile" and CompileShader() syntax. 2024-04-10 08:54:23 -05:00
Francisco Casas
83f4b46fb1 tests: Add tests for fxgroup syntax. 2024-04-10 08:54:23 -05:00
Francisco Casas
00c8cf1bcc tests: Test function call syntax for state blocks. 2024-04-10 08:54:23 -05:00
Francisco Casas
9ede222714 tests: Add more state block syntax tests. 2024-04-10 08:54:23 -05:00
Francisco Casas
4dedcc5885 vkd3d-shader/hlsl: Also call dce before lowering deref paths. 2024-04-10 08:54:23 -05:00
Henri Verbeet
d1e16514d0 tests/test-driver: Avoid "head" with negative line count. 
It's not supported on macOS, and not needed here.
 2024-04-09 12:28:51 -05:00
Giovanni Mascellani
ca2f54e729 ci: Delimit building each commit with a collapsible section. 2024-04-09 12:28:10 -05:00
Francisco Casas
5ab1ef1cad vkd3d-shader/hlsl: Properly release string buffer on write_atan_or_atan2(). 
vkd3d_string_buffer_cleanup() doesn't do the same as
hlsl_release_string_buffer(). The former only frees the char array
inside the string buffer and not the string buffer itself.
 2024-04-09 12:28:03 -05:00
Zebediah Figura
0e3377a1be vkd3d-shader/hlsl: Avoid using HLSL_CLASS_OBJECT without checking the base type. 
As the diffstat shows, HLSL_CLASS_OBJECT does not really have much in common.
Resource types (TEXTURE, SAMPLER, UAV) sometimes behave similarly to each other,
but do not generally behave similarly to effect-specific types (string, shader,
state, view). Most consumers of HLSL_CLASS_OBJECT subsequently check the base
type anyway.

Hence we want to replace HLSL_TYPE_* with individual classes for object types.
As a first step, change the last few places that only check HLSL_CLASS_OBJECT.
 2024-04-09 12:27:55 -05:00
Zebediah Figura
269cdad7b9 vkd3d-shader/hlsl: Consider any valid register reservation to invoke manual packing. 
Regardless of the type of the variable.
 2024-04-09 12:27:53 -05:00
Zebediah Figura
bdbf5e7d74 tests: Add more tests for manual packing. 2024-04-09 12:27:53 -05:00
Zebediah Figura
ce50c3a186 vkd3d-shader/hlsl: Use hlsl_type_is_resource() for unbounded array checks. 
Not all objects can be unbounded descriptors.
 2024-04-09 12:27:51 -05:00
Zebediah Figura
083a58767a tests: Test HLSL unbounded array syntax. 
Change the shader in test_unbounded_samplers() to also test a nested array.
Note that the changed shader compiles to the same bytecode.
 2024-04-09 12:27:49 -05:00
Zebediah Figura
c5f507ac38 vkd3d-shader/hlsl: Add SM5.1 shader target strings. 2024-04-09 12:27:47 -05:00
Zebediah Figura
843968cd63 vkd3d-shader/hlsl: Use hlsl_version_ge() when checking for unbounded arrays. 
6.x also allows them.
 2024-04-09 12:27:45 -05:00
Zebediah Figura
5fbd2708c0 vkd3d-shader/hlsl: Move shader version helpers to hlsl.h. 2024-04-09 12:27:43 -05:00
Conor McCarthy
e72c3bab71 vkd3d-shader/spirv: Ensure the data register is UINT in spirv_compiler_emit_store_tgsm(). 2024-04-09 12:27:30 -05:00
Conor McCarthy
dc99159dd8 vkd3d-shader/spirv: Bitcast if necessary in spirv_compiler_emit_store_dst_components(). 2024-04-09 12:27:29 -05:00
Conor McCarthy
85c8c6be4d vkd3d-shader/dxil: Support constexpr GEP. 2024-04-09 12:27:26 -05:00
Conor McCarthy
7d5e3713f9 vkd3d-shader/ir: Materialise SSAs to temps before lowering switch instructions. 2024-04-09 12:27:20 -05:00
Conor McCarthy
cfcd57209b vkd3d-shader/ir: Convert SSAs to temps only if the block of origin does not dominate all uses. 2024-04-09 12:27:19 -05:00
Conor McCarthy
1c61776c18 vkd3d-shader/spirv: Handle uint2 to double bitcast in spirv_compiler_emit_mov(). 
Necessary for MakeDouble if the dst is SSA.
 2024-04-09 12:27:18 -05:00
Conor McCarthy
c8eb7e1c81 vkd3d-shader/spirv: Emit a uint result for RESINFO_UINT if the dst register is SSA. 2024-04-09 12:27:16 -05:00
Conor McCarthy
7bfc7410f2 vkd3d-shader/ir: Materialise phis to temps in the incoming blocks. 
RADV converts temps to phi instructions, so converting phis to MOVC in
VSIR just translates back to phis feeding into a MOVC. This commit
eliminates the MOVC.
 2024-04-09 12:27:15 -05:00
Francisco Casas
62bb12f322 vkd3d-shader/hlsl: Use LOGIC_AND instead of MUL in all(). 2024-04-09 12:27:09 -05:00
Francisco Casas
53e4d6eedb vkd3d-shader/hlsl: Use LOGIC_OR instead of BIT_OR in any(). 
Note that BIT_OR is not available for SM1 bools, so we must prefer
LOGIC_OR when possible.
 2024-04-09 12:27:07 -05:00
Francisco Casas
2621fc9572 vkd3d-shader/ir: Add missing src swizzle in vsir_program_lower_texkills(). 2024-04-09 12:27:06 -05:00
Francisco Casas
808ec288cf tests: Add failing test for clip.shader_test in SM1. 
We are not properly translating texkill to spir-v since it is only
considering the first component.
 2024-04-09 12:27:04 -05:00
Francisco Casas
8fca801591 vkd3d-shader/tpf: Use the extra_bits field for _nz on discard. 2024-04-09 12:27:03 -05:00
Francisco Casas
3503145ced tests: Report missing signature element in openGL runner. 2024-04-09 12:27:03 -05:00
Francisco Casas
3a0a4b625f vkd3d-shader/hlsl: Merge HLSL_OP3_MOVC into HLSL_OP3_TERNARY. 2024-04-09 12:27:02 -05:00
Francisco Casas
8f6f875a59 vkd3d-shader/hlsl: Move lower of non-float expressions with the other SM1 passes. 2024-04-09 12:27:01 -05:00
Francisco Casas
19fd43214b vkd3d-shader/hlsl: Ensure that TERNARY condition is always bool. 
Also, properly casting it to float in lower_ternary() for SM1
avoids creating ABS and NEG on bool types.
 2024-04-09 12:26:59 -05:00
Giovanni Mascellani
9c0d04c862 ci: Build the macOS image each time the Linux image is built. 2024-04-04 22:22:06 +02:00
Henri Verbeet
4f589356f1 tests: Free the shader blobs once we're done with them in test_create_pipeline_state(). (Valgrind). 2024-04-04 22:20:35 +02:00
Henri Verbeet
73996c9941 vkd3d-dxbc: Allow the section to extract to be specified by tag. 2024-04-04 22:20:30 +02:00
Henri Verbeet
6c3b87bed0 vkd3d-dxbc: Implement extracting section data. 2024-04-04 22:20:30 +02:00
Henri Verbeet
806afd7b50 vkd3d-dxbc: Free the blob if parsing it failed. 2024-04-04 22:20:30 +02:00
Henri Verbeet
8f529cd0ae vkd3d-dxbc: Introduce a helper function to apply actions. 2024-04-04 22:20:30 +02:00
Henri Verbeet
143b15fc47 vkd3d-dxbc: Introduce a helper function to handle ACTION_TYPE_EMIT. 2024-04-04 22:20:30 +02:00
Henri Verbeet
2712a79c55 vkd3d-dxbc: Close output files after writing them. 2024-04-04 22:20:30 +02:00
Stefan Dösinger
8653ce17cf tests: Add tests for creating D3D12ShaderCacheSession objects. 2024-04-04 22:19:46 +02:00
Stefan Dösinger
7c93b5070f vkd3d: Validate and store shader cache session descriptors. 2024-04-04 22:19:46 +02:00
Stefan Dösinger
fb87a72497 vkd3d: Add an ID3D12ShaderCacheSession stub. 2024-04-04 22:19:46 +02:00
Stefan Dösinger
d5c89051dd vkd3d: Add ID3D12Device9 interface stubs. 2024-04-04 22:19:46 +02:00
Giovanni Mascellani
a278f32d3f vkd3d-shader/ir: Synthesize selection constructs from conditional jumps. 2024-04-04 22:19:19 +02:00
Giovanni Mascellani
0d13b6afe9 vkd3d-shader/ir: Remove trailing `continue's. 2024-04-04 22:19:18 +02:00
Giovanni Mascellani
d8414302e8 vkd3d-shader/ir: Move `continue's to the false branch when possible. 2024-04-04 22:19:16 +02:00
Nikolay Sivov
4b0a328a2b vkd3d-shader/hlsl: Allow 'export' modifier on functions. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-04-03 22:24:15 +02:00
Giovanni Mascellani
636d8d3850 ci: Run tests on llvmpipe from Mesa 24.0.3. 2024-04-03 22:24:13 +02:00
Giovanni Mascellani
b3ce73984d ci: Make llvmpipe from Mesa 24.0.3 available in the CI image. 2024-04-03 22:24:13 +02:00
Giovanni Mascellani
e6c20361ea vkd3d-shader/ir: Drop a useless helper. 2024-04-03 22:23:08 +02:00
Giovanni Mascellani
9aff65c6d2 vkd3d-shader/ir: Open a loop when visiting the loop header. 
Not when making the loop header available, which is too early and
might lead to open too many loops at once.
 2024-04-03 22:23:06 +02:00
Nikolay Sivov
e1e6367210 vkd3d-shader/fx: Add an option to include empty buffers in the effect binary. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-04-02 23:10:42 +02:00
Nikolay Sivov
c509c85f63 vkd3d-shader/hlsl: Allow annotations on constant buffers. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-04-02 23:10:40 +02:00
Henri Verbeet
64418dd290 tests/shader_runner: Cleanup on insufficient GLSL support in gl_runner_init() (Valgrind). 2024-04-02 23:10:28 +02:00
Henri Verbeet
46bd3b1545 tests: Initialise resource_desc1.Layout in test_get_copyable_footprints() (Valgrind). 2024-04-02 23:10:18 +02:00
Giovanni Mascellani
d10031911d vkd3d-shader/ir: Move vsir_program_normalise() to the end of the file. 
vsir_program_normalise() has function calls to basically everything in
ir.c, so it's useful to have it in an easily reachable place to
quickly jump to wherever you need using your favorite code editor's
features.
 2024-04-02 23:10:07 +02:00
Giovanni Mascellani
9047dad4bc vkd3d-compiler: Clean up the shader code in all failure paths (Valgrind). 2024-04-02 23:10:02 +02:00
Giovanni Mascellani
2a101cf697 tests: Include vkd3d_d3d12.h in utils.h. 
RECT and D3D12_BOX are used from there.
 2024-04-02 23:09:53 +02:00
Giovanni Mascellani
5f2f126b70 include: Include stddef.h in vkd3d_shader.h. 
Type size_t is used in the file without importing any header which
defines it. This only works when the translation unit includes one of
the appropriate headers anyway or when the appropriate header is included
internally by other standard C headers; none of those strategies should
be relied upon.
 2024-04-02 23:09:51 +02:00
Zebediah Figura
106cbc02de vkd3d-shader/hlsl: Use hlsl_is_numeric_type() in type_has_object_components(). 2024-04-02 23:09:38 +02:00
Zebediah Figura
54f2dfe403 vkd3d-shader/hlsl: Simplify type_has_object_components(). 
The extra argument is not very easy to intuit. Since all we're trying to do here is check whether the type is a struct with object components in it, write that out explicitly.
 2024-04-02 23:09:36 +02:00
Zebediah Figura
1e7d82798c vkd3d-shader/hlsl: Move a hlsl_fixme() to a more relevant place. 2024-04-02 23:09:35 +02:00
Zebediah Figura
675d7b8cb6 vkd3d-shader/hlsl: Remove a redundant type check. 
We already perform an implicit cast per component in initialize_var_components().
 2024-04-02 23:09:33 +02:00
Conor McCarthy
d72d5c35d1 vkd3d-shader/dxil: Implement DX intrinsics Dot2, Dot3 and Dot4. 2024-04-02 23:09:28 +02:00
Conor McCarthy
2909a5aacc vkd3d-shader/dxil: Implement DX intrinsic MakeDouble. 2024-04-02 23:09:23 +02:00
Conor McCarthy
cf6e518f1e tests/hlsl: Add tests for asdouble(). 2024-04-02 23:09:20 +02:00
Francisco Casas
b1eaf8327b tests/test-driver: Print line where vkd3d_unreachable() was hit. 
With this, a test that fails because vkd3d_unreacheable() was hit, will
now display the error line.

    FAIL: tests/hlsl/some-test.shader_test
       (SM4.0-SM5.1)OpenGL/SPIR-V 43[XF] 79[XF] 126[XF] 149[XF] 159[XF]
       [AF] vkd3d/libs/vkd3d-shader/hlsl.c:246: Aborting, reached unreachable code.
       [SIGABRT] Aborted (core dumped)
 2024-03-27 22:37:52 +01:00
Francisco Casas
9a90b9591c tests/test-driver: Display [SIGABRT] and [SIGSEGV] tags. 
Some times the test can be aborted for reasons others than failed
assertions, such as segmentation faults or reaching unreacheable code.

This commit adds purple tags to the test driver for visual clarity.
 2024-03-27 22:37:48 +01:00
Conor McCarthy
11ee92ed7e vkd3d-shader/dxil: Implement DX intrinsic Discard. 2024-03-27 22:37:42 +01:00
Conor McCarthy
8d947ce868 vkd3d-shader/spirv: Support bool source in spirv_compiler_emit_discard(). 2024-03-27 22:37:40 +01:00
Zebediah Figura
6b6e4bc212 vkd3d-shader: Add a compile option to control whether implicit truncation warnings are printed. 
d3dcompiler and d3dx9 versions before 42 don't emit this error; this will be
necessary to emulate that behaviour.

Other warnings exist that are introduced in different d3dcompiler versions,
although there are not very many distinct HLSL warnings to begin with.

We could of course group all these together under a single compiler option, but
I find that using separate top-level options is unilaterally friendlier to an
API consumer, and simpler to implement as well. It also in some sense maps
conceptually to e.g. "-Wno-implicit-conversion".
 2024-03-27 22:37:34 +01:00
Nikolay Sivov
b382d1843d vkd3d-shader/fx: Accept texture types when writing fx_2_0 effects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:29 +01:00
Nikolay Sivov
b09f919673 vkd3d-shader/hlsl: Treat "texture" type name as case-insensitive. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:28 +01:00
Nikolay Sivov
17dc23269e vkd3d-shader/fx: Handle "uint" type for fx_2_0 parameters. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:27 +01:00
Nikolay Sivov
9117629e35 vkd3d-shader/fx: Handle "half" type for fx_2_0 parameters. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:25 +01:00
Nikolay Sivov
3fdf674a4d tests: Rename effect test files to make them easier to find. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:25 +01:00
Nikolay Sivov
88d9cff407 vkd3d-shader/fx: Set initial object count to 1 for fx_2_0. 
This is used for the object table at runtime. Object variable index is 1-based.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:24 +01:00
Nikolay Sivov
501aed43f3 vkd3d-shader/fx: Zero-pad strings when aligning them for fx_2_0. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:23 +01:00
Nikolay Sivov
228d54efff vkd3d-shader/fx: Mark shared variables as such for fx_2_0 effects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:21 +01:00
Nikolay Sivov
cfa63da3f1 vkd3d-shader: Adjust "child-effect" option documentation. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-27 22:37:21 +01:00
Francisco Casas
11e7265815 vkd3d-shader/spirv: Throw compiler error on unrecognized register. 
This codepath path is currently triggered when transpiling d3dbc shaders
that use vPos (or other of these special registers).

While vPos gets added to the input signature and gets assigned an INPUT
register, the registers in the shader instructions are still of
VKD3DSPR_MISCTYPE type and are not propperly mapped yet. This gives
invalid results.

Some SM1 tests must be set back to "todo" but they only work because, by
coincidence, we are assigning vPos the input register with index 0.
Propper mapping of these registers is still required.
 2024-03-27 22:37:15 +01:00
Zebediah Figura
172cb75872 vkd3d-shader/spirv: Implement VKD3DSIH_ABS. 2024-03-27 22:37:10 +01:00
Francisco Casas
9a222d2be1 vkd3d-shader/d3dbc: Implement HLSL_OP2_LOGIC_AND for SM1. 2024-03-27 22:37:09 +01:00
Francisco Casas
777bf772bf vkd3d-shader/d3dbc: Implement HLSL_OP2_LOGIC_OR for SM1. 2024-03-27 22:37:08 +01:00
Francisco Casas
a838f97e3f vkd3d-shader/hlsl: Cast to bool before applying LOGIC_NOT. 
Before this commit, it is possible for one of the tests of
cf-cond-types.shader_test to pass a non-bool to LOGIC_NOT, which should
not be allowed.
 2024-03-27 22:37:07 +01:00
Francisco Casas
ee5fc7e968 vkd3d-shader/hlsl: Support LOGIC_NOT for SM1. 2024-03-27 22:37:06 +01:00
Francisco Casas
90e8a541fb tests: Add tests for LOGIC_NOT on uniforms. 2024-03-27 22:37:06 +01:00
Conor McCarthy
68b31b7396 vkd3d-shader/spirv: Handle the sequentially consistent ordering flag for atomic instructions. 2024-03-27 22:37:01 +01:00
Conor McCarthy
a8dd788f41 vkd3d-shader/spirv: Emit a warning if the atomic instruction volatile flag is unhandled. 2024-03-27 22:37:00 +01:00
Conor McCarthy
9e0b9c3a7a vkd3d-shader/dxil: Implement the DXIL ATOMICRMW instruction. 2024-03-27 22:36:59 +01:00
Conor McCarthy
b708a9b3b5 vkd3d-shader/dxil: Implement DX instructions ThreadId, GroupId, ThreadIdInGroup and FlattenedThreadIdInGroup. 2024-03-27 22:36:58 +01:00
Conor McCarthy
c7dcfc2a04 tests/shader-runner: Add TGSM tests. 2024-03-27 22:36:57 +01:00
Conor McCarthy
0f332eb939 vkd3d-shader/dxil: Emit an error if a constant code is unhandled. 2024-03-27 22:36:56 +01:00
Conor McCarthy
47e56cdfed vkd3d-shader/spirv: Support 64-bit register info component type in spirv_compiler_emit_load_reg(). 
For 64-bit indexable temps (and any other 64-bit declarations) the write
mask must not be converted.
 2024-03-27 22:36:55 +01:00
Conor McCarthy
83a67366da vkd3d-shader/spirv: Do not assert if a TGSM store data register is not UINT. 2024-03-27 22:36:54 +01:00
Conor McCarthy
9da375414e vkd3d-shader/spirv: Do not assert if a TGSM load dst register is not UINT. 2024-03-27 22:36:52 +01:00
Giovanni Mascellani
24460728f2 Add a changelog for all the released versions of vkd3d. 2024-03-27 22:36:47 +01:00
Zebediah Figura
ddfa94fdca tests: Add more tests for resource and struct RDEF contents. 2024-03-27 22:36:43 +01:00
Zebediah Figura
98b90dde78 tests: Test constant and resource reflection via D3DReflect(). 
Ported from Wine.
 2024-03-27 22:36:40 +01:00
Zebediah Figura
2247288003 vkd3d-shader/tpf: Set the user-packed flag for sm5.0 resources as well. 2024-03-27 22:36:39 +01:00
Zebediah Figura
7b87895289 vkd3d-shader/tpf: Write the component count as the column count for structs. 2024-03-27 22:36:37 +01:00
Zebediah Figura
5bf23cb2f5 vkd3d-shader/tpf: Explicitly write the class and base type for non-numeric types. 
Avoid relying on that information being stored in the hlsl_type.
 2024-03-27 22:36:36 +01:00
Zebediah Figura
34e9c101e8 vkd3d-shader/tpf: Do not write structs with no numeric fields into the RDEF. 2024-03-27 22:36:35 +01:00
Zebediah Figura
0b1f11dd33 vkd3d-shader/hlsl: Allocate register reservations for structs as well. 2024-03-27 22:36:34 +01:00
Zebediah Figura
622fcda9ee vkd3d-shader/tpf: Do not write non-numeric struct fields into the RDEF. 2024-03-27 22:36:33 +01:00
Zebediah Figura
8ef5ee54c9 vkd3d-utils: Implement ID3D12ShaderReflectionType::GetMemberTypeByIndex(). 2024-03-27 22:36:33 +01:00
Zebediah Figura
dfed19ccf6 vkd3d-utils: Implement ID3D12ShaderReflectionVariable::GetType(). 2024-03-27 22:36:33 +01:00
Zebediah Figura
24b047f1fe vkd3d-utils: Implement ID3D12ShaderReflectionConstantBuffer::GetVariableByIndex(). 2024-03-27 22:36:33 +01:00
Zebediah Figura
2fceebd050 vkd3d-utils: Parse the RD11 section. 2024-03-27 22:36:33 +01:00
Zebediah Figura
90cd57404b vkd3d-utils: Implement ID3D12ShaderReflection::GetConstantBufferByIndex(). 2024-03-27 22:36:31 +01:00
Henri Verbeet
166dc24b2f vkd3d: Move the vkd3d_mutex implementation to vkd3d-common. 2024-03-19 22:58:53 +01:00
Henri Verbeet
2431357fd6 vkd3d-common: Merge vkd3d_debug.h into vkd3d_common.h. 
There doesn't seem much point in separating these. Pretty much all of
vkd3d (eventually) includes vkd3d_debug.h, and vkd3d_debug.h includes
vkd3d_common.h because it uses VKD3D_PRINTF_FUNC. The separation also
makes it inconvenient to use the debug macros in vkd3d_common.h.
 2024-03-19 22:58:51 +01:00
Henri Verbeet
5de5f241a6 vkd3d-shader/ir: Pass a struct vsir_program to vkd3d_shader_normalise(). 2024-03-19 22:57:56 +01:00
Henri Verbeet
0715734dfb tests/shader_runner: Add GLSL support to the GL runner. 2024-03-19 22:57:50 +01:00
Henri Verbeet
164608a007 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_dst_param(). 2024-03-18 23:08:03 +01:00
Henri Verbeet
e2d1a878a7 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_src_param(). 2024-03-18 23:08:02 +01:00
Henri Verbeet
939a7fbe88 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_partitioning(). 2024-03-18 23:08:01 +01:00
Henri Verbeet
5f5145b8f8 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_output_primitive(). 2024-03-18 23:08:00 +01:00
Henri Verbeet
f61a92b908 vkd3d-shader/d3d-asm: Pass a prefix and suffix to shader_dump_tessellator_domain(). 2024-03-18 23:07:58 +01:00
Henri Verbeet
b98171878f vkd3d-shader/glsl: Keep track of the current indentation level. 2024-03-18 23:07:52 +01:00
Giovanni Mascellani
e5f486edd3 vkd3d-shader/ir: Use type "unused" for labels. 
The label itself is certainly an unsigned integer, but the register
has no meaningful data type. It cannot be evaluated to anything.
The goal of this is to reduce cluttering in the internal ASM dumps.
 2024-03-18 23:07:45 +01:00
Giovanni Mascellani
d418f49888 vkd3d-shader/d3d-asm: Do not dump a register's type if it's unused. 2024-03-18 23:07:44 +01:00
Giovanni Mascellani
22d19aed58 vkd3d-shader/d3d-asm: Indent instructions inside a block. 2024-03-18 23:07:43 +01:00
Conor McCarthy
0c01a55c7d vkd3d-shader/dxil: Implement DX intrinsic Saturate. 2024-03-18 23:07:40 +01:00
Conor McCarthy
4599d3c1cf vkd3d-shader/dxil: Implement DX intrinsic FAbs. 2024-03-18 23:07:39 +01:00
Conor McCarthy
33694f08fc vkd3d-shader/dxil: Implement DX intrinsics FMa, FMad, IMad and UMad. 2024-03-18 23:07:38 +01:00
Conor McCarthy
421d311a49 vkd3d-shader/spirv: Use dst register data type in spirv_compiler_emit_imad(). 2024-03-18 23:07:36 +01:00
Conor McCarthy
08cc5027cf tests/hlsl: Add tests for mad() and fma(). 2024-03-18 23:07:35 +01:00
Nikolay Sivov
f55b152811 vkd3d-shader/fx: Fail effect writing on unsupported annotations. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-18 23:07:32 +01:00
Nikolay Sivov
206eeb0752 vkd3d-shader/fx: Remove newlines from fixme messages. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-18 23:07:31 +01:00
Nikolay Sivov
4fc15d4b4a vkd3d-shader/fx: Add initial support for writing fx_2_0 parameters. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-18 23:07:30 +01:00
Nikolay Sivov
ed06e0bbef vkd3d-shader/fx: Populate global variables list during context initialization. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-18 23:07:29 +01:00
Nikolay Sivov
ea686e8f5a vkd3d-shader/fx: Fix an instruction block leak. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-18 23:07:28 +01:00
Nikolay Sivov
9c7fe62da6 vkd3d-shader/fx: Use type writing helper only for fx_4+. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-18 23:07:27 +01:00
Conor McCarthy
3f99719ff2 vkd3d-shader/dxil: Implement DX intrinsic BufferUpdateCounter. 2024-03-18 23:07:23 +01:00
Conor McCarthy
52a831ba0d tests/hlsl: Add UAV counter tests. 2024-03-18 23:07:21 +01:00
Giovanni Mascellani
8c15377ffc vkd3d-shader/ir: Emit multilevel jumps in the structured program. 
The new structurizer therefore reaches feature parity with the
older simple one, except for a couple of points:

 * the old structurizer accepts any CFG, without requiring reducibility;
   however, the DXIL specification requires the CFG to be reducible
   anyway, so we're not really losing anything;

 * the new structurizer additionally requires that no block has two
   incoming back arrows; AFAIK this is condition that can happen,
   but in practice it seems to be rare; also, it's not hard to add
   support for it, as soon as it is decided it is useful.

On the other hand, the new structurizer makes use of the merging
information that are reconstructed from the CFG, which is important
for downstream optimization and fundamental for correctly emitting
tangled instructions.

Taking these considerations into account, the old structurizer is
considered superseded and is therefore removed.
 2024-03-18 23:07:17 +01:00
Giovanni Mascellani
c2aa01de6e vkd3d-shader/ir: Emit the reconstructed structured program. 
Multilevel jumps are not supported yet, and trigger a fallback to the
simple structurizer.
 2024-03-18 23:07:15 +01:00
Henri Verbeet
abf76372e0 vkd3d-shader/ir: Pass a struct vsir_program to vsir_validate(). 2024-03-14 23:24:29 +01:00
Henri Verbeet
7af3e9300f vkd3d-shader/ir: Pass a struct vsir_program to flatten_control_flow_constructs(). 2024-03-14 23:24:28 +01:00
Henri Verbeet
268989f5b9 vkd3d-shader/ir: Pass a struct vsir_program to normalise_combined_samplers(). 2024-03-14 23:24:27 +01:00
Henri Verbeet
674bebe9c9 vkd3d-shader/ir: Pass a struct vsir_program to shader_normalise_io_registers(). 2024-03-14 23:24:24 +01:00
Henri Verbeet
8a60814476 vkd3d-shader/glsl: Generate comments for unhandled instructions. 
Mostly for debugging purposes; we'll fail compilation, but will still trace
the shader that would have been generated.
 2024-03-14 23:24:19 +01:00
Henri Verbeet
9869fbb0ea vkd3d-shader/glsl: Trace the generated shader. 
Even if compilation ultimately failed.
 2024-03-14 23:24:16 +01:00
Francisco Casas
619edb4c38 vkd3d-shader/hlsl: Lower CMP instructions for vertex shaders. 2024-03-14 22:49:29 +01:00
Francisco Casas
4c40deaac1 vkd3d-shader/hlsl: Use hlsl_fixme() on missing SM1 matrix writemask lowering. 
Instead of FIXME(). Otherwise we compile invalid d3dbc.
 2024-03-14 22:49:29 +01:00
Francisco Casas
5c986b9cde vkd3d-shader/hlsl: Lower SLT instructions for pixel shaders. 
Properly passing the inverse-trig.shader_test tests whose qualifiers
have been removed requires making spirv.c capable of handling ABS.
The same happens for the ps_3_0 equality test in
float-comparison.shader_test.
 2024-03-14 22:49:29 +01:00
Francisco Casas
4133c4d801 tests: Test equality between tiny and between large numbers on ps_2_0. 2024-03-14 22:49:29 +01:00
Francisco Casas
e9a4758648 vkd3d-shader/hlsl: Implement SM1 comparison operators. 2024-03-14 22:49:29 +01:00
Francisco Casas
7b883eef53 vkd3d-shader/d3dbc: Check profiles before writing SLT and CMP. 2024-03-14 22:48:56 +01:00
Giovanni Mascellani
d75dc76011 vkd3d-shader/ir: Dump the reconstructed structured program. 2024-03-14 22:48:53 +01:00
Giovanni Mascellani
2b3e21caeb vkd3d-shader/ir: Add jumps to the structured programs. 2024-03-14 22:48:52 +01:00
Giovanni Mascellani
c25e4c47c3 vkd3d-shader/ir: Reconstruct a structured program. 
For simplicity jumps are not currently processed.
 2024-03-14 22:48:50 +01:00
Conor McCarthy
f08976be33 vkd3d-shader/dxil: Implement DX instruction Barrier. 2024-03-14 22:48:46 +01:00
Conor McCarthy
b22632ff1a vkd3d-shader/spirv: Emit a trace message if TGSM alignment is ignored. 
This would cause a lot of warning spam if it was a warning.
 2024-03-14 22:48:45 +01:00
Conor McCarthy
5e63164d01 vkd3d-shader/dxil: Implement structured groupshared address space global variables. 2024-03-14 22:48:44 +01:00
Conor McCarthy
0965a3608a vkd3d-shader/dxil: Implement raw groupshared address space global variables. 2024-03-14 22:48:43 +01:00
Conor McCarthy
6dd54eeb09 vkd3d-shader/spirv: Support zero-initialisation for workgroup memory. 2024-03-14 22:48:41 +01:00
Henri Verbeet
374c5fcbdd vkd3d-shader/glsl: Store a pointer to the vsir program in struct vkd3d_glsl_generator. 2024-03-13 22:00:48 +01:00
Henri Verbeet
5f1f7ababb vkd3d-shader/ir: Pass a struct vsir_program to remap_output_signature(). 2024-03-13 22:00:42 +01:00
Henri Verbeet
0edf6d25f3 vkd3d-shader/ir: Pass a struct vsir_program to simple_structurizer_run(). 2024-03-13 22:00:41 +01:00
Henri Verbeet
c3f3cb5ef9 vkd3d-shader/ir: Pass a struct vsir_program to materialize_ssas_to_temps(). 2024-03-13 22:00:40 +01:00
Henri Verbeet
76791913d0 vkd3d-shader/ir: Pass a struct vsir_program to materialize_ssas_to_temps_process_reg(). 2024-03-13 22:00:39 +01:00
Henri Verbeet
343a365c97 vkd3d-shader/ir: Pass a struct vsir_program to instruction_array_lower_texkills(). 2024-03-13 22:00:37 +01:00
Conor McCarthy
b6c41d5287 tests/hlsl: Add tests for countbits() and firstbit{high|low}(). 2024-03-13 21:50:39 +01:00
Conor McCarthy
0dc174ebd7 vkd3d-shader/spirv: Emit an error if a FIRSTBIT instruction has a 64-bit source. 2024-03-13 21:50:37 +01:00
Conor McCarthy
a64eb75c1d vkd3d-shader/spirv: Emit an error if COUNTBITS has a 64-bit source. 2024-03-13 21:50:36 +01:00
Zebediah Figura
a686fa7750 tests: Use a UAV barrier between ClearUnorderedAccessViewFloat() and a compute shader. 
In an attempt to fix test failures on radv.
 2024-03-13 21:50:31 +01:00
Henri Verbeet
9b0d304f8f vkd3d-shader/glsl: Introduce glsl_compile(). 2024-03-12 22:15:41 +01:00
Henri Verbeet
bdc096d437 vkd3d-shader/d3d-asm: Get rid of the (now) redundant "shader_desc" parameter to vkd3d_dxbc_binary_to_text(). 
And rename the function to d3d_asm_compile() while we're touching it.
 2024-03-12 22:15:34 +01:00
Francisco Casas
b831ffe96c tests: Avoid creating a file named "0" when calling "make check". 
We use "printf" instead of "print" in awk in order to avoid a newline in
the value of $xfcount, and use "-gt" instead of ">", which creates the
spurious file, in the comparison.
 2024-03-12 22:15:00 +01:00
Nikolay Sivov
948cd2154a vkd3d-shader/fx: Handle 'single' modifier for buffers. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-12 22:14:50 +01:00
Nikolay Sivov
e0ef45c0a3 vkd3d-shader: Parse a 'single' modifier. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-12 22:14:50 +01:00
Nikolay Sivov
cf7c05f431 vkd3d-shader: Remove a token for 'precise' modifier. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-12 22:14:50 +01:00
Giovanni Mascellani
f2b2040ff6 vkd3d-shader/ir: Sort loop intervals. 2024-03-12 22:14:47 +01:00
Giovanni Mascellani
070c4af8b3 vkd3d-shader/ir: Generate synthetic intervals for forward edges. 2024-03-12 22:14:46 +01:00
Giovanni Mascellani
1d60612340 vkd3d-shader/ir: Compute loop as intervals of the block order. 2024-03-12 22:14:45 +01:00
Nikolay Sivov
30cc6ceb44 vkd3d-shader/fx: Add support for writing shared object descriptions for fx_4_x. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-12 22:14:41 +01:00
Nikolay Sivov
13227f3852 vkd3d-shader: Add an option to enable child effects compilation. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-12 22:14:41 +01:00
Nikolay Sivov
7f1fdd447c vkd3d-shader/fx: Add initial support for writing uninitialized vertex/pixel shader objects. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-12 22:14:40 +01:00
Evan Tang
03a80cde2e vkd3d: Enable VK_EXT_fragment_shader_interlock if available. 2024-03-11 22:10:25 +01:00
Henri Verbeet
038764985a vkd3d-shader/glsl: Use location information from the current instruction. 2024-03-11 22:10:21 +01:00
Giovanni Mascellani
dff22c9ed7 tests: Clear the UAV before testing. 
There is no guarantee that a resource is cleared upon creation. This
fixes the test on NVIDIA and llvmpipe.
 2024-03-11 22:10:15 +01:00
Giovanni Mascellani
5e43f99809 tests: Relax precision a bit for an interpolation test. 
Otherwise the test fails on Intel, NVIDIA and llvmpipe.
 2024-03-11 22:10:14 +01:00
Giovanni Mascellani
0c63824d9f tests: Mark the coverage test as buggy on MoltenVK. 
Apparently MoltenVK doesn't set the SampleMask built-in to the
fragment coverage mask.
 2024-03-11 22:10:13 +01:00
Giovanni Mascellani
cf816a255c tests: Pop the test context when leaving its scope. 2024-03-11 22:10:13 +01:00
Giovanni Mascellani
f6fe9a39db tests: Mark the HS punned array test as buggy on MoltenVK. 
MoltenVK doesn't support the Component decoration on tessellation
shaders.
 2024-03-11 22:10:10 +01:00
Conor McCarthy
4f0e5b9069 vkd3d-shader/dxil: Support 16-bit types. 2024-03-11 22:10:06 +01:00
Conor McCarthy
066ea75945 vkd3d-shader/spirv: Introduce HALF and UINT16 types for minimum precision. 
Minimum precision types must always be implemented as 32-bit to match how
reduced precision works in SPIR-V.
 2024-03-11 22:10:05 +01:00
Conor McCarthy
58123c2e10 vkd3d-shader/spirv: Introduce a data_type_is_floating_point() helper function. 2024-03-11 22:10:03 +01:00
Conor McCarthy
581939f1ef tests/shader-runner: Add tests for minimum-precision constants. 
Values in DXIL have no signedness, so it is ambiguous whether 16-bit
constants should or should not be sign-extended when 16-bit execution
is not supported.
 2024-03-11 22:10:01 +01:00
Nikolay Sivov
25d353db91 vkd3d-shader/d3dbc: Do not write semantic declarations for unused variables. 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55829
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56402
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-11 22:09:55 +01:00
Zebediah Figura
ad495970e0 vkd3d-shader/spirv: Implement SLT and SGE. 2024-03-11 22:09:48 +01:00
Zebediah Figura
27196d8b0f vkd3d-shader/spirv: Implement CMP. 2024-03-11 22:09:44 +01:00
Francisco Casas
2b06bcc615 tests: Check that -0.0f is not less than 0.0f. 2024-03-11 22:09:44 +01:00
Francisco Casas
308c7941d4 tests: Test comparison and logic operators on SM1 vertex shaders. 
Currently these are failing for SM1 because VKD3DSIH_SLT is not being
handled by spirv.c.
 2024-03-11 22:09:43 +01:00
Francisco Casas
cfac67ccc2 vkd3d-shader/hlsl: Cast slt before multiplying on ternary operator. 
Otherwise we may get a failing
    "hlsl_types_are_equal(arg1->data_type, arg2->data_type)"
assertion on hlsl_new_binary_expr() when creating the MUL.

This happens in the test introducing in the following patch:

    int a, b, c;

    void main(out float4 res : COLOR1, in float4 pos : position, out float4 out_pos : sv_position)
    {
        out_pos = pos;

        res = a ? b/1000.0 : c/1000.0;
    }
 2024-03-11 22:09:42 +01:00
Francisco Casas
fda08de61d tests/shader-runner: Pass uniforms to vertex shaders in d3d9 and d3d11. 2024-03-11 22:09:41 +01:00
Giovanni Mascellani
1690b0b554 vkd3d-shader: Remove the bytecode fields from vkd3d_shader_desc. 2024-03-11 22:09:32 +01:00
Giovanni Mascellani
204c8afb9c vkd3d-shader/dxbc: Remove flag is_dxil. 
The full shader profile is already available in vsir_program.
 2024-03-11 22:09:31 +01:00
Giovanni Mascellani
470d83a9da vkd3d-shader: Move shader signatures to vsir_program. 2024-03-11 22:09:31 +01:00
Giovanni Mascellani
56dc0c9842 vkd3d-shader/dxbc: Decouple vkd3d_shader_desc from DXBC parsing. 2024-03-11 22:09:30 +01:00
Giovanni Mascellani
5204b92fa0 vkd3d-shader/tpf: Remove a useless parameter to shader_sm4_init(). 2024-03-11 22:09:28 +01:00
Conor McCarthy
7b4b0143bd vkd3d-shader/dxil: Implement DX intrinsic TextureGatherCmp. 2024-03-11 22:09:20 +01:00
Conor McCarthy
5a6fd010ac vkd3d-shader/dxil: Implement DX intrinsic TextureGather. 2024-03-11 22:09:18 +01:00
Conor McCarthy
8337b99a2c tests/shader-runner: Add a Gather test with non-constant offset. 2024-03-11 22:09:16 +01:00
Conor McCarthy
7fcf1b6ca2 tests/shader-runner: Add sampler comparison tests. 2024-03-11 22:09:08 +01:00
Giovanni Mascellani
7273d7f54f vkd3d-dxbc: Add an option to choose the output filename. 2024-03-11 22:08:56 +01:00
Giovanni Mascellani
b72ad78af6 vkd3d-dxbc: Add an option to re-emit the shader with the correct checksum. 2024-03-11 22:08:56 +01:00
Giovanni Mascellani
4b80b06f28 vkd3d-dxbc: Add an option to ignore checksum. 2024-03-11 22:08:56 +01:00
Giovanni Mascellani
75bc68962d vkd3d-shader/dxbc: Add flag to ignore the DXBC checksum. 2024-03-11 22:08:55 +01:00
Giovanni Mascellani
23259263cf vkd3d-shader/d3d-asm: Only emit signatures for SM4-6. 2024-03-08 23:36:44 +01:00
Henri Verbeet
1fc55d80cd vkd3d-shader: Enable GLSL target support when VKD3D_SHADER_UNSUPPORTED_GLSL is defined. 2024-03-08 23:36:40 +01:00
Evan Tang
4553b2a0dc vkd3d-shader/spirv: Implement support for rasteriser-ordered views. 
Using SPV_EXT_fragment_shader_interlock.
 2024-03-08 23:36:35 +01:00
Giovanni Mascellani
21f76257b0 vkd3d-shader/d3d-asm: Print labels in red. 
They are substantially different from any other register type, so
it makes sense to have them stand out. Also, they help segmenting
visually the code into blocks, because labels are usually found
either at the beginning or at the end of a block.
 2024-03-08 23:36:25 +01:00
Conor McCarthy
e65055b435 vkd3d-shader/spirv: Handle the ORD and UNO instructions. 2024-03-08 23:36:14 +01:00
Conor McCarthy
f212aad0ff vkd3d-shader/dxil: Support FCMP_ORD and FCMP_UNO for CMP2. 2024-03-08 23:36:13 +01:00
Conor McCarthy
94583815bc tests/shader-runner: Add a test for FCMP_ORD (is ordered). 2024-03-08 23:36:12 +01:00
Conor McCarthy
4dafd6bedf vkd3d: Implement GetCopyableFootprints1(). 2024-03-08 23:36:08 +01:00
Conor McCarthy
197f16efa9 vkd3d: Implement CreatePlacedResource1(). 2024-03-08 23:36:08 +01:00
Conor McCarthy
e5ae6bd3c2 vkd3d: Implement CreateCommittedResource2(). 2024-03-08 23:36:08 +01:00
Conor McCarthy
6edba86a26 vkd3d: Implement GetResourceAllocationInfo2(). 2024-03-08 23:36:08 +01:00
Conor McCarthy
2ed36efcb5 tests/d3d12: Add tests for GetCopyableFootprints1(). 2024-03-08 23:36:06 +01:00
Conor McCarthy
9987b519a2 tests/d3d12: Add tests for CreatePlacedResource1(). 2024-03-08 23:36:05 +01:00
Conor McCarthy
c09ae2c93f tests/d3d12: Add tests for CreateCommittedResource2(). 2024-03-08 23:36:04 +01:00
Conor McCarthy
81a4dbe52d tests/d3d12: Add tests for GetResourceAllocationInfo2(). 2024-03-08 23:36:02 +01:00
Conor McCarthy
7d2c274b9b vkd3d: Add ID3D12Device8 interface stubs. 2024-03-08 23:36:02 +01:00
Giovanni Mascellani
172e7edf2d vkd3d-shader: Refactor common code for vkd3d_shader_compile(). 2024-03-08 23:35:54 +01:00
Giovanni Mascellani
0e5d6a97cc vkd3d-shader: Refactor common code for vkd3d_shader_scan(). 2024-03-08 23:35:54 +01:00
Giovanni Mascellani
bbd37a76fc vkd3d-shader: Treat the HLSL case specially in vkd3d_shader_compile(). 2024-03-08 23:35:54 +01:00
Giovanni Mascellani
3a1c32acd4 vkd3d-shader: Treat the HLSL case specially in vkd3d_shader_scan(). 
The other cases are similar and common code can be refactored.
Ideally the HLSL parser will eventually fit the same model, but that
will require more extensive work.
 2024-03-08 23:35:53 +01:00
Giovanni Mascellani
b940d79aa8 vkd3d-shader/ir: Keep loops contiguous in the topological sort. 2024-03-08 23:35:48 +01:00
Giovanni Mascellani
cf9a023566 vkd3d-shader/ir: Dump the topological order of the control flow graph. 2024-03-08 23:35:47 +01:00
Giovanni Mascellani
ed40646c8a vkd3d-shader/ir: Topologically sort the control flow graph. 2024-03-08 23:35:46 +01:00
Giovanni Mascellani
880d781b57 vkd3d-shader/ir: Allow adding to a block list without checking for duplicates. 2024-03-08 23:35:45 +01:00
Nikolay Sivov
75c019074a vkd3d-shader/hlsl: Allow modifiers on buffer declarations. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-08 23:35:40 +01:00
Francisco Casas
9e9b3d263f tests: Get detailed information on failing tests. 2024-03-08 23:35:36 +01:00
Francisco Casas
faea8cd7c8 tests: Copy autotool's testsuite driver script. 
For the driver script to run properly it is necessary to run
"autoreconf" in the source directory and call the configure script again
in the build directory.
 2024-03-08 23:35:28 +01:00
Nikolay Sivov
b13d60d805 vkd3d-shader/hlsl: Add determinant() function. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-08 23:35:23 +01:00
Giovanni Mascellani
8723b5d266 vkd3d-shader/ir: Sort each loop by block label. 2024-03-07 23:08:36 +01:00
Giovanni Mascellani
3d4092d9dc vkd3d-shader/ir: Dump the loops in the control flow graph. 2024-03-07 23:08:35 +01:00
Giovanni Mascellani
8241ca2b67 vkd3d-shader/ir: Keep track of loops by header block. 2024-03-07 23:08:34 +01:00
Giovanni Mascellani
088a6c49a2 vkd3d-shader/ir: Keep a reference to the message context inside struct vsir_cfg. 2024-03-07 23:08:33 +01:00
Giovanni Mascellani
9ac842b36b vkd3d-shader/ir: Compute the loops in the control flow graph. 2024-03-07 23:08:32 +01:00
Giovanni Mascellani
de15f55477 vkd3d-shader/ir: Introduce a helper to express block domination. 2024-03-07 23:08:31 +01:00
Giovanni Mascellani
c3657c4799 vkd3d-shader/ir: Add a debug buffer to struct vsir_cfg. 2024-03-07 23:08:30 +01:00
Giovanni Mascellani
c5893288d9 vkd3d-shader/ir: Properly handle function-local indexable temps when flattening control flow. 
They have to be considered code rather than declarations, as required
for instance by the SPIR-V backend.
 2024-03-07 23:08:28 +01:00
Giovanni Mascellani
6163d82485 tests: Test emitting the signature. 2024-03-07 23:08:25 +01:00
Giovanni Mascellani
9b0a9f63f7 vkd3d-compiler: Add an option to emit the signature when disassembling. 2024-03-07 23:08:25 +01:00
Giovanni Mascellani
9aa86901e3 vkd3d-shader/d3d-asm: Support emitting the shader signature. 2024-03-07 23:08:24 +01:00
Giovanni Mascellani
01a687a7fc vkd3d-shader/d3d-asm: Refactor dumping a write mask to a dedicated function. 2024-03-07 23:08:23 +01:00
Giovanni Mascellani
9d99389663 vkd3d-shader/d3d-asm: Describe the ASM dialect with a bunch of flags instead of a plain enum. 2024-03-07 23:08:22 +01:00
Giovanni Mascellani
94d641783b vkd3d-shader/d3d-asm: Do not make a copy of the buffer before returning it. 2024-03-07 23:08:20 +01:00
Nikolay Sivov
a0d52dc385 vkd3d-shader/hlsl: Improve VertexShader/PixelShader types handling. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:04:25 +01:00
Nikolay Sivov
4dd1bbae40 tests: Add some tests for shader object type names. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:04:25 +01:00
Nikolay Sivov
437ef0896f vkd3d-shader/fx: Make sure to set error message for unimplemented cases. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:04:22 +01:00
Nikolay Sivov
8c5db57ea7 vkd3d-shader/fx: Reject fx_2_0 output without techniques. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:04:19 +01:00
Nikolay Sivov
dd5e42d347 vkd3d-shader/hlsl: Allow technique10 {} blocks for fx_2_0. 
Such techniques are ignored later, but do not cause compilation errors.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:04:18 +01:00
Nikolay Sivov
5edbccd33b vkd3d-shader/hlsl: Add keyword tokens for fx_5_0 shader object types. 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:04:16 +01:00
Conor McCarthy
5082893e5d vkd3d-shader/spirv: Always use a 64-bit write mask for IMMCONST64 src params. 
There is no way to tell in spirv_compiler_emit_load_reg() if the write
mask is 64-bit. All loads are 32-bit except for IMMCONST64 and SSA, and
the latter ignores the mask, so the only issue lies with IMMCONST64.
 2024-03-06 23:04:12 +01:00
Conor McCarthy
13143700b7 tests/shader-runner: Add raw UAV tests. 2024-03-06 23:04:11 +01:00
Francisco Casas
58c456ff2b vkd3d-shader/d3dbc: Implement bool to float cast as MOV. 
In SM1, bools are always represented as either 0.0f or 1.0f at runtime.
 2024-03-06 23:04:07 +01:00
Francisco Casas
747511131d vkd3d-shader/hlsl: Lower non-float operators for SM1. 2024-03-06 23:04:05 +01:00
Francisco Casas
a3319339e4 vkd3d-shader/hlsl: Lower casts to int using REINTERPRET instead. 
I realized that it is better to lower casts to int to FLOOR+REINTERPET
instead of appending a FLOOR to all casts to int and assuming that this
is the case for all of them in d3dbc.c.

This in case we introduce new passes in the future that add casts that
we forget to lower, after the lower_casts_to_bool pass.
 2024-03-06 23:04:04 +01:00
Nikolay Sivov
937d76507d vkd3d-shader/hlsl: Implement ternary operator for older vertex profiles. 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56333
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
 2024-03-06 23:03:59 +01:00
299 changed files with 37325 additions and 8808 deletions
Expand all files Collapse all files

16
.editorconfig Normal file
View File

@@ -0,0 +1,16 @@
# https://editorconfig.org/
root = true
[*]
charset = utf-8
end_of_line = lf
indent_style = space
indent_size = 4
tab_width = 8
trim_trailing_whitespace = true
max_line_length = 120
insert_final_newline = true
[Makefile*]
indent_style = tab
indent_size = 8

2
.mailmap Normal file
View File

@@ -0,0 +1,2 @@
Elizabeth Figura <z.figura12@gmail.com>
Elizabeth Figura <zfigura@codeweavers.com>

1043
ANNOUNCE
View File

File diff suppressed because it is too large Load Diff

5
AUTHORS
View File

@@ -3,6 +3,7 @@ Alexandre Julliard
Alistair Leslie-Hughes Alistair Leslie-Hughes
Andrew Eikum Andrew Eikum
Andrey Gusev Andrey Gusev
Anna (navi) Figueiredo Gomes
Atharva Nimbalkar Atharva Nimbalkar
Biswapriyo Nath Biswapriyo Nath
Brendan Shanks Brendan Shanks
@@ -10,6 +11,7 @@ Chip Davis
Conor McCarthy Conor McCarthy
David Gow David Gow
Derek Lesho Derek Lesho
Elizabeth Figura
Ethan Lee Ethan Lee
Evan Tang Evan Tang
Fabian Maurer Fabian Maurer
@@ -32,9 +34,10 @@ Petrichor Park
Philip Rebohle Philip Rebohle
Rémi Bernon Rémi Bernon
Robin Kertels Robin Kertels
Shaun Ren
Stefan Dösinger Stefan Dösinger
Sven Hesse Sven Hesse
Victor Chiletto Victor Chiletto
Vinson Lee Vinson Lee
Zebediah Figura Yuxuan Shui
Zhiyi Zhang Zhiyi Zhang

1258
ChangeLog.md Normal file
View File

File diff suppressed because it is too large Load Diff

73
Makefile.am
View File

@@ -48,6 +48,7 @@ vkd3d_cross_tests = \
vkd3d_shader_tests = \ vkd3d_shader_tests = \
tests/hlsl/abs.shader_test \ tests/hlsl/abs.shader_test \
tests/hlsl/all.shader_test \ tests/hlsl/all.shader_test \
tests/hlsl/alpha-test.shader_test \
tests/hlsl/angle-unit.shader_test \ tests/hlsl/angle-unit.shader_test \
tests/hlsl/annotations.shader_test \ tests/hlsl/annotations.shader_test \
tests/hlsl/any.shader_test \ tests/hlsl/any.shader_test \
@@ -60,11 +61,14 @@ vkd3d_shader_tests = \
tests/hlsl/array-parameters.shader_test \ tests/hlsl/array-parameters.shader_test \
tests/hlsl/array-size-expr.shader_test \ tests/hlsl/array-size-expr.shader_test \
tests/hlsl/asfloat.shader_test \ tests/hlsl/asfloat.shader_test \
tests/hlsl/asint.shader_test \
tests/hlsl/asuint.shader_test \ tests/hlsl/asuint.shader_test \
tests/hlsl/attributes.shader_test \ tests/hlsl/attributes.shader_test \
tests/hlsl/bitwise-assignment.shader_test \
tests/hlsl/bitwise.shader_test \ tests/hlsl/bitwise.shader_test \
tests/hlsl/bool-cast.shader_test \ tests/hlsl/bool-cast.shader_test \
tests/hlsl/bool-semantics.shader_test \ tests/hlsl/bool-semantics.shader_test \
tests/hlsl/calculate-lod.shader_test \
tests/hlsl/cast-64-bit.shader_test \ tests/hlsl/cast-64-bit.shader_test \
tests/hlsl/cast-broadcast.shader_test \ tests/hlsl/cast-broadcast.shader_test \
tests/hlsl/cast-componentwise-compatible.shader_test \ tests/hlsl/cast-componentwise-compatible.shader_test \
@@ -77,22 +81,39 @@ vkd3d_shader_tests = \
tests/hlsl/ceil.shader_test \ tests/hlsl/ceil.shader_test \
tests/hlsl/cf-cond-types.shader_test \ tests/hlsl/cf-cond-types.shader_test \
tests/hlsl/clamp.shader_test \ tests/hlsl/clamp.shader_test \
tests/hlsl/clip-distance.shader_test \
tests/hlsl/clip.shader_test \ tests/hlsl/clip.shader_test \
tests/hlsl/combined-samplers.shader_test \ tests/hlsl/combined-samplers.shader_test \
tests/hlsl/comma.shader_test \ tests/hlsl/comma.shader_test \
tests/hlsl/compute.shader_test \ tests/hlsl/compute.shader_test \
tests/hlsl/conditional.shader_test \ tests/hlsl/conditional.shader_test \
tests/hlsl/const.shader_test \ tests/hlsl/const.shader_test \
tests/hlsl/coverage.shader_test \
tests/hlsl/cross.shader_test \ tests/hlsl/cross.shader_test \
tests/hlsl/d3dcolor-to-ubyte4.shader_test \ tests/hlsl/d3dcolor-to-ubyte4.shader_test \
tests/hlsl/ddxddy.shader_test \ tests/hlsl/ddxddy.shader_test \
tests/hlsl/default-values.shader_test \
tests/hlsl/depth-out.shader_test \
tests/hlsl/determinant.shader_test \
tests/hlsl/discard.shader_test \ tests/hlsl/discard.shader_test \
tests/hlsl/distance.shader_test \ tests/hlsl/distance.shader_test \
tests/hlsl/dot.shader_test \ tests/hlsl/dot.shader_test \
tests/hlsl/duplicate-modifiers.shader_test \ tests/hlsl/duplicate-modifiers.shader_test \
tests/hlsl/effect-compile.shader_test \
tests/hlsl/effect-pass-states-fx_5.shader_test \
tests/hlsl/effect-shader-objects-fx_2.shader_test \
tests/hlsl/effect-shader-objects-fx_5.shader_test \
tests/hlsl/effect-technique-fx_2.shader_test \
tests/hlsl/effect-technique-fx_4.shader_test \
tests/hlsl/effect-technique-fx_5.shader_test \
tests/hlsl/effect-variables-fx_2.shader_test \
tests/hlsl/effect-variables-fx_4.shader_test \
tests/hlsl/effect-variables-fx_5.shader_test \
tests/hlsl/entry-point-semantics.shader_test \ tests/hlsl/entry-point-semantics.shader_test \
tests/hlsl/exp.shader_test \ tests/hlsl/exp.shader_test \
tests/hlsl/expr-indexing.shader_test \ tests/hlsl/expr-indexing.shader_test \
tests/hlsl/f16tof32.shader_test \
tests/hlsl/faceforward.shader_test \
tests/hlsl/float-comparison.shader_test \ tests/hlsl/float-comparison.shader_test \
tests/hlsl/floor.shader_test \ tests/hlsl/floor.shader_test \
tests/hlsl/fmod.shader_test \ tests/hlsl/fmod.shader_test \
@@ -103,8 +124,11 @@ vkd3d_shader_tests = \
tests/hlsl/function-return.shader_test \ tests/hlsl/function-return.shader_test \
tests/hlsl/function.shader_test \ tests/hlsl/function.shader_test \
tests/hlsl/fwidth.shader_test \ tests/hlsl/fwidth.shader_test \
tests/hlsl/fxgroup-syntax.shader_test \
tests/hlsl/gather-offset.shader_test \ tests/hlsl/gather-offset.shader_test \
tests/hlsl/gather.shader_test \ tests/hlsl/gather.shader_test \
tests/hlsl/geometry.shader_test \
tests/hlsl/get-sample-pos.shader_test \
tests/hlsl/getdimensions.shader_test \ tests/hlsl/getdimensions.shader_test \
tests/hlsl/half.shader_test \ tests/hlsl/half.shader_test \
tests/hlsl/hard-copy-prop.shader_test \ tests/hlsl/hard-copy-prop.shader_test \
@@ -119,6 +143,7 @@ vkd3d_shader_tests = \
tests/hlsl/initializer-objects.shader_test \ tests/hlsl/initializer-objects.shader_test \
tests/hlsl/initializer-static-array.shader_test \ tests/hlsl/initializer-static-array.shader_test \
tests/hlsl/initializer-struct.shader_test \ tests/hlsl/initializer-struct.shader_test \
tests/hlsl/instance-id.shader_test \
tests/hlsl/intrinsic-override.shader_test \ tests/hlsl/intrinsic-override.shader_test \
tests/hlsl/invalid.shader_test \ tests/hlsl/invalid.shader_test \
tests/hlsl/inverse-trig.shader_test \ tests/hlsl/inverse-trig.shader_test \
@@ -137,7 +162,7 @@ vkd3d_shader_tests = \
tests/hlsl/math.shader_test \ tests/hlsl/math.shader_test \
tests/hlsl/matrix-indexing.shader_test \ tests/hlsl/matrix-indexing.shader_test \
tests/hlsl/matrix-semantics.shader_test \ tests/hlsl/matrix-semantics.shader_test \
tests/hlsl/max.shader_test \ tests/hlsl/max-min.shader_test \
tests/hlsl/minimum-precision.shader_test \ tests/hlsl/minimum-precision.shader_test \
tests/hlsl/mul.shader_test \ tests/hlsl/mul.shader_test \
tests/hlsl/multiple-rt.shader_test \ tests/hlsl/multiple-rt.shader_test \
@@ -145,41 +170,54 @@ vkd3d_shader_tests = \
tests/hlsl/nointerpolation.shader_test \ tests/hlsl/nointerpolation.shader_test \
tests/hlsl/non-const-indexing.shader_test \ tests/hlsl/non-const-indexing.shader_test \
tests/hlsl/normalize.shader_test \ tests/hlsl/normalize.shader_test \
tests/hlsl/null.shader_test \
tests/hlsl/numeric-constructor-truncation.shader_test \ tests/hlsl/numeric-constructor-truncation.shader_test \
tests/hlsl/numeric-types.shader_test \ tests/hlsl/numeric-types.shader_test \
tests/hlsl/numthreads.shader_test \ tests/hlsl/numthreads.shader_test \
tests/hlsl/object-field-offsets.shader_test \ tests/hlsl/object-field-offsets.shader_test \
tests/hlsl/object-parameters.shader_test \ tests/hlsl/object-parameters.shader_test \
tests/hlsl/object-references.shader_test \ tests/hlsl/object-references.shader_test \
tests/hlsl/pointer-cast.shader_test \
tests/hlsl/pow.shader_test \ tests/hlsl/pow.shader_test \
tests/hlsl/precise-modifier.shader_test \
tests/hlsl/rasteriser-ordered-views.shader_test \ tests/hlsl/rasteriser-ordered-views.shader_test \
tests/hlsl/rcp.shader_test \
tests/hlsl/reflect.shader_test \ tests/hlsl/reflect.shader_test \
tests/hlsl/refract.shader_test \
tests/hlsl/register-reservations-numeric.shader_test \ tests/hlsl/register-reservations-numeric.shader_test \
tests/hlsl/register-reservations-profile.shader_test \
tests/hlsl/register-reservations-resources.shader_test \ tests/hlsl/register-reservations-resources.shader_test \
tests/hlsl/register-reservations-space.shader_test \
tests/hlsl/return-implicit-conversion.shader_test \ tests/hlsl/return-implicit-conversion.shader_test \
tests/hlsl/return.shader_test \ tests/hlsl/return.shader_test \
tests/hlsl/round.shader_test \ tests/hlsl/round.shader_test \
tests/hlsl/rt-get-sample-info.shader_test \
tests/hlsl/sample-bias.shader_test \ tests/hlsl/sample-bias.shader_test \
tests/hlsl/sample-cmp.shader_test \
tests/hlsl/sample-grad.shader_test \ tests/hlsl/sample-grad.shader_test \
tests/hlsl/sample-level.shader_test \ tests/hlsl/sample-level.shader_test \
tests/hlsl/sampler-offset.shader_test \ tests/hlsl/sampler-offset.shader_test \
tests/hlsl/sampler.shader_test \ tests/hlsl/sampler.shader_test \
tests/hlsl/saturate.shader_test \ tests/hlsl/saturate.shader_test \
tests/hlsl/shade-mode.shader_test \
tests/hlsl/shader-interstage-interface.shader_test \ tests/hlsl/shader-interstage-interface.shader_test \
tests/hlsl/shape.shader_test \ tests/hlsl/shape.shader_test \
tests/hlsl/side-effects.shader_test \ tests/hlsl/side-effects.shader_test \
tests/hlsl/sign.shader_test \ tests/hlsl/sign.shader_test \
tests/hlsl/single-numeric-initializer.shader_test \ tests/hlsl/single-numeric-initializer.shader_test \
tests/hlsl/sm1-const-allocation.shader_test \
tests/hlsl/sm1-const-folding.shader_test \ tests/hlsl/sm1-const-folding.shader_test \
tests/hlsl/sm6-ternary.shader_test \ tests/hlsl/sm6-ternary.shader_test \
tests/hlsl/sm6-uav-rwtexture.shader_test \ tests/hlsl/sm6-uav-rwtexture.shader_test \
tests/hlsl/smoothstep.shader_test \ tests/hlsl/smoothstep.shader_test \
tests/hlsl/sqrt.shader_test \ tests/hlsl/sqrt.shader_test \
tests/hlsl/srv-buffers.shader_test \ tests/hlsl/srv-buffers.shader_test \
tests/hlsl/state-block-function-syntax.shader_test \
tests/hlsl/state-block-syntax.shader_test \ tests/hlsl/state-block-syntax.shader_test \
tests/hlsl/static-initializer.shader_test \ tests/hlsl/static-initializer.shader_test \
tests/hlsl/step.shader_test \ tests/hlsl/step.shader_test \
tests/hlsl/storage-qualifiers.shader_test \ tests/hlsl/storage-qualifiers.shader_test \
tests/hlsl/strings.shader_test \
tests/hlsl/struct-array.shader_test \ tests/hlsl/struct-array.shader_test \
tests/hlsl/struct-assignment.shader_test \ tests/hlsl/struct-assignment.shader_test \
tests/hlsl/struct-semantics.shader_test \ tests/hlsl/struct-semantics.shader_test \
@@ -187,28 +225,37 @@ vkd3d_shader_tests = \
tests/hlsl/swizzle-constant-prop.shader_test \ tests/hlsl/swizzle-constant-prop.shader_test \
tests/hlsl/swizzle-matrix.shader_test \ tests/hlsl/swizzle-matrix.shader_test \
tests/hlsl/swizzles.shader_test \ tests/hlsl/swizzles.shader_test \
tests/hlsl/technique-fx_2.shader_test \
tests/hlsl/technique-fx_4.shader_test \
tests/hlsl/technique-fx_5.shader_test \
tests/hlsl/ternary.shader_test \ tests/hlsl/ternary.shader_test \
tests/hlsl/tessellation.shader_test \
tests/hlsl/texture-load-offset.shader_test \ tests/hlsl/texture-load-offset.shader_test \
tests/hlsl/texture-load-typed.shader_test \ tests/hlsl/texture-load-typed.shader_test \
tests/hlsl/texture-load.shader_test \ tests/hlsl/texture-load.shader_test \
tests/hlsl/texture-ordering.shader_test \ tests/hlsl/texture-ordering.shader_test \
tests/hlsl/tgsm.shader_test \
tests/hlsl/transpose.shader_test \ tests/hlsl/transpose.shader_test \
tests/hlsl/trigonometry.shader_test \ tests/hlsl/trigonometry.shader_test \
tests/hlsl/trunc.shader_test \ tests/hlsl/trunc.shader_test \
tests/hlsl/type-names.shader_test \ tests/hlsl/type-names.shader_test \
tests/hlsl/uav-atomics.shader_test \ tests/hlsl/uav-atomics.shader_test \
tests/hlsl/uav-counter.shader_test \
tests/hlsl/uav-load.shader_test \ tests/hlsl/uav-load.shader_test \
tests/hlsl/uav-out-param.shader_test \ tests/hlsl/uav-out-param.shader_test \
tests/hlsl/uav-rwbuffer.shader_test \ tests/hlsl/uav-rwbuffer.shader_test \
tests/hlsl/uav-rwbyteaddressbuffer.shader_test \
tests/hlsl/uav-rwstructuredbuffer.shader_test \ tests/hlsl/uav-rwstructuredbuffer.shader_test \
tests/hlsl/uav-rwtexture.shader_test \ tests/hlsl/uav-rwtexture.shader_test \
tests/hlsl/unbounded-array-5.1.shader_test \
tests/hlsl/uniform-parameters.shader_test \ tests/hlsl/uniform-parameters.shader_test \
tests/hlsl/uniform-semantics.shader_test \ tests/hlsl/uniform-semantics.shader_test \
tests/hlsl/unroll.shader_test \
tests/hlsl/unsigned.shader_test \
tests/hlsl/vector-indexing-uniform.shader_test \ tests/hlsl/vector-indexing-uniform.shader_test \
tests/hlsl/vector-indexing.shader_test \ tests/hlsl/vector-indexing.shader_test \
tests/hlsl/vertex-shader-ops.shader_test \
tests/hlsl/wave-ops-float.shader_test \
tests/hlsl/wave-ops-int.shader_test \
tests/hlsl/wave-ops-uint.shader_test \
tests/hlsl/wave-reconvergence.shader_test \
tests/hlsl/writemask-assignop-0.shader_test \ tests/hlsl/writemask-assignop-0.shader_test \
tests/hlsl/writemask-assignop-1.shader_test \ tests/hlsl/writemask-assignop-1.shader_test \
tests/hlsl/writemask-assignop-2.shader_test \ tests/hlsl/writemask-assignop-2.shader_test \
@@ -242,7 +289,6 @@ BUILT_SOURCES = $(widl_headers) \
noinst_LTLIBRARIES = libvkd3d-common.la noinst_LTLIBRARIES = libvkd3d-common.la
libvkd3d_common_la_SOURCES = \ libvkd3d_common_la_SOURCES = \
include/private/vkd3d_debug.h \
libs/vkd3d-common/blob.c \ libs/vkd3d-common/blob.c \
libs/vkd3d-common/debug.c \ libs/vkd3d-common/debug.c \
libs/vkd3d-common/error.c \ libs/vkd3d-common/error.c \
@@ -298,7 +344,6 @@ libvkd3d_shader_la_SOURCES = \
include/private/list.h \ include/private/list.h \
include/private/rbtree.h \ include/private/rbtree.h \
include/private/vkd3d_common.h \ include/private/vkd3d_common.h \
include/private/vkd3d_debug.h \
include/private/vkd3d_memory.h \ include/private/vkd3d_memory.h \
include/vkd3d_shader.h \ include/vkd3d_shader.h \
libs/vkd3d-shader/checksum.c \ libs/vkd3d-shader/checksum.c \
@@ -320,7 +365,7 @@ libvkd3d_shader_la_SOURCES = \
libs/vkd3d-shader/vkd3d_shader_main.c \ libs/vkd3d-shader/vkd3d_shader_main.c \
libs/vkd3d-shader/vkd3d_shader_private.h libs/vkd3d-shader/vkd3d_shader_private.h
libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SHADER_SOURCE -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@
libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 10:0:9 libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 12:0:11
libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map
@@ -336,7 +381,6 @@ EXTRA_DIST = \
libvkd3d_la_SOURCES = \ libvkd3d_la_SOURCES = \
include/private/vkd3d_blob.h \ include/private/vkd3d_blob.h \
include/private/vkd3d_common.h \ include/private/vkd3d_common.h \
include/private/vkd3d_debug.h \
include/private/vkd3d_memory.h \ include/private/vkd3d_memory.h \
include/private/vkd3d_shader_utils.h \ include/private/vkd3d_shader_utils.h \
include/private/vkd3d_test.h \ include/private/vkd3d_test.h \
@@ -344,6 +388,7 @@ libvkd3d_la_SOURCES = \
include/vkd3d_d3d12.idl \ include/vkd3d_d3d12.idl \
include/vkd3d_d3dcommon.idl \ include/vkd3d_d3dcommon.idl \
include/vkd3d_unknown.idl \ include/vkd3d_unknown.idl \
libs/vkd3d/cache.c \
libs/vkd3d/command.c \ libs/vkd3d/command.c \
libs/vkd3d/device.c \ libs/vkd3d/device.c \
libs/vkd3d/resource.c \ libs/vkd3d/resource.c \
@@ -355,7 +400,7 @@ libvkd3d_la_SOURCES = \
libs/vkd3d/vkd3d_shaders.h \ libs/vkd3d/vkd3d_shaders.h \
libs/vkd3d/vulkan_procs.h libs/vkd3d/vulkan_procs.h
libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE libvkd3d_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_SOURCE
libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 12:0:11 libvkd3d_la_LDFLAGS = $(AM_LDFLAGS) -version-info 14:0:13
libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@ libvkd3d_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la @DL_LIBS@ @PTHREAD_LIBS@
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map libvkd3d_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d/vkd3d.map
@@ -368,7 +413,7 @@ libvkd3d_utils_la_SOURCES = \
libs/vkd3d-utils/vkd3d_utils_main.c \ libs/vkd3d-utils/vkd3d_utils_main.c \
libs/vkd3d-utils/vkd3d_utils_private.h libs/vkd3d-utils/vkd3d_utils_private.h
libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE libvkd3d_utils_la_CFLAGS = $(AM_CFLAGS) -DLIBVKD3D_UTILS_SOURCE
libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:0:5 libvkd3d_utils_la_LDFLAGS = $(AM_LDFLAGS) -version-info 6:2:5
libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@ libvkd3d_utils_la_LIBADD = libvkd3d-common.la libvkd3d-shader.la libvkd3d.la @PTHREAD_LIBS@
if HAVE_LD_VERSION_SCRIPT if HAVE_LD_VERSION_SCRIPT
libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map libvkd3d_utils_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-utils/vkd3d_utils.map
@@ -403,6 +448,7 @@ TEST_EXTENSIONS = .shader_test
if BUILD_TESTS if BUILD_TESTS
check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) tests/shader_runner
dist_check_SCRIPTS = tests/test-driver.sh
TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests)
tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @DL_LIBS@ tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @DL_LIBS@
tests_d3d12_invalid_usage_LDADD = $(LDADD) @DL_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @DL_LIBS@
@@ -417,8 +463,10 @@ tests_shader_runner_SOURCES = \
tests/shader_runner_gl.c \ tests/shader_runner_gl.c \
tests/shader_runner_vulkan.c tests/shader_runner_vulkan.c
tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@ tests_vkd3d_api_LDADD = libvkd3d.la @DL_LIBS@
tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la tests_vkd3d_shader_api_CFLAGS = $(AM_CFLAGS) @OPENGL_CFLAGS@
tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la @OPENGL_LIBS@
SHADER_TEST_LOG_COMPILER = tests/shader_runner SHADER_TEST_LOG_COMPILER = tests/shader_runner
SHADER_TEST_LOG_DRIVER = $(srcdir)/tests/test-driver.sh
endif endif
EXTRA_DIST += $(vkd3d_shader_tests) EXTRA_DIST += $(vkd3d_shader_tests)
@@ -495,7 +543,8 @@ dummy-vkd3d-version:
## Cross-compile tests ## Cross-compile tests
cross_implibs = crosslibs/d3d12 cross_implibs = crosslibs/d3d12
CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include -I$(builddir)/tests CROSS_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/include/private -I$(builddir)/include -I$(builddir)/tests
CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1 CROSS_CFLAGS = -g -O2 -Wall -municode ${CROSS_CPPFLAGS} \
-D_WIN32_WINNT=0x0600 -D__USE_MINGW_ANSI_STDIO=0 -DVKD3D_CROSSTEST=1
EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def) EXTRA_DIST += $(cross_implibs:=.cross32.def) $(cross_implibs:=.cross64.def)
EXTRA_DIST += tests/driver.c tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c EXTRA_DIST += tests/driver.c tests/shader_runner_d3d11.c tests/shader_runner_d3d9.c

54
README
View File

@@ -78,6 +78,10 @@ commas or semicolons.
* VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1 * VKD3D_TEST_DEBUG - enables additional debug messages in tests. Set to 0, 1
or 2. or 2.
* VKD3D_TEST_DETAILED - enables printing detailed output when running the test
suite, reporting specific shader_test lines that trigger XFAIL and SKIP even
on tests that overall PASS. Set to 0, or 1.
* VKD3D_TEST_FILTER - a filter string. Only the tests whose names matches the * VKD3D_TEST_FILTER - a filter string. Only the tests whose names matches the
filter string will be run, e.g. VKD3D_TEST_FILTER=clear_render_target. filter string will be run, e.g. VKD3D_TEST_FILTER=clear_render_target.
Useful for debugging or developing new tests. Useful for debugging or developing new tests.
@@ -86,6 +90,9 @@ commas or semicolons.
platform controls the behavior of todo(), todo_if(), bug_if() and broken() platform controls the behavior of todo(), todo_if(), bug_if() and broken()
conditions in tests. conditions in tests.
* VKD3D_TEST_SKIP_DXC - when set, tests requiring the dxcompiler library will
be skipped.
* VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests. * VKD3D_TEST_BUG - set to 0 to disable bug_if() conditions in tests.
If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader If the configuration defines 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', Shader
@@ -108,3 +115,50 @@ to submit their patches using the merge request tool.
Each merge request is automatically tested with the GitLab CI Each merge request is automatically tested with the GitLab CI
system. See gitlab/README in the Git tree for more details. system. See gitlab/README in the Git tree for more details.
============================
Testing with the Agility SDK
============================
Traditionally Microsoft have released the Direct3D 12 development files,
including the debug layer runtime, as part of the larger Windows SDK.
In 2021 the DirectX 12 Agility SDK was introduced, which may be updated
independently of the Windows SDK. If you plan to run the vkd3d
crosstests with Microsoft's debug layer you might want to get it from
the Agility SDK, both because it's probably going to be more up-to-date
and because the Agility SDK is a couple dozens of megabytes versus the
gigabytes of the Windows SDK.
In order to build the vkd3d crosstests with Agility SDK support, follow
these steps:
* The Agility SDK is distributed at [1]: select your preferred
version (likely the most recent one) and note the number in column
D3D12SDKVersion, which you're going to need later.
[1] https://devblogs.microsoft.com/directx/directx12agility/
* You also need to enable the "Graphics Tools" optional feature in Windows.
Open the "Settings" applications, then look for "Apps", "Optional features",
"View features" and install "Graphics Tools".
* Configure vkd3d with something like:
'CROSSCC64="x86_64-w64-mingw32-gcc -DVKD3D_AGILITY_SDK_VERSION=<version>"',
as well as the equivalent CROSSCC32 variable for the 32-bit
crosstests. You'll have to replace '<version>' with the
D3D12SDKVersion number you noted above. Then build the crosstests
with 'make crosstest' as usual.
* Download the Agility SDK NuGet package, which is essentially a ZIP
file with a .nupkg extension. Extract d3d12core.dll and
d3d12sdklayers.dll for your architecture, and put them in the
directory containing the crosstest executables.
* Now you can run the crosstests, possibly with arguments
'--validate' and '--gbv' to enable the debug layers. They will use
the runtime from the Agility SDK.
* It's also possible to use '-DVKD3D_AGILITY_SDK_PATH=/path/to/sdk/' to
specify the directory to load the Agility SDK DLLs from at runtime.
If relative, the path is intended to be relative to the executable
path. If unspecified the path defaults to './'.

5
configure.ac
View File

@@ -1,5 +1,5 @@
AC_PREREQ([2.69]) AC_PREREQ([2.69])
AC_INIT([vkd3d],[1.11]) AC_INIT([vkd3d],[1.13])
AC_CONFIG_AUX_DIR([bin]) AC_CONFIG_AUX_DIR([bin])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
@@ -55,8 +55,9 @@ gl_LD_VERSION_SCRIPT
dnl Check compiler specific flags dnl Check compiler specific flags
AC_SUBST([VKD3D_CFLAGS]) AC_SUBST([VKD3D_CFLAGS])
AS_IF([test "x${GCC}" = "xyes"], AS_IF([test "x${GCC}" = "xyes"],
[VKD3D_CFLAGS="-Wall -pipe" [VKD3D_CFLAGS="-Wall -pipe -D_WIN32_WINNT=0x0600"
VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-std=c99])
VKD3D_CHECK_CFLAGS([-flto=auto])
VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-fvisibility=hidden])
VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement])
VKD3D_CHECK_CFLAGS([-Wempty-body]) VKD3D_CHECK_CFLAGS([-Wempty-body])

2
demos/demo_xcb.h
View File

@@ -19,7 +19,7 @@
#define VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES
#define VK_USE_PLATFORM_XCB_KHR #define VK_USE_PLATFORM_XCB_KHR
#define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_11 #define VKD3D_UTILS_API_VERSION VKD3D_API_VERSION_1_13
#include "config.h" #include "config.h"
#include <vkd3d.h> #include <vkd3d.h>
#include <vkd3d_utils.h> #include <vkd3d_utils.h>

17
gitlab/README
View File

@@ -8,7 +8,22 @@ the vkd3d tests on each merge request.
The CI target image-linux, in the file image.yml, builds a Docker The CI target image-linux, in the file image.yml, builds a Docker
image based on Debian bookworm with all the packages required for image based on Debian bookworm with all the packages required for
testing, and uploads it to the GitLab container registry. The Docker testing, and uploads it to the GitLab container registry. The Docker
script is in the file image.docker. script is in the file image.docker. Most of the dependencies are
installed directly from the Debian repositories, with a few
exceptions:
* widl is compiled from Wine sources, because installing it from the
Debian repositories would carry all the rest of Wine and make the
Docker image quite larger;
* SPIRV-Tools are recompiled from sources, because the packages in
Debian do not ship shared objects and are not multiarch-compatible;
in order to make the packages multiarch-compatible, the utilities
are dropped (they're not used by the CI anyway);
* llvmpipe from Mesa 24.0.1 is compiled (in addition to version
22.3.6 available in Debian bookworm), because some Vulkan features
required by vkd3d are not available in Mesa 22.3.6.
The file build.yml contains the actual testing targets. Currently The file build.yml contains the actual testing targets. Currently
vkd3d is tested on Linux, on x86-64 and i386, each architecture with vkd3d is tested on Linux, on x86-64 and i386, each architecture with

7
gitlab/build-crosstest
View File

@@ -1,10 +1,9 @@
#!/bin/bash #!/bin/bash
echo "Building $(git log -1)"
echo "---"
COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT"
set -Eeuxo pipefail set -Eeuxo pipefail
# Building with -Wno-array-bounds because MinGW headers currently emit # Building with -Wno-array-bounds because MinGW headers currently emit
@@ -25,3 +24,5 @@ rsync -Rr config.log tests/*.txt tests/*.exe ../artifacts/$COMMIT || true
cp tests/driver.cross64.exe ../artifacts cp tests/driver.cross64.exe ../artifacts
git reset --hard git reset --hard
echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K"

12
gitlab/build-linux
View File

@@ -1,18 +1,18 @@
#!/bin/bash #!/bin/bash
echo "Building $(git log -1)"
echo "---"
COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT"
set -Eeuxo pipefail set -Eeuxo pipefail
./autogen.sh ./autogen.sh
rm -fr build rm -fr build
mkdir build mkdir build
cd build cd build
export LD_LIBRARY_PATH=/usr/local/lib export LD_LIBRARY_PATH="/usr/local/lib:${LD_LIBRARY_PATH-}"
if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL" && \ if ../configure --enable-demos --with-spirv-tools DXCOMPILER_LIBS="-L/usr/local/lib" CFLAGS="-g -O2 -Werror" \
CPPFLAGS="-DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_GLSL -DVKD3D_ABORT_ON_ERR" && \
make -j$(nproc) ; then make -j$(nproc) ; then
make -j$(nproc) AM_COLOR_TESTS=always check || \ make -j$(nproc) AM_COLOR_TESTS=always check || \
touch ../tests_failed touch ../tests_failed
@@ -26,3 +26,5 @@ mkdir -p ../artifacts/$COMMIT
rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true rsync -Rr config.log doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
git reset --hard git reset --hard
echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K"

11
gitlab/build-mac
View File

@@ -1,17 +1,18 @@
#!/bin/bash #!/bin/bash
echo "Building $(git log -1)"
echo "---"
COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
echo -e "\033[0Ksection_start:`date +%s`:commit_$COMMIT\r\033[0KBuilding commit $COMMIT"
set -Eeuxo pipefail set -Eeuxo pipefail
./autogen.sh ./autogen.sh
rm -fr build rm -fr build
mkdir build mkdir build
cd build cd build
if ../configure CFLAGS="-g -O2 -Wno-implicit-fallthrough -Werror" && \ if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" \
CPPFLAGS="-DVKD3D_ABORT_ON_ERR" \
VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \
make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) ; then
make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \
touch ../tests_failed touch ../tests_failed
@@ -25,3 +26,5 @@ mkdir -p ../artifacts/$COMMIT
rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true rsync -Rr config.log test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT || true
git reset --hard git reset --hard
echo -e "\033[0Ksection_end:`date +%s`:commit_$COMMIT\r\033[0K"

11
gitlab/build-mingw
View File

@@ -1,10 +1,9 @@
#!/bin/bash #!/bin/bash
echo "Building $(git log -1)"
echo "---"
COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD))
echo -e "\e[0Ksection_start:`date +%s`:commit_$COMMIT\r\e[0KBuilding commit $COMMIT"
set -Eeuxo pipefail set -Eeuxo pipefail
./autogen.sh ./autogen.sh
@@ -13,7 +12,9 @@ mkdir build
cd build cd build
mkdir vulkan-headers mkdir vulkan-headers
cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers
../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \ ../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST \
SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers -DVKD3D_ABORT_ON_ERR" \
CFLAGS="-g -O2 -Wno-array-bounds -Werror" LDFLAGS="-static-libgcc" && \
make -j$(nproc) && \ make -j$(nproc) && \
make -j$(nproc) install DESTDIR="$PWD/destdir" || \ make -j$(nproc) install DESTDIR="$PWD/destdir" || \
touch ../pipeline_failed touch ../pipeline_failed
@@ -23,3 +24,5 @@ cp config.log ../artifacts/$COMMIT || true
cp destdir/usr/local/bin/* ../artifacts/$COMMIT || true cp destdir/usr/local/bin/* ../artifacts/$COMMIT || true
git reset --hard git reset --hard
echo -e "\e[0Ksection_end:`date +%s`:commit_$COMMIT\r\e[0K"

35
gitlab/build.yml
View File

@@ -61,6 +61,17 @@ build-llvmpipe-32:
CC: 'i686-linux-gnu-gcc' CC: 'i686-linux-gnu-gcc'
VKD3D_SHADER_CONFIG: 'force_validation' VKD3D_SHADER_CONFIG: 'force_validation'
build-llvmpipe-64-mesa24:
extends: .build-linux
allow_failure:
exit_codes:
- 2
variables:
VK_DRIVER_FILES: '/opt/mesa24/share/vulkan/icd.d/lvp_icd.x86_64.json'
LD_LIBRARY_PATH: '/opt/mesa24/lib/x86_64-linux-gnu'
__EGL_VENDOR_LIBRARY_FILENAMES: '/opt/mesa24/share/glvnd/egl_vendor.d/50_mesa.json'
VKD3D_SHADER_CONFIG: 'force_validation'
build-crosstest: build-crosstest:
stage: build stage: build
rules: rules:
@@ -126,9 +137,11 @@ build-mac:
stage: build stage: build
rules: rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
allow_failure: image: winehq-sonoma-pristine
exit_codes: variables:
- 2 TART_EXECUTOR_SSH_USERNAME: "gitlab"
TART_EXECUTOR_SSH_PASSWORD: "gitlab"
allow_failure: true
interruptible: true interruptible: true
needs: needs:
- job: image-mac - job: image-mac
@@ -137,28 +150,26 @@ build-mac:
tags: tags:
- mac - mac
script: script:
- brew install vulkan-tools libtool spirv-headers vulkan-loader
- git config --global --add safe.directory $CI_PROJECT_DIR - git config --global --add safe.directory $CI_PROJECT_DIR
- git clean -fdx - git clean -fdx
- git reset --hard - git reset --hard
- rm -fr .git/rebase-merge - rm -fr .git/rebase-merge
# We use a custom ICD which is not marked as a portability driver, - curl -o image.zip https://gitlab.winehq.org/api/v4/projects/giomasce%2Fvkd3d/jobs/artifacts/ci-image/download?job=image-mac
# so that test programs are not confused. - unzip image.zip
- ./gitlab/patch_moltenvk_icd.sh
- export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json"
- mkdir artifacts - mkdir artifacts
- export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PWD/image/bin:$PATH"
- export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json"
- system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt
- vulkaninfo > artifacts/vulkaninfo.txt - vulkaninfo > artifacts/vulkaninfo.txt
- export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
- curl -o image.zip https://gitlab.winehq.org/api/v4/projects/wine%2Fvkd3d/jobs/artifacts/master/download?job=image-mac
- unzip image.zip
- export PATH="$PWD/image/bin:$PATH"
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac
- if [ -f build_failed ] ; then exit 1 ; fi - if [ -f build_failed ] ; then exit 1 ; fi
- if [ -f tests_failed ] ; then exit 2 ; fi - if [ -f tests_failed ] ; then exit 2 ; fi
variables: variables:
VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing" VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing"
VKD3D_SHADER_CONFIG: 'force_validation' VKD3D_SHADER_CONFIG: 'force_validation'
MVK_CONFIG_LOG_LEVEL: 1 MVK_CONFIG_LOG_LEVEL: 2
SONAME_LIBVULKAN: "/opt/homebrew/opt/vulkan-loader/lib/libvulkan.1.dylib"
artifacts: artifacts:
when: always when: always
paths: paths:

15
gitlab/image.docker
View File

@@ -23,6 +23,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \ apt-get install -y build-essential pkg-config gcc-mingw-w64 crossbuild-essential-i386 \
autoconf automake libtool flex bison curl \ autoconf automake libtool flex bison curl \
git ca-certificates rsync \ git ca-certificates rsync \
llvm-15-dev meson ninja-build python3-mako \
zlib1g-dev libexpat-dev libdrm-dev libglvnd-dev \
doxygen doxygen-latex graphviz \ doxygen doxygen-latex graphviz \
mesa-vulkan-drivers mesa-vulkan-drivers:i386 \ mesa-vulkan-drivers mesa-vulkan-drivers:i386 \
vulkan-tools spirv-headers \ vulkan-tools spirv-headers \
@@ -36,6 +38,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \ libxcb-keysyms1-dev libxcb-keysyms1-dev:i386 && \
apt-get build-dep -y spirv-tools && \ apt-get build-dep -y spirv-tools && \
apt-get build-dep -y -ai386 spirv-tools && \ apt-get build-dep -y -ai386 spirv-tools && \
git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \ git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git && \
cd wine && \ cd wine && \
mkdir build && \ mkdir build && \
@@ -45,6 +48,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
cp tools/widl/widl /usr/local/bin && \ cp tools/widl/widl /usr/local/bin && \
cd ../.. && \ cd ../.. && \
rm -rf wine && \ rm -rf wine && \
apt-get source spirv-tools && \ apt-get source spirv-tools && \
cd spirv-tools-* && \ cd spirv-tools-* && \
sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \
@@ -55,6 +59,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
rm -f spirv-tools-dbgsym_*.deb && \ rm -f spirv-tools-dbgsym_*.deb && \
dpkg -i spirv-tools_*.deb && \ dpkg -i spirv-tools_*.deb && \
rm -fr * && \ rm -fr * && \
apt-get source spirv-tools && \ apt-get source spirv-tools && \
cd spirv-tools-* && \ cd spirv-tools-* && \
sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \ sed -i -e 's|-DBUILD_SHARED_LIBS=OFF|-DBUILD_SHARED_LIBS=ON|g' debian/rules && \
@@ -65,6 +70,16 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
rm -f spirv-tools-dbgsym_*.deb && \ rm -f spirv-tools-dbgsym_*.deb && \
dpkg -i spirv-tools_*.deb && \ dpkg -i spirv-tools_*.deb && \
rm -fr * && \ rm -fr * && \
git clone --depth 1 --branch mesa-24.0.3 https://gitlab.freedesktop.org/mesa/mesa.git && \
cd mesa && \
mkdir build && \
cd build && \
meson setup --buildtype release -Dprefix=/opt/mesa24 -Dplatforms= -Dvideo-codecs= -Dvulkan-drivers=swrast -Dgallium-drivers=swrast -Dopengl=true -Degl=enabled -Dglvnd=true -Dshared-glapi=enabled -Dglx=disabled -Dgles1=disabled -Dgles2=disabled .. && \
meson install && \
cd ../.. && \
rm -fr mesa && \
apt-get clean && \ apt-get clean && \
curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/linux_dxc_2023_08_14.x86_64.tar.gz | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/linux_dxc_2023_08_14.x86_64.tar.gz | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \
groupadd host-render -g 800 && \ groupadd host-render -g 800 && \

33
gitlab/image.yml
View File

@@ -19,6 +19,10 @@ image-linux:
- sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE" - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
- /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL" - /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"
# Job `image-mac' must be run each time the pipeline is run on a push,
# otherwise macOS artifacts are not regenerated and macOS jobs cannot find them.
# So we add a dependency on image.docker too, even if that file is not really
# used for macOS.
image-mac: image-mac:
stage: image stage: image
rules: rules:
@@ -26,24 +30,39 @@ image-mac:
changes: changes:
- .gitlab-ci.yml - .gitlab-ci.yml
- gitlab/image.yml - gitlab/image.yml
- gitlab/image.docker
image: winehq-sonoma-pristine
variables:
TART_EXECUTOR_SSH_USERNAME: "gitlab"
TART_EXECUTOR_SSH_PASSWORD: "gitlab"
interruptible: true interruptible: true
tags: tags:
- mac - mac
script: script:
- mkdir image - mkdir image
- cd image - mkdir image/bin
- mkdir bin - mkdir image/moltenvk
- export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH"
- git clone --depth 1 --branch v1.2.9 https://github.com/KhronosGroup/MoltenVK.git
- cd MoltenVK
- ./fetchDependencies --macos
- make macos
# Do not mark MoltenVK as a portability driver, otherwise it will be harder for vkd3d to find
# it. Since editing JSON properly is hard, we just rename the key.
- 'sed -i -e "s|is_portability_driver|_is_portability_driver|g" Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json'
- cd ..
- cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/MoltenVK_icd.json image/moltenvk
- cp MoltenVK/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib image/moltenvk
- git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git
- cd wine - cd wine
- mkdir build - mkdir build
- cd build - cd build
- ../configure --enable-win64 --without-x --without-freetype - arch -x86_64 ../configure --enable-win64 --without-x --without-freetype
- make tools/widl/widl - arch -x86_64 make tools/widl/widl
- cd ../.. - cd ../..
- cp wine/build/tools/widl/widl bin - cp wine/build/tools/widl/widl image/bin
- rm -fr wine
- cd ..
artifacts: artifacts:
paths: paths:
- image - image

12
gitlab/patch_moltenvk_icd.sh
View File

@@ -1,12 +0,0 @@
#!/bin/bash
BASE_PATH="/usr/local/opt/molten-vk/share/vulkan/icd.d"
cp "$BASE_PATH/MoltenVK_icd.json" gitlab/MoltenVK_icd.json
# The driver path is relative
sed -i -e 's|"library_path" *: "|"library_path" : "'"$BASE_PATH/"'|g' gitlab/MoltenVK_icd.json
# We pretend this is not a portability driver, otherwise vkd3d won't
# find it
sed -i -e 's|"is_portability_driver" *: *true|"is_portability_driver" : false|g' gitlab/MoltenVK_icd.json

23
gitlab/test.yml
View File

@@ -19,8 +19,31 @@ test-win-64:
extends: .test-win extends: .test-win
variables: variables:
TEST_ARCH: "64" TEST_ARCH: "64"
VKD3D_TEST_SKIP_DXC: "1"
test-win-32: test-win-32:
extends: .test-win extends: .test-win
variables: variables:
TEST_ARCH: "32" TEST_ARCH: "32"
VKD3D_TEST_SKIP_DXC: "1"
test-win-64-dxc:
stage: test
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
interruptible: true
allow_failure: true
needs:
- job: build-crosstest
tags:
- win10-21h2
script:
- 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2308/dxc_2023_08_14.zip" -OutFile ".\dxc.zip"'
- 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"'
- '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")'
- git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)'
- if (Test-Path "pipeline_failed") { exit 1 }
artifacts:
when: always
paths:
- artifacts

44
include/private/rbtree.h
View File

@@ -126,34 +126,17 @@ static inline struct rb_entry *rb_postorder_next(struct rb_entry *iter)
return rb_postorder_head(iter->parent->right); return rb_postorder_head(iter->parent->right);
} }
/* iterate through the tree */
#define RB_FOR_EACH(cursor, tree) \
for ((cursor) = rb_head((tree)->root); (cursor); (cursor) = rb_next(cursor))
/* iterate through the tree using a tree entry */
#define RB_FOR_EACH_ENTRY(elem, tree, type, field) \
for ((elem) = RB_ENTRY_VALUE(rb_head((tree)->root), type, field); \
(elem) != RB_ENTRY_VALUE(0, type, field); \
(elem) = RB_ENTRY_VALUE(rb_next(&elem->field), type, field))
/* iterate through the tree using using postorder, making it safe to free the entry */
#define RB_FOR_EACH_DESTRUCTOR(cursor, cursor2, tree) \
for ((cursor) = rb_postorder_head((tree)->root); \
(cursor) && (((cursor2) = rb_postorder_next(cursor)) || 1); \
(cursor) = (cursor2))
/* iterate through the tree using a tree entry and postorder, making it safe to free the entry */
#define RB_FOR_EACH_ENTRY_DESTRUCTOR(elem, elem2, tree, type, field) \
for ((elem) = RB_ENTRY_VALUE(rb_postorder_head((tree)->root), type, field); \
(elem) != WINE_RB_ENTRY_VALUE(0, type, field) \
&& (((elem2) = RB_ENTRY_VALUE(rb_postorder_next(&(elem)->field), type, field)) || 1); \
(elem) = (elem2))
static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context) static inline void rb_postorder(struct rb_tree *tree, rb_traverse_func *callback, void *context)
{ {
struct rb_entry *iter, *next; struct rb_entry *entry = rb_postorder_head(tree->root);
RB_FOR_EACH_DESTRUCTOR(iter, next, tree) callback(iter, context); struct rb_entry *next;
while (entry)
{
next = rb_postorder_next(entry);
callback(entry, context);
entry = next;
}
} }
static inline void rb_init(struct rb_tree *tree, rb_compare_func compare) static inline void rb_init(struct rb_tree *tree, rb_compare_func compare)
@@ -164,8 +147,13 @@ static inline void rb_init(struct rb_tree *tree, rb_compare_func compare)
static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context) static inline void rb_for_each_entry(struct rb_tree *tree, rb_traverse_func *callback, void *context)
{ {
struct rb_entry *iter; struct rb_entry *entry = rb_head(tree->root);
RB_FOR_EACH(iter, tree) callback(iter, context);
while (entry)
{
callback(entry, context);
entry = rb_next(entry);
}
} }
static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context) static inline void rb_clear(struct rb_tree *tree, rb_traverse_func *callback, void *context)

Some files were not shown because too many files have changed in this diff Show More