Merge pull request #85 from tfoleyNV/working

Various bug fixes

1 files changed, 37 insertions, 4 deletions

diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index 563f5a015..3450e72d7 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -2073,13 +2073,46 @@ namespace Slang
         sb << "__magic_type(GLSLInputAttachmentType) struct subpassInput {};";
 
         // Define additional keywords
+
         sb << "__modifier(GLSLBufferModifier)       buffer;\n";
-        sb << "__modifier(GLSLWriteOnlyModifier)    writeonly;\n";
-        sb << "__modifier(GLSLReadOnlyModifier)     readonly;\n";
+
+        // [GLSL 4.3] Storage Qualifiers
+
+        // TODO: need to support `shared` here with its GLSL meaning
+
         sb << "__modifier(GLSLPatchModifier)        patch;\n";
+        // `centroid` and `sample` handled centrally
+
+        // [GLSL 4.5] Interpolation Qualifiers
+        sb << "__modifier(SimpleModifier)   smooth;\n";
+        sb << "__modifier(SimpleModifier)   flat;\n";
+        sb << "__modifier(SimpleModifier)   noperspective;\n";
+
+
+        // [GLSL 4.3.2] Constant Qualifier
+
+        // We need to handle GLSL `const` separately from HLSL `const`,
+        // since they mean such different things.
+
+        // [GLSL 4.7.2] Precision Qualifiers
+        sb << "__modifier(SimpleModifier)   highp;\n";
+        sb << "__modifier(SimpleModifier)   mediump;\n";
+        sb << "__modifier(SimpleModifier)   lowp;\n";
+
+        // [GLSL 4.8.1] The Invariant Qualifier
+
+        sb << "__modifier(GLSLWriteOnlyModifier)    invariant;\n";
+
+        // [GLSL 4.10] Memory Qualifiers
+
+        sb << "__modifier(SimpleModifier)           coherent;\n";
+        sb << "__modifier(SimpleModifier)           volatile;\n";
+        sb << "__modifier(SimpleModifier)           restrict;\n";
+        sb << "__modifier(GLSLReadOnlyModifier)     readonly;\n";
+        sb << "__modifier(GLSLWriteOnlyModifier)    writeonly;\n";
 
-        sb << "__modifier(SimpleModifier)           flat;\n";
-        sb << "__modifier(SimpleModifier)           highp;\n";
+        // We will treat `subroutine` as a qualifier
+        sb << "__modifier(SimpleModifier)   subroutine;\n";
 
         glslLibraryCode = sb.ProduceString();
         return glslLibraryCode;