6.2.3

ReneThrane · ReneThrane · commit f4db193b6aa6 · 2024-01-15T00:31:17.000+01:00
- Marked samples that use the GL_VIV_direct_texture extension but was not marked as such.
- SmoothScroll should now scroll on displays that are too small to show the entire text being shown
- Fix out-of-bound R/W in gaussian_filter.cl
- FslUtil.OpenCL.ContextEx added new constructor and reset method.
diff --git a/DemoApps/GLES2/DeBayer/Fsl.gen b/DemoApps/GLES2/DeBayer/Fsl.gen
@@ -2,6 +2,9 @@
 <FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
   <Executable Name="GLES2.DeBayer" NoInclude="true" CreationYear="2015">
     <Default.Platform.Supported Value="false"/>
+    <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+    <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+    <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     <ImportTemplate Name="DemoAppGLES2"/>
     <Dependency Name="Gst"/>
   </Executable>
diff --git a/DemoApps/GLES2/DirectMultiSamplingVideoYUV/Fsl.gen b/DemoApps/GLES2/DirectMultiSamplingVideoYUV/Fsl.gen
@@ -2,6 +2,9 @@
 <FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
   <Executable Name="GLES2.DirectMultiSamplingVideoYUV" NoInclude="true" CreationYear="2014">
     <Default.Platform.Supported Value="false"/>
+    <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+    <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+    <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     <ImportTemplate Name="DemoAppGLES2"/>
     <Dependency Name="Gst"/>
   </Executable>
diff --git a/DemoApps/GLES2/S09_VIV_direct_texture/Fsl.gen b/DemoApps/GLES2/S09_VIV_direct_texture/Fsl.gen
@@ -3,6 +3,8 @@
   <Executable Name="GLES2.S09_VIV_direct_texture" NoInclude="true" CreationYear="2014">
     <Default.Platform.Supported Value="false"/>
     <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+    <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+    <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     <ImportTemplate Name="DemoAppGLES2"/>
     <Platform Name="Yocto" Supported="true"/>
   </Executable>
diff --git a/DemoApps/GLES2/VIVDirectTextureMultiSampling/Fsl.gen b/DemoApps/GLES2/VIVDirectTextureMultiSampling/Fsl.gen
@@ -2,6 +2,9 @@
 <FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
   <Executable Name="GLES2.VIVDirectTextureMultiSampling" NoInclude="true" CreationYear="2016">
     <Default.Platform.Supported Value="false"/>
+    <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+    <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+    <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     <ImportTemplate Name="DemoAppGLES2"/>
     <Platform Name="Yocto" Supported="true"/>
   </Executable>
diff --git a/DemoApps/GLES3/DirectMultiSamplingVideoYUV/Fsl.gen b/DemoApps/GLES3/DirectMultiSamplingVideoYUV/Fsl.gen
@@ -2,7 +2,9 @@
 <FslBuildGen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../FslBuildGen.xsd">
   <Executable Name="GLES3.DirectMultiSamplingVideoYUV" NoInclude="true" CreationYear="2014">
     <Default.Platform.Supported Value="false"/>
-
+    <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+    <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+    <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     <ImportTemplate Name="DemoAppGLES3"/>
     <Dependency Name="Gst"/>
   </Executable>
diff --git a/DemoApps/GLES3/OpenCLGaussianFilter/Content/gaussian_filter.cl b/DemoApps/GLES3/OpenCLGaussianFilter/Content/gaussian_filter.cl
@@ -36,12 +36,26 @@ __kernel void gaussian_filter	( 	__global uchar *input,
 						{1.0/16.0, 2.0/16.0, 1.0/16.0} 
 					};
 
-	if ((x < 0) || (y < 0) || (x > (width -1)) || (y > (height -1)))
+	if ((id - width -1) < 0 || (id + width + 1) >= (width * height - 1))
 	{
 		output[id] = input[id];
 		return;
 	}
 
