From 20ac581f09a9451f7c84cb0a1ae8764f5e9349be Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoley@nvidia.com>
Date: Fri, 7 Jul 2017 13:15:08 -0700
Subject: Add GLSL equivalents for some stdlib operations.

- Map HLSL `atan2(y,x)` to GLSL `atan(y,x)`

- Add support for `$p` escape in `__intrinsic` modifier, which allows generating GLSL texture-sampler pairs more easily

- Also added a `$o` escape to represent the base object in an OOP-style call (`obj.F(...)`)
  - This isn't used in the texture functions right now, because getting the right GLSL texture type in this context is a bit thorny (the prefix depends on the generic parameter being used)

- Used the `$p` capability to add mappings for `SampleBias` and `SampleLevel`
---
 source/slang/slang-stdlib.cpp | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

(limited to 'source/slang/slang-stdlib.cpp')

diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index ff727cbb6..87c2c2e8a 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -341,9 +341,20 @@ __generic<T : __BuiltinFloatingPointType> __intrinsic T atan(T x);
 __generic<T : __BuiltinFloatingPointType, let N : int> __intrinsic vector<T,N> atan(vector<T,N> x);
 __generic<T : __BuiltinFloatingPointType, let N : int, let M : int> __intrinsic matrix<T,N,M> atan(matrix<T,N,M> x);
 
-__generic<T : __BuiltinFloatingPointType> __intrinsic T atan2(T y, T x);
-__generic<T : __BuiltinFloatingPointType, let N : int> __intrinsic vector<T,N> atan2(vector<T,N> y, vector<T,N> x);
-__generic<T : __BuiltinFloatingPointType, let N : int, let M : int> __intrinsic matrix<T,N,M> atan2(matrix<T,N,M> y, matrix<T,N,M> x);
+__generic<T : __BuiltinFloatingPointType>
+__intrinsic(glsl,"atan($0,$1)")
+__intrinsic
+T atan2(T y, T x);
+
+__generic<T : __BuiltinFloatingPointType, let N : int>
+__intrinsic(glsl,"atan($0,$1)")
+__intrinsic
+vector<T,N> atan2(vector<T,N> y, vector<T,N> x);
+
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
+__intrinsic(glsl,"atan($0,$1)")
+__intrinsic
+matrix<T,N,M> atan2(matrix<T,N,M> y, matrix<T,N,M> x);
 
 // Ceiling (HLSL SM 1.0)
 __generic<T : __BuiltinFloatingPointType> __intrinsic T ceil(T x);
@@ -1324,7 +1335,6 @@ namespace Slang
 
                     flavor |= (access << 8);
 
-
                     // emit a generic signature
                     // TODO: allow for multisample count to come in as well...
                     sb << "__generic<T = float4> ";
@@ -1475,11 +1485,15 @@ namespace Slang
 
 
                         // `SampleBias()`
+                        sb << "__intrinsic(glsl, \"texture($p, $1, $2)\")\n";
+                        sb << "__intrinsic\n";
                         sb << "T SampleBias(SamplerState s, ";
                         sb << "float" << kBaseTextureTypes[tt].coordCount + isArray << " location, float bias);\n";
 
                         if( baseShape != TextureType::ShapeCube )
                         {
+                            sb << "__intrinsic(glsl, \"textureOffset($p, $1, $2, $3)\")\n";
+                            sb << "__intrinsic\n";
                             sb << "T SampleBias(SamplerState s, ";
                             sb << "float" << kBaseTextureTypes[tt].coordCount + isArray << " location, float bias, ";
                             sb << "int" << kBaseTextureTypes[tt].coordCount << " offset);\n";
@@ -1533,12 +1547,16 @@ namespace Slang
 
                         // `SampleLevel`
 
+                        sb << "__intrinsic(glsl, \"textureLod($p, $1, $2)\")\n";
+                        sb << "__intrinsic\n";
                         sb << "T SampleLevel(SamplerState s, ";
                         sb << "float" << kBaseTextureTypes[tt].coordCount + isArray << " location, ";
                         sb << "float level);\n";
 
                         if( baseShape != TextureType::ShapeCube )
                         {
+                            sb << "__intrinsic(glsl, \"textureLodOffset($p, $1, $2, $3)\")\n";
+                            sb << "__intrinsic\n";
                             sb << "T SampleLevel(SamplerState s, ";
                             sb << "float" << kBaseTextureTypes[tt].coordCount + isArray << " location, ";
                             sb << "float level, ";
-- 
cgit v1.2.3


From f3fe9dddb8c528b4f9955d9105908600b4a8d0c8 Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoley@nvidia.com>
Date: Fri, 7 Jul 2017 13:34:23 -0700
Subject: Map HLSL `lerp` to GLSL `mix`

- Also fix a bug in `emit.cpp` where I wasn't detecting `__intrinsic` remaps that don't include `$` (this is a byproduct of changing the string index type to be unsigned; other bugs like this may be lurking)
---
 source/slang/emit.cpp         |  2 +-
 source/slang/slang-stdlib.cpp | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'source/slang/slang-stdlib.cpp')

diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 5d85b4d57..df74d19e4 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -1466,7 +1466,7 @@ struct EmitVisitor
                 {
                     auto name = getStringOrIdentifierTokenValue(targetIntrinsicModifier->definitionToken);
 
-                    if(name.IndexOf('$') < 0)
+                    if(name.IndexOf('$') == -1)
                     {
                         // Simple case: it is just an ordinary name, so we call it like a builtin.
                         //
diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index 87c2c2e8a..e1bba8885 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -592,9 +592,20 @@ __generic<T : __BuiltinFloatingPointType, let N : int, let M : int> __intrinsic
 __generic<T : __BuiltinFloatingPointType, let N : int> __intrinsic T length(vector<T,N> x);
 
 // Linear interpolation
-__generic<T : __BuiltinFloatingPointType> __intrinsic T lerp(T x, T y, T s);
-__generic<T : __BuiltinFloatingPointType, let N : int> __intrinsic vector<T,N> lerp(vector<T,N> x, vector<T,N> y, vector<T,N> s);
-__generic<T : __BuiltinFloatingPointType, let N : int, let M : int> __intrinsic matrix<T,N,M> lerp(matrix<T,N,M> x, matrix<T,N,M> y, matrix<T,N,M> s);
+__generic<T : __BuiltinFloatingPointType>
+__intrinsic(glsl, mix)
+__intrinsic
+T lerp(T x, T y, T s);
+
+__generic<T : __BuiltinFloatingPointType, let N : int>
+__intrinsic(glsl, mix)
+__intrinsic
+vector<T,N> lerp(vector<T,N> x, vector<T,N> y, vector<T,N> s);
+
+__generic<T : __BuiltinFloatingPointType, let N : int, let M : int>
+__intrinsic(glsl, mix)
+__intrinsic
+matrix<T,N,M> lerp(matrix<T,N,M> x, matrix<T,N,M> y, matrix<T,N,M> s);
 
 // Legacy lighting function (obsolete)
 __intrinsic float4 lit(float n_dot_l, float n_dot_h, float m);
-- 
cgit v1.2.3