summaryrefslogtreecommitdiff
path: root/source/slang/hlsl.meta.slang
diff options
context:
space:
mode:
authorEllie Hermaszewska <ellieh@nvidia.com>2023-11-03 04:00:16 +0800
committerGitHub <noreply@github.com>2023-11-02 13:00:16 -0700
commit72e95f2c62b39ef1ddb6c169a9452a3b4fcb22a5 (patch)
tree878d8b747b74179530b7164dc639ce82814b8dee /source/slang/hlsl.meta.slang
parente712ebd93aa9a2845bde3ea541aaa7cd415548b7 (diff)
Several spirv intrinsics and small fix (#3307)
* spirv intrinsic for faceforward * spirv intrinsic for fwidth * spirv intrinsic for modf * spirv intrinsic for nonuniformresourceindex * spirv intrinsic for transpose * Make sure address space matches for OpAccessChain * Correct placement for OpDecorate instructions in spirv asm blocks
Diffstat (limited to 'source/slang/hlsl.meta.slang')
-rw-r--r--source/slang/hlsl.meta.slang49
1 files changed, 43 insertions, 6 deletions
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index fdc2ce83d..43e40778c 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -2697,6 +2697,7 @@ vector<float16_t, N> f32tof16_(vector<float, N> value)
__generic<T : __BuiltinFloatingPointType, let N : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpExtInst resultType resultId glsl450 FaceForward _0 _1 _2")
[__readNone]
vector<T,N> faceforward(vector<T,N> n, vector<T,N> i, vector<T,N> ng)
{
@@ -2918,11 +2919,15 @@ matrix<T, N, M> frexp(matrix<T, N, M> x, out matrix<int, N, M, L> exp)
// Texture filter width
__generic<T : __BuiltinFloatingPointType>
[__readNone]
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpFWidth resultType resultId _0")
T fwidth(T x);
__generic<T : __BuiltinFloatingPointType, let N : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpFWidth resultType resultId _0")
[__readNone]
vector<T, N> fwidth(vector<T, N> x)
{
@@ -4058,6 +4063,9 @@ matrix<T,N,M> min(matrix<T,N,M> x, matrix<T,N,M> y)
// split into integer and fractional parts (both with same sign)
__generic<T : __BuiltinFloatingPointType>
+__target_intrinsic(hlsl)
+__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpExtInst resultType resultId glsl450 Modf _0 _1")
[__readNone]
T modf(T x, out T ip);
@@ -4352,22 +4360,48 @@ __generic<let N : int> float noise(vector<float, N> x)
/// to this function as necessary in output code, rather than make this
/// the user's responsibility, so that the default behavior of the language
/// is more semantically "correct."
-__target_intrinsic(hlsl)
-__target_intrinsic(glsl, nonuniformEXT)
__glsl_extension(GL_EXT_nonuniform_qualifier)
[__readNone]
uint NonUniformResourceIndex(uint index)
{
- return index;
+ __target_switch
+ {
+ case hlsl:
+ __intrinsic_asm "NonUniformResourceIndex";
+ case glsl:
+ __intrinsic_asm "nonuniformEXT";
+ case spirv:
+ spirv_asm
+ {
+ OpCapability ShaderNonUniform;
+ OpDecorate $index NonUniform;
+ };
+ return index;
+ default:
+ return index;
+ }
}
-__target_intrinsic(hlsl)
-__target_intrinsic(glsl, nonuniformEXT)
__glsl_extension(GL_EXT_nonuniform_qualifier)
[__readNone]
int NonUniformResourceIndex(int index)
{
- return index;
+ __target_switch
+ {
+ case hlsl:
+ __intrinsic_asm "NonUniformResourceIndex";
+ case glsl:
+ __intrinsic_asm "nonuniformEXT";
+ case spirv:
+ spirv_asm
+ {
+ OpCapability ShaderNonUniform;
+ OpDecorate $index NonUniform;
+ };
+ return index;
+ default:
+ return index;
+ }
}
/// HLSL allows NonUniformResourceIndex around non int/uint types.
@@ -5049,6 +5083,7 @@ matrix<T,N,M> tanh(matrix<T,N,M> x)
__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpTranspose resultType resultId _0")
[__readNone]
[PreferRecompute]
matrix<T, M, N> transpose(matrix<T, N, M> x)
@@ -5062,6 +5097,7 @@ matrix<T, M, N> transpose(matrix<T, N, M> x)
__generic<T : __BuiltinIntegerType, let N : int, let M : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpTranspose resultType resultId _0")
[__readNone]
[PreferRecompute]
matrix<T, M, N> transpose(matrix<T, N, M> x)
@@ -5075,6 +5111,7 @@ matrix<T, M, N> transpose(matrix<T, N, M> x)
__generic<T : __BuiltinLogicalType, let N : int, let M : int>
__target_intrinsic(hlsl)
__target_intrinsic(glsl)
+__target_intrinsic(spirv, "OpTranspose resultType resultId _0")
[__readNone]
[PreferRecompute]
matrix<T, M, N> transpose(matrix<T, N, M> x)