+	if (channels == 3)
+	{
+		if ((id1 - width -1) < 0 || (id1 + width + 1) >= (width * height - 1))
+		{
+			output[id] = input[id];
+			return;
+		}
+		if ((id2 - width -1) < 0 || (id2 + width + 1) >= (width * height - 1))
+		{
+			output[id] = input[id];
+			return;
+		}
+	}
+
 	if (channels == 1)
 	{
 	  sum = input[id - width - 1] * kernel_weights[0][0];
diff --git a/DemoApps/GLES3/RenderToTexture/Fsl.gen b/DemoApps/GLES3/RenderToTexture/Fsl.gen
@@ -8,6 +8,8 @@
     <Platform Name="Yocto" Supported="true">
       <Dependency Name="G2D"/>
       <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+      <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+      <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     </Platform>    
   </Executable>
 </FslBuildGen>
diff --git a/DemoApps/GLES3/S09_VIV_direct_texture/Fsl.gen b/DemoApps/GLES3/S09_VIV_direct_texture/Fsl.gen
@@ -3,6 +3,8 @@
   <Executable Name="GLES3.S09_VIV_direct_texture" NoInclude="true" CreationYear="2014">
     <Default.Platform.Supported Value="false"/>
     <Requirement Name="GL_VIV_direct_texture" Type="extension" Extends="OpenGLES"/>
+    <!-- While this demo technically only require the GL_VIV_direct_texture extension, its likely to only exist on Vivante GPU's -->
+    <Requirement Name="HW_GPU_VIVANTE" Type="feature"/>
     <ImportTemplate Name="DemoAppGLES3"/>
     <Platform Name="Yocto" Supported="true"/>
   </Executable>
diff --git a/DemoApps/Shared/UI/SmoothScroll/source/Shared/UI/SmoothScroll/Shared.cpp b/DemoApps/Shared/UI/SmoothScroll/source/Shared/UI/SmoothScroll/Shared.cpp
@@ -239,27 +239,34 @@ namespace Fsl
     Vector2 position3(std::round(m_position1) + static_cast<float>(rectMiddleBottomPx.RawLeft()), static_cast<float>(rectMiddleBottomPx.RawTop()));
 
     const int32_t linesHeightPx = bitmapFont.LineSpacingPx().RawValue() * 4;
-    const int32_t linewidth = bitmapFont.MeasureString(LocalConfig::TextLine0).RawWidth();
+    const int32_t lineWidth = bitmapFont.MeasureString(LocalConfig::TextLine0).RawWidth();
 
-    if (m_position0 < static_cast<float>(rectTopLeftPx.RawTop()))
+    const auto partialLineHeight = static_cast<int32_t>(std::round(static_cast<float>(linesHeightPx) * 0.90f));
+    const auto scrollLimitTop = static_cast<float>(rectTopLeftPx.RawTop() - partialLineHeight);
+    const auto scrollLimitBottom = static_cast<float>(rectTopLeftPx.RawBottom() - (linesHeightPx - partialLineHeight));
+
+    if (m_position0 < scrollLimitTop)
     {
-      m_position0 = static_cast<float>(rectTopLeftPx.RawTop());
+      m_position0 = scrollLimitTop;
       m_direction0 = 1;
     }
-    if (m_position0 > static_cast<float>(rectTopLeftPx.RawBottom() - linesHeightPx))
+    if (m_position0 > scrollLimitBottom)
     {
-      m_position0 = static_cast<float>(rectTopLeftPx.RawBottom() - linesHeightPx);
+      m_position0 = scrollLimitBottom;
       m_direction0 = -1;
     }
 
-    if (m_position1 < static_cast<float>(rectMiddleBottomPx.RawLeft()))
+    const auto partialLineWidth = static_cast<int32_t>(std::round(static_cast<float>(lineWidth) * 0.90f));
+    const auto scrollLimitLeft = static_cast<float>(rectMiddleBottomPx.RawLeft() - partialLineWidth);
+    const auto scrollLimitRight = static_cast<float>(rectMiddleBottomPx.RawRight() - (lineWidth - partialLineWidth));
+    if (m_position1 < scrollLimitLeft)
     {
-      m_position1 = static_cast<float>(rectMiddleBottomPx.RawLeft());
+      m_position1 = scrollLimitLeft;
       m_direction1 = 1;
     }
-    if (m_position1 > static_cast<float>(rectMiddleBottomPx.RawRight() - linewidth))
+    if (m_position1 > scrollLimitRight)
     {
-      m_position1 = static_cast<float>(rectMiddleBottomPx.RawRight() - linewidth);
+      m_position1 = scrollLimitRight;
       m_direction1 = -1;
     }
 
diff --git a/DemoFramework/FslUtil/OpenCL1_2/include/FslUtil/OpenCL1_2/ContextEx.hpp b/DemoFramework/FslUtil/OpenCL1_2/include/FslUtil/OpenCL1_2/ContextEx.hpp
@@ -33,6 +33,7 @@
 
 // Make sure Common.hpp is the first include file (to make the error message as helpful as possible when disabled)
 #include <FslBase/Attributes.hpp>
+#include <FslBase/Span/ReadOnlySpan.hpp>
 #include <FslUtil/OpenCL1_2/Common.hpp>
 #include <RapidOpenCL1/Context.hpp>
 #include <CL/cl.h>
@@ -71,6 +72,16 @@ namespace Fsl::OpenCL
     // NOLINTNEXTLINE(misc-misplaced-const)
     explicit ContextEx(const cl_device_type deviceType, cl_device_id* pDeviceId = nullptr, const bool allowFallback = true);
 
+    //! @brief Create the requested resource
+    //! @param contextPropertiesSpan the context properties to use (supply a empty one to use the default).
+    //!        If this span is not empty and contains a CL_CONTEXT_PLATFORM entry that is 0, then the entry will be patched with the right platformId.
+    //!        If this span is not empty and does not contain a CL_CONTEXT_PLATFORM then a CL_CONTEXT_PLATFORM entry will be added.
+    //! @param pDeviceId the chosen device id (if nullptr this is ignored, else it will be assigned the chosen deviceId)
+    //! @param allowFallback if the specified device type can't be found allow using a fallback of CL_DEVICE_TYPE_ALL
+    // NOLINTNEXTLINE(misc-misplaced-const)
+    explicit ContextEx(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, const cl_device_type deviceType,
+                       cl_device_id* pDeviceId = nullptr, const bool allowFallback = true);
+
     //! @brief returns the managed handle and releases the ownership.
     [[nodiscard]] cl_context Release()
     {
@@ -99,6 +110,16 @@ namespace Fsl::OpenCL
     // NOLINTNEXTLINE(misc-misplaced-const)
     void Reset(const cl_device_type deviceType, cl_device_id* pDeviceId = nullptr, const bool allowFallback = true);
 
+    //! @brief Destroys any owned resources and then creates the requested one
+    //! @param contextPropertiesSpan the context properties to use (supply a empty one to use the default).
+    //!        If this span is not empty and contains a CL_CONTEXT_PLATFORM entry that is 0, then the entry will be patched with the right platformId.
+    //!        If this span is not empty and does not contain a CL_CONTEXT_PLATFORM then a CL_CONTEXT_PLATFORM entry will be added.
+    //! @param pDeviceId the chosen device id (if nullptr this is ignored, else it will be assigned the chosen deviceId)
+    //! @param allowFallback if the specified device type can't be found allow using a fallback of CL_DEVICE_TYPE_ALL
+    // NOLINTNEXTLINE(misc-misplaced-const)
+    void Reset(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, const cl_device_type deviceType, cl_device_id* pDeviceId = nullptr,
+               const bool allowFallback = true);
+
     //! @brief Get the associated resource handle
     cl_platform_id GetPlatformId() const
     {
@@ -118,7 +139,9 @@ namespace Fsl::OpenCL
     }
 
   private:
-    void SelectDevice(cl_platform_id platformId, const std::vector<cl_device_id>& deviceIds, cl_device_id* pDeviceId);
+    void SelectDevice(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, cl_platform_id platformId,
+                      const std::vector<cl_device_id>& deviceIds, cl_device_id* pDeviceId);
+    std::vector<cl_context_properties> PatchProperties(cl_platform_id platformId, const ReadOnlySpan<cl_context_properties> contextPropertiesSpan);
   };
 }
 
