diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-03-07 17:44:57 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-03-07 17:44:57 +0000 |
| commit | f7aadabaf817d33584979382a3d831c8cd04c213 (patch) | |
| tree | ad6e930267ad7e51ff1473fb484f48ef208517a6 /Graphics/GraphicsEngineD3DBase | |
| parent | Added Matrix2x2 to BasicMath lib (diff) | |
| download | DiligentCore-f7aadabaf817d33584979382a3d831c8cd04c213.tar.gz DiligentCore-f7aadabaf817d33584979382a3d831c8cd04c213.zip | |
Added MatrixFromRows overloads for float3x3 and float2x2
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions.fxh | 10 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions_inc.fxh | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions.fxh b/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions.fxh index e5be0b85..df6edfa0 100644 --- a/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions.fxh +++ b/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions.fxh @@ -63,4 +63,14 @@ float4x4 MatrixFromRows(float4 row0, float4 row1, float4 row2, float4 row3) return float4x4(row0, row1, row2, row3); } +float3x3 MatrixFromRows(float3 row0, float3 row1, float3 row2) +{ + return float3x3(row0, row1, row2); +} + +float2x2 MatrixFromRows(float2 row0, float2 row1) +{ + return float2x2(row0, row1); +} + #endif // _HLSL_DEFINITIONS_ diff --git a/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions_inc.fxh b/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions_inc.fxh index 5a441403..3eb36067 100644 --- a/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions_inc.fxh +++ b/Graphics/GraphicsEngineD3DBase/include/HLSLDefinitions_inc.fxh @@ -63,4 +63,14 @@ " return float4x4(row0, row1, row2, row3);\n" "}\n" "\n" +"float3x3 MatrixFromRows(float3 row0, float3 row1, float3 row2)\n" +"{\n" +" return float3x3(row0, row1, row2);\n" +"}\n" +"\n" +"float2x2 MatrixFromRows(float2 row0, float2 row1)\n" +"{\n" +" return float2x2(row0, row1);\n" +"}\n" +"\n" "#endif // _HLSL_DEFINITIONS_\n" |