diff options
| -rw-r--r-- | source/slang/core.meta.slang | 25 | ||||
| -rw-r--r-- | tests/hlsl-intrinsic/matrix-cast-to-vector.slang | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang index 3f396b864..6b396a621 100644 --- a/source/slang/core.meta.slang +++ b/source/slang/core.meta.slang @@ -1210,6 +1210,31 @@ extension matrix<int16_t,R,C,L> __init(int value) { this = matrix<T,R,C,L>(T(value)); } } +__intrinsic_op(makeVector) +__generic<T, let N:int> +vector<T,N*2> __makeVector(vector<T,N> vec1, vector<T,N> vec2); + +__generic<T> +extension vector<T, 4> +{ + __generic<let L : int> + [__unsafeForceInlineEarly] + __init(matrix<T, 2, 2, L> value) + { + this = __makeVector(value[0], value[1]); + } +} +__generic<T, let L : int> +extension matrix<T, 2, 2, L> +{ + [__unsafeForceInlineEarly] + __init(vector<T, 4> value) + { + this[0] = value.xy; + this[1] = value.zw; + } +} + ${{{{ static const struct { char const* name; diff --git a/tests/hlsl-intrinsic/matrix-cast-to-vector.slang b/tests/hlsl-intrinsic/matrix-cast-to-vector.slang new file mode 100644 index 000000000..1ae064f26 --- /dev/null +++ b/tests/hlsl-intrinsic/matrix-cast-to-vector.slang @@ -0,0 +1,25 @@ +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute -dx12 -use-dxil -shaderobj -xslang -matrix-layout-row-major +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute -dx12 -use-dxil -shaderobj -xslang -matrix-layout-column-major +//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -shaderobj -xslang -matrix-layout-row-major +//TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -shaderobj -xslang -matrix-layout-column-major + +//TEST_INPUT:ubuffer(data=[0], stride=4):out,name outputBuffer +RWStructuredBuffer<int> outputBuffer; + +[numthreads(1, 1, 1)] +void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID) +{ + float2x2 matrix2x2_1 = float2x2(1, 2, 3, 4); + float4 vector4_1 = (float4)matrix2x2_1; + + float4 vector4_2 = float4(1, 2, 3, 4); + float2x2 matrix2x2_2 = (float2x2)vector4_2; + + outputBuffer[0] = uint(true + && all(vector4_1 == float4(1, 2, 3, 4)) + + && all(matrix2x2_2[0] == float2(1,2)) + && all(matrix2x2_2[1] == float2(3,4)) + ); + //BUF: 1 +} |