replace texture2D function with texture for GLSL 1.3 (#1723)

bartstyczen · doug-walker · cedrik-fuoco-adsk · commit 4c4f66345ead · 2023-01-05T10:21:26.000-05:00
Signed-off-by: Bart Styczen <bart.styczen@cine.dev> Signed-off-by: Bart Styczen <bart.styczen@cine.dev> Co-authored-by: Doug Walker <doug.walker@autodesk.com> (cherry picked from commit d5cedbf)
diff --git a/src/OpenColorIO/GpuShaderUtils.cpp b/src/OpenColorIO/GpuShaderUtils.cpp
@@ -143,11 +143,15 @@ std::string getTexSample(GpuLanguage lang,
     switch (lang)
     {
         case GPU_LANGUAGE_GLSL_1_2:
-        case GPU_LANGUAGE_GLSL_1_3:
         {
             kw << "texture" << N << "D(" << samplerName << ", " << coords << ")";
             break;
         }
+        case GPU_LANGUAGE_GLSL_1_3:
+        {
+            kw << "texture(" << samplerName << ", " << coords << ")";
+            break;
+        }
         case GPU_LANGUAGE_GLSL_ES_1_0:
         {
             if (N == 1) {

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,15 @@ std::string getTexSample(GpuLanguage lang,`
`143`	`143`	`switch (lang)`
`144`	`144`	`{`
`145`	`145`	`case GPU_LANGUAGE_GLSL_1_2:`
`146`		`- case GPU_LANGUAGE_GLSL_1_3:`
`147`	`146`	`{`
`148`	`147`	`kw << "texture" << N << "D(" << samplerName << ", " << coords << ")";`
`149`	`148`	`break;`
`150`	`149`	`}`
	`150`	`+ case GPU_LANGUAGE_GLSL_1_3:`
	`151`	`+ {`
	`152`	`+ kw << "texture(" << samplerName << ", " << coords << ")";`
	`153`	`+ break;`
	`154`	`+ }`
`151`	`155`	`case GPU_LANGUAGE_GLSL_ES_1_0:`
`152`	`156`	`{`
`153`	`157`	`if (N == 1) {`