AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-11-14 16:01:07 +00:00
Code Issues Projects Releases Wiki Activity

Add remaining matrix multiplication ops for HLSL

Browse Source
This commit is contained in:
Robert Konrad 2016-08-18 11:45:50 +02:00
parent f3740a00ee
commit 7534b224d9
2 changed files with 40 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
spirv_hlsl.cpp
View File

@ -752,6 +752,32 @@ void CompilerHLSL::emit_binary_func_op_transpose_first(uint32_t result_type, uin
}
}
void CompilerHLSL::emit_binary_func_op_transpose_second(uint32_t result_type, uint32_t result_id, uint32_t op0, uint32_t op1,
const char *op)
{
bool forward = should_forward(op0) && should_forward(op1);
emit_op(result_type, result_id, join(op, "(", to_expression(op0), ", transpose(", to_expression(op1), "))"), forward, false);
if (forward && forced_temporaries.find(result_id) == end(forced_temporaries))
{
inherit_expression_dependencies(result_id, op0);
inherit_expression_dependencies(result_id, op1);
}
}
void CompilerHLSL::emit_binary_func_op_transpose_all(uint32_t result_type, uint32_t result_id, uint32_t op0, uint32_t op1,
const char *op)
{
bool forward = should_forward(op0) && should_forward(op1);
emit_op(result_type, result_id, join("transpose(", op, "(transpose(", to_expression(op0), "), transpose(", to_expression(op1), ")))"), forward, false);
if (forward && forced_temporaries.find(result_id) == end(forced_temporaries))
{
inherit_expression_dependencies(result_id, op0);
inherit_expression_dependencies(result_id, op1);
}
}
void CompilerHLSL::emit_instruction(const Instruction &instruction)
{
auto ops = stream(instruction);
@ -775,12 +801,16 @@ void CompilerHLSL::emit_instruction(const Instruction &instruction)
emit_binary_func_op_transpose_first(ops[0], ops[1], ops[2], ops[3], "mul");
break;
}
// TODO: Take care of remaining matrix binops
//case OpMatrixTimesScalar:
//case OpVectorTimesMatrix:
//case OpMatrixTimesMatrix:
case OpVectorTimesMatrix:
{
emit_binary_func_op_transpose_second(ops[0], ops[1], ops[2], ops[3], "mul");
break;
}
case OpMatrixTimesMatrix:
{
emit_binary_func_op_transpose_all(ops[0], ops[1], ops[2], ops[3], "mul");
break;
}
default:
CompilerGLSL::emit_instruction(instruction);
break;

4
spirv_hlsl.hpp
View File

@ -60,6 +60,10 @@ private:
void emit_instruction(const Instruction &instruction) override;
void emit_binary_func_op_transpose_first(uint32_t result_type, uint32_t result_id, uint32_t op0, uint32_t op1,
const char *op);
void emit_binary_func_op_transpose_second(uint32_t result_type, uint32_t result_id, uint32_t op0, uint32_t op1,
const char *op);
void emit_binary_func_op_transpose_all(uint32_t result_type, uint32_t result_id, uint32_t op0, uint32_t op1,
const char *op);
Options options;
};