summaryrefslogtreecommitdiff
path: root/source/slang
diff options
context:
space:
mode:
Diffstat (limited to 'source/slang')
-rw-r--r--source/slang/core.meta.slang6
-rw-r--r--source/slang/diff.meta.slang32
-rw-r--r--source/slang/hlsl.meta.slang111
-rw-r--r--source/slang/slang-emit-c-like.cpp20
4 files changed, 163 insertions, 6 deletions
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang
index ed80b3730..edb98b3c2 100644
--- a/source/slang/core.meta.slang
+++ b/source/slang/core.meta.slang
@@ -93,7 +93,11 @@ interface __BuiltinArithmeticType : __BuiltinType
/// A type that can be used for logical/bitwise operations
[sealed]
[builtin]
-interface __BuiltinLogicalType : __BuiltinType {}
+interface __BuiltinLogicalType : __BuiltinType
+{
+ /// Initialize from a 32-bit signed integer value.
+ __init(int value);
+}
/// A type that logically has a sign (positive/negative/zero)
[sealed]
diff --git a/source/slang/diff.meta.slang b/source/slang/diff.meta.slang
index a97ab9eaf..248112810 100644
--- a/source/slang/diff.meta.slang
+++ b/source/slang/diff.meta.slang
@@ -110,6 +110,38 @@ void updatePair<T : IDifferentiable>(inout DifferentialPair<T> p, T newPrimal, T
p = DifferentialPair<T>(newPrimal, newDiff);
}
+// vector-matrix
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+DifferentialPair<vector<T, M>> mul(DifferentialPair<vector<T, N>> left, DifferentialPair<matrix<T, N, M>> right)
+{
+ let primal = mul(left.p, right.p);
+ let diff = mul(left.d, right.p) + mul(left.p, right.d);
+ return DifferentialPair<vector<T,M>>(primal, diff);
+}
+
+// matrix-vector
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
+[ForceInline]
+[ForwardDerivativeOf(mul)]
+DifferentialPair<vector<T,N>> mul(DifferentialPair<matrix<T,N,M>> left, DifferentialPair<vector<T,M>> right)
+{
+ let primal = mul(left.p, right.p);
+ let diff = mul(left.d, right.p) + mul(left.p, right.d);
+ return DifferentialPair<vector<T,N>>(primal, diff);
+}
+
+
+// matrix-matrix
+__generic<T : __BuiltinFloatingPointType, let R : int, let N : int, let C : int>
+[ForwardDerivativeOf(mul)]
+DifferentialPair<matrix<T,R,C>> mul(DifferentialPair<matrix<T,R,N>> right, DifferentialPair<matrix<T,N,C>> left)
+{
+ let primal = mul(right.p, left.p);
+ let diff = mul(right.d, left.p) + mul(right.p, left.d);
+ return DifferentialPair<matrix<T,R,C>>(primal, diff);
+}
#define VECTOR_MAP_D_UNARY(TYPE, COUNT, D_FUNC, VALUE) \
vector<TYPE, COUNT> result; \
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index 0232129ee..ed150a4c0 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -2715,7 +2715,24 @@ T mul(vector<T, N> x, vector<T, N> y)
}
// vector-matrix
-__generic<T : __BuiltinArithmeticType, let N : int, let M : int>
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+vector<T, M> mul(vector<T, N> left, matrix<T, N, M> right)
+{
+ vector<T,M> result;
+ for( int j = 0; j < M; ++j )
+ {
+ T sum = T(0);
+ for( int i = 0; i < N; ++i )
+ {
+ sum += left[i] * right[i][j];
+ }
+ result[j] = sum;
+ }
+ return result;
+}
+__generic<T : __BuiltinIntegerType, let N : int, let M : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl, "($1 * $0)")
vector<T, M> mul(vector<T, N> left, matrix<T, N, M> right)
@@ -2732,9 +2749,26 @@ vector<T, M> mul(vector<T, N> left, matrix<T, N, M> right)
}
return result;
}
+__generic<T : __BuiltinLogicalType, let N : int, let M : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+vector<T, M> mul(vector<T, N> left, matrix<T, N, M> right)
+{
+ vector<T,M> result;
+ for( int j = 0; j < M; ++j )
+ {
+ T sum = T(0);
+ for( int i = 0; i < N; ++i )
+ {
+ sum |= left[i] & right[i][j];
+ }
+ result[j] = sum;
+ }
+ return result;
+}
// matrix-vector
-__generic<T : __BuiltinArithmeticType, let N : int, let M : int>
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl, "($1 * $0)")
vector<T,N> mul(matrix<T,N,M> left, vector<T,M> right)
@@ -2751,10 +2785,43 @@ vector<T,N> mul(matrix<T,N,M> left, vector<T,M> right)
}
return result;
}
-
+__generic<T : __BuiltinIntegerType, let N : int, let M : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+vector<T,N> mul(matrix<T,N,M> left, vector<T,M> right)
+{
+ vector<T,N> result;
+ for( int i = 0; i < N; ++i )
+ {
+ T sum = T(0);
+ for( int j = 0; j < M; ++j )
+ {
+ sum += left[i][j] * right[j];
+ }
+ result[i] = sum;
+ }
+ return result;
+}
+__generic<T : __BuiltinLogicalType, let N : int, let M : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+vector<T,N> mul(matrix<T,N,M> left, vector<T,M> right)
+{
+ vector<T,N> result;
+ for( int i = 0; i < N; ++i )
+ {
+ T sum = T(0);
+ for( int j = 0; j < M; ++j )
+ {
+ sum |= left[i][j] & right[j];
+ }
+ result[i] = sum;
+ }
+ return result;
+}
// matrix-matrix
-__generic<T : __BuiltinArithmeticType, let R : int, let N : int, let C : int>
+__generic<T : __BuiltinFloatingPointType, let R : int, let N : int, let C : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl, "($1 * $0)")
matrix<T,R,C> mul(matrix<T,R,N> right, matrix<T,N,C> left)
@@ -2772,6 +2839,42 @@ matrix<T,R,C> mul(matrix<T,R,N> right, matrix<T,N,C> left)
}
return result;
}
+__generic<T : __BuiltinIntegerType, let R : int, let N : int, let C : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+matrix<T,R,C> mul(matrix<T,R,N> right, matrix<T,N,C> left)
+{
+ matrix<T,R,C> result;
+ for( int r = 0; r < R; ++r)
+ for( int c = 0; c < C; ++c)
+ {
+ T sum = T(0);
+ for( int i = 0; i < N; ++i )
+ {
+ sum += left[r][i] * right[i][c];
+ }
+ result[r][c] = sum;
+ }
+ return result;
+}
+__generic<T : __BuiltinLogicalType, let R : int, let N : int, let C : int>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl, "($1 * $0)")
+matrix<T,R,C> mul(matrix<T,R,N> right, matrix<T,N,C> left)
+{
+ matrix<T,R,C> result;
+ for( int r = 0; r < R; ++r)
+ for( int c = 0; c < C; ++c)
+ {
+ T sum = T(0);
+ for( int i = 0; i < N; ++i )
+ {
+ sum |= left[r][i] & right[i][c];
+ }
+ result[r][c] = sum;
+ }
+ return result;
+}
// noise (deprecated)
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index cadab5690..dd40b7856 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -1778,7 +1778,6 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
case kIROp_MakeVector:
case kIROp_MakeMatrix:
- case kIROp_MakeMatrixFromScalar:
case kIROp_MatrixReshape:
case kIROp_VectorReshape:
case kIROp_CastFloatToInt:
@@ -1789,6 +1788,25 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
emitType(inst->getDataType());
emitArgs(inst);
break;
+ case kIROp_MakeMatrixFromScalar:
+ {
+ emitType(inst->getDataType());
+ auto matrixType = as<IRMatrixType>(inst->getDataType());
+ SLANG_RELEASE_ASSERT(matrixType);
+ auto columnCount = as<IRIntLit>(matrixType->getColumnCount());
+ SLANG_RELEASE_ASSERT(columnCount);
+ auto rowCount = as<IRIntLit>(matrixType->getRowCount());
+ SLANG_RELEASE_ASSERT(rowCount);
+ m_writer->emit("(");
+ for (IRIntegerValue i = 0; i < rowCount->getValue() * columnCount->getValue(); i++)
+ {
+ if (i != 0)
+ m_writer->emit(", ");
+ emitOperand(inst->getOperand(0), getInfo(EmitOp::General));
+ }
+ m_writer->emit(")");
+ }
+ break;
case kIROp_AllocObj:
m_writer->emit("new ");
m_writer->emit(getName(inst->getDataType()));
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-04 06:25:10 +0000