Fix for static const literals in HLSL. (#1684)

Signed-off-by: Eric Renaud-Houde <[email protected]>

Signed-off-by: Eric Renaud-Houde <[email protected]>
Co-authored-by: Rémi Achard <[email protected]>

Author: num3ric

src/OpenColorIO/GpuShaderUtils.cpp

@@ -335,13 +335,18 @@ std::string GpuShaderText::constKeyword() const
         case GPU_LANGUAGE_GLSL_4_0:
         case GPU_LANGUAGE_GLSL_ES_1_0:
         case GPU_LANGUAGE_GLSL_ES_3_0:
-        case GPU_LANGUAGE_HLSL_DX11:
         case GPU_LANGUAGE_MSL_2_0:
         {
             str += "const";
             str += " ";
             break;
         }
+        case GPU_LANGUAGE_HLSL_DX11:
+        {
+            str += "static const";
+            str += " ";
+            break;
+        }
         case LANGUAGE_OSL_1:
         case GPU_LANGUAGE_CG:
             break;
@@ -380,6 +385,16 @@ std::string GpuShaderText::intKeyword() const
     return "int";
 }
 
+std::string GpuShaderText::intKeywordConst() const
+{
+    std::string str;
+
+    str += constKeyword();
+    str += intKeyword();
+
+    return str;
+}
+
 std::string GpuShaderText::colorDecl(const std::string & name) const
 {
     if (name.empty())
@@ -547,7 +562,7 @@ void GpuShaderText::declareIntArrayConst(const std::string & name, int size, con
         case GPU_LANGUAGE_GLSL_ES_1_0:
         case GPU_LANGUAGE_GLSL_ES_3_0:
         {
-            nl << "const " << intKeyword() << " " << name << "[" << size << "] = "
+            nl << intKeywordConst() << " " << name << "[" << size << "] = "
                << intKeyword() << "[" << size << "](";
             for (int i = 0; i < size; ++i)
             {
@@ -563,7 +578,7 @@ void GpuShaderText::declareIntArrayConst(const std::string & name, int size, con
         case GPU_LANGUAGE_HLSL_DX11:
         case GPU_LANGUAGE_MSL_2_0:
         {
-            nl << "const " << intKeyword() << " " << name << "[" << size << "] = {";
+            nl << intKeywordConst() << " " << name << "[" << size << "] = {";
             for (int i = 0; i < size; ++i)
             {
                 nl << v[i];

src/OpenColorIO/GpuShaderUtils.h

@@ -74,6 +74,7 @@ class GpuShaderText
     std::string floatDecl(const std::string& name) const;
 
     std::string intKeyword() const;
+    std::string intKeywordConst() const;
 
     std::string colorDecl(const std::string& name) const;