From: kgv <kgv@opencascade.com>
Date: Fri, 29 Mar 2019 17:46:39 +0000 (+0300)
Subject: 0030622: Visualization, TKOpenGl - Path Tracing fails on macOS
X-Git-Tag: V7_4_0_beta~188
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=2a0522b1c6eec306edc058054c9e7ddd2429eed4;p=occt-copy.git

0030622: Visualization, TKOpenGl - Path Tracing fails on macOS

Fixed usage of non-existing function texture2D().
---

diff --git a/src/Shaders/RaytraceRender.fs b/src/Shaders/RaytraceRender.fs
index 83bbb7ec62..d5d5e1648a 100644
--- a/src/Shaders/RaytraceRender.fs
+++ b/src/Shaders/RaytraceRender.fs
@@ -127,7 +127,7 @@ void main (void)
   }
   else
   {
-    OutColor = mix (texture2D (uAccumTexture, vPixel), aColor, 1.f / (uAccumSamples + 1));
+    OutColor = mix (texture (uAccumTexture, vPixel), aColor, 1.f / (uAccumSamples + 1));
   }
 
 #endif // ADAPTIVE_SAMPLING
diff --git a/src/Shaders/Shaders_RaytraceRender_fs.pxx b/src/Shaders/Shaders_RaytraceRender_fs.pxx
index 1d2f6dba24..9f1fa322b6 100644
--- a/src/Shaders/Shaders_RaytraceRender_fs.pxx
+++ b/src/Shaders/Shaders_RaytraceRender_fs.pxx
@@ -130,7 +130,7 @@ static const char Shaders_RaytraceRender_fs[] =
   "  }\n"
   "  else\n"
   "  {\n"
-  "    OutColor = mix (texture2D (uAccumTexture, vPixel), aColor, 1.f / (uAccumSamples + 1));\n"
+  "    OutColor = mix (texture (uAccumTexture, vPixel), aColor, 1.f / (uAccumSamples + 1));\n"
   "  }\n"
   "\n"
   "#endif // ADAPTIVE_SAMPLING\n"