diff --git a/DemoFramework/FslUtil/OpenCL1_2/source/FslUtil/OpenCL1_2/ContextEx.cpp b/DemoFramework/FslUtil/OpenCL1_2/source/FslUtil/OpenCL1_2/ContextEx.cpp
@@ -31,6 +31,8 @@
 
 #include <FslBase/Exceptions.hpp>
 #include <FslBase/Log/Log3Fmt.hpp>
+#include <FslBase/NumericCast.hpp>
+#include <FslBase/Span/ReadOnlySpanUtil.hpp>
 #include <FslUtil/OpenCL1_2/ContextEx.hpp>
 #include <FslUtil/OpenCL1_2/OpenCLHelper.hpp>
 #include <RapidOpenCL1/Check.hpp>
@@ -41,6 +43,32 @@
 
 namespace Fsl::OpenCL
 {
+  namespace
+  {
+    bool IsValidContextProperties(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan)
+    {
+      return contextPropertiesSpan.empty() || (contextPropertiesSpan.size() > 1u && (contextPropertiesSpan.size() & 1u) == 1u &&
+                                               contextPropertiesSpan[contextPropertiesSpan.size() - 1u] == 0);
+    }
+
+    int32_t IndexOfProperty(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, const cl_context_properties propertyToFind)
+    {
+      if (contextPropertiesSpan.empty())
+      {
+        return -1;
+      }
+
+      for (std::size_t i = 0; i < contextPropertiesSpan.size(); i += 2)
+      {
+        if (contextPropertiesSpan[i] == propertyToFind)
+        {
+          return NumericCast<int32_t>(i);
+        }
+      }
+      return -1;
+    }
+  }
+
   // move assignment operator
   ContextEx& ContextEx::operator=(ContextEx&& other) noexcept
   {
@@ -94,15 +122,33 @@ namespace Fsl::OpenCL
   }
 
 
+  // NOLINTNEXTLINE(misc-misplaced-const)
+  ContextEx::ContextEx(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, const cl_device_type deviceType, cl_device_id* pDeviceId,
+                       const bool allowFallback)
+    : ContextEx()
+  {
+    Reset(contextPropertiesSpan, deviceType, pDeviceId, allowFallback);
+  }
+
+
   ContextEx::~ContextEx()
   {
     Reset();
   }
 
+  void ContextEx::Reset(const cl_device_type deviceType, cl_device_id* pDeviceId, const bool allowFallback)
+  {
+    Reset({}, deviceType, pDeviceId, allowFallback);
+  }
 
   // NOLINTNEXTLINE(misc-misplaced-const)
-  void ContextEx::Reset(const cl_device_type deviceType, cl_device_id* pDeviceId, const bool allowFallback)
+  void ContextEx::Reset(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, const cl_device_type deviceType, cl_device_id* pDeviceId,
+                        const bool allowFallback)
   {
+    if (!IsValidContextProperties(contextPropertiesSpan))
+    {
+      throw std::invalid_argument("invalid contextPropertiesSpan");
+    }
     if (IsValid())
     {
       Reset();
@@ -119,7 +165,7 @@ namespace Fsl::OpenCL
       const auto deviceIds = OpenCLHelper::GetDeviceIDs(*itr, deviceType);
       if (!deviceIds.empty())
       {
-        SelectDevice(*itr, deviceIds, pDeviceId);
+        SelectDevice(contextPropertiesSpan, *itr, deviceIds, pDeviceId);
         return;
       }
     }
@@ -132,7 +178,7 @@ namespace Fsl::OpenCL
         const auto deviceIds = OpenCLHelper::GetDeviceIDs(*itr, CL_DEVICE_TYPE_ALL);
         if (!deviceIds.empty())
         {
-          SelectDevice(*itr, deviceIds, pDeviceId);
+          SelectDevice(contextPropertiesSpan, *itr, deviceIds, pDeviceId);
           return;
         }
       }
@@ -142,19 +188,61 @@ namespace Fsl::OpenCL
   }
 
   // NOLINTNEXTLINE(misc-misplaced-const)
-  void ContextEx::SelectDevice(cl_platform_id platformId, const std::vector<cl_device_id>& deviceIds, cl_device_id* pDeviceId)
+  void ContextEx::SelectDevice(const ReadOnlySpan<cl_context_properties> contextPropertiesSpan, cl_platform_id platformId,
+                               const std::vector<cl_device_id>& deviceIds, cl_device_id* pDeviceId)
   {
     // FIX: for now just select the first device
     const cl_uint targetDevice = 0;
     // FIX: for now just use one device
     const cl_uint uiNumDevsUsed = 1;
 
+    const cl_device_id selectedDeviceId = deviceIds[targetDevice];
+
     // clCreateContext
-    m_context.Reset(nullptr, uiNumDevsUsed, &deviceIds[targetDevice], nullptr, nullptr);
+    if (contextPropertiesSpan.empty())
+    {
+      m_context.Reset(nullptr, uiNumDevsUsed, &selectedDeviceId, nullptr, nullptr);
+    }
+    else
+    {
+      std::vector<cl_context_properties> patchesProperties = PatchProperties(platformId, contextPropertiesSpan);
+      assert(!patchesProperties.empty() && IsValidContextProperties(ReadOnlySpanUtil::AsSpan(patchesProperties)));
+      m_context.Reset(patchesProperties.data(), uiNumDevsUsed, &selectedDeviceId, nullptr, nullptr);
+    }
+
     m_platformId = platformId;
     if (pDeviceId != nullptr)
     {
-      *pDeviceId = deviceIds[targetDevice];
+      *pDeviceId = selectedDeviceId;
+    }
+  }
+
+  std::vector<cl_context_properties> ContextEx::PatchProperties(cl_platform_id platformId,
+                                                                const ReadOnlySpan<cl_context_properties> contextPropertiesSpan)
+  {
+    assert(!contextPropertiesSpan.empty());
+    assert(IsValidContextProperties(contextPropertiesSpan));
+
+    std::vector<cl_context_properties> result(ReadOnlySpanUtil::ToVector(contextPropertiesSpan));
+    int32_t indexOfProperty = IndexOfProperty(contextPropertiesSpan, CL_CONTEXT_PLATFORM);
+    if (indexOfProperty >= 0)
+    {
+      assert(UncheckedNumericCast<std::size_t>(indexOfProperty) < result.size());
+      assert(result[indexOfProperty] == CL_CONTEXT_PLATFORM);
+      assert(UncheckedNumericCast<std::size_t>(indexOfProperty + 1) < result.size());
+      if (result[indexOfProperty + 1] == 0)
+      {
+        FSLLOG3_VERBOSE3("The property CL_CONTEXT_PLATFORM was set to zero, patching it")
+        result[indexOfProperty + 1] = reinterpret_cast<cl_context_properties>(platformId);
+      }
+    }
+    else
+    {
+      FSLLOG3_VERBOSE3("The property CL_CONTEXT_PLATFORM was not found, inserting it");
+      result.push_back(CL_CONTEXT_PLATFORM);
+      result.push_back(reinterpret_cast<cl_context_properties>(platformId));
     }
+    assert(IsValidContextProperties(ReadOnlySpanUtil::AsSpan(result)));
+    return result;
   }
 }
diff --git a/Project.gen b/Project.gen
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <FslBuildGenProjectRoot Version="1">
-  <Project Name="DemoFramework" ShortName="DF" Version="6.2.2" DefaultTemplate="DF" DefaultPackageLanguage="C++" DefaultCompany="NXP" RequirePackageCreationYear="true" ToolConfigFile=".Config/FslBuildGen.xml">
+  <Project Name="DemoFramework" ShortName="DF" Version="6.2.3" DefaultTemplate="DF" DefaultPackageLanguage="C++" DefaultCompany="NXP" RequirePackageCreationYear="true" ToolConfigFile=".Config/FslBuildGen.xml">
     <!-- Add a base package that all other packages dependent on -->
     <AddBasePackage Name="Platform"/>
     <AddRootDirectory Name="$(FSL_GRAPHICS_SDK)"/>
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <!-- #AG_PROJECT_CAPTION_BEGIN# -->
-# DemoFramework 6.2.2
+# DemoFramework 6.2.3
 <!-- #AG_PROJECT_CAPTION_END# -->
 
 A multi-platform framework for fast and easy demo development.
diff --git a/SCR-gtec-demo-framework.txt b/SCR-gtec-demo-framework.txt
@@ -1,11 +1,11 @@
 Package:                      gtec-demo-framework.git
-Version:                      6.2.2
+Version:                      6.2.3
 Outgoing License:             BSD-3-Clause 
 License File:                 License.md
 Package Category:             Graphics
 Type of Content:              source
 Description and comments:     Graphics sample applications
-Release Location:             https://github.com/NXPmicro/gtec-demo-framework -b 6.2.2
+Release Location:             https://github.com/NXPmicro/gtec-demo-framework -b 6.2.3
 Origin:                       NXP (BSD-3-clause)
                               Demo Framework
                                 Sascha Willems - Vulkan demo (MIT) - https://github.com/SaschaWillems/Vulkan

Original file line number	Diff line number	Diff line change
`@@ -239,27 +239,34 @@ namespace Fsl`
`239`	`239`	`Vector2 position3(std::round(m_position1) + static_cast<float>(rectMiddleBottomPx.RawLeft()), static_cast<float>(rectMiddleBottomPx.RawTop()));`
`240`	`240`
`241`	`241`	`const int32_t linesHeightPx = bitmapFont.LineSpacingPx().RawValue() * 4;`
`242`		`- const int32_t linewidth = bitmapFont.MeasureString(LocalConfig::TextLine0).RawWidth();`
	`242`	`+ const int32_t lineWidth = bitmapFont.MeasureString(LocalConfig::TextLine0).RawWidth();`
`243`	`243`
`244`		`- if (m_position0 < static_cast<float>(rectTopLeftPx.RawTop()))`
	`244`	`+ const auto partialLineHeight = static_cast<int32_t>(std::round(static_cast<float>(linesHeightPx) * 0.90f));`
	`245`	`+ const auto scrollLimitTop = static_cast<float>(rectTopLeftPx.RawTop() - partialLineHeight);`
	`246`	`+ const auto scrollLimitBottom = static_cast<float>(rectTopLeftPx.RawBottom() - (linesHeightPx - partialLineHeight));`
	`247`	`+`
	`248`	`+ if (m_position0 < scrollLimitTop)`
`245`	`249`	`{`
`246`		`- m_position0 = static_cast<float>(rectTopLeftPx.RawTop());`
	`250`	`+ m_position0 = scrollLimitTop;`
`247`	`251`	`m_direction0 = 1;`
`248`	`252`	`}`
`249`		`- if (m_position0 > static_cast<float>(rectTopLeftPx.RawBottom() - linesHeightPx))`
	`253`	`+ if (m_position0 > scrollLimitBottom)`
`250`	`254`	`{`
`251`		`- m_position0 = static_cast<float>(rectTopLeftPx.RawBottom() - linesHeightPx);`
	`255`	`+ m_position0 = scrollLimitBottom;`
`252`	`256`	`m_direction0 = -1;`
`253`	`257`	`}`
`254`	`258`
`255`		`- if (m_position1 < static_cast<float>(rectMiddleBottomPx.RawLeft()))`
	`259`	`+ const auto partialLineWidth = static_cast<int32_t>(std::round(static_cast<float>(lineWidth) * 0.90f));`
	`260`	`+ const auto scrollLimitLeft = static_cast<float>(rectMiddleBottomPx.RawLeft() - partialLineWidth);`
	`261`	`+ const auto scrollLimitRight = static_cast<float>(rectMiddleBottomPx.RawRight() - (lineWidth - partialLineWidth));`
	`262`	`+ if (m_position1 < scrollLimitLeft)`
`256`	`263`	`{`
`257`		`- m_position1 = static_cast<float>(rectMiddleBottomPx.RawLeft());`
	`264`	`+ m_position1 = scrollLimitLeft;`
`258`	`265`	`m_direction1 = 1;`
`259`	`266`	`}`
`260`		`- if (m_position1 > static_cast<float>(rectMiddleBottomPx.RawRight() - linewidth))`
	`267`	`+ if (m_position1 > scrollLimitRight)`
`261`	`268`	`{`
`262`		`- m_position1 = static_cast<float>(rectMiddleBottomPx.RawRight() - linewidth);`
	`269`	`+ m_position1 = scrollLimitRight;`
`263`	`270`	`m_direction1 = -1;`
`264`	`271`	`}`
`265`	`272`