Release 6.2.1

* GLES3.ModelInstancing and Vulkan.ModelInstancing: Added arguments to control the instance count.
* Improved EGLConfig selection and improved logging.
* Ensured that OpenGL ES samples clear the alpha channel correctly.

DemoApps/GLES2/Bloom/source/Bloom.cpp

@@ -376,7 +376,7 @@ namespace Fsl
     }
     else
     {
-      glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 

DemoApps/GLES2/Bloom/source/RenderScene.cpp

@@ -219,8 +219,8 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 
-    // glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
-    glClearColor(0, 0, 0, 0);
+    // glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_program.Get());

DemoApps/GLES2/Bloom/source/WhiteRectScene.cpp

@@ -91,7 +91,7 @@ namespace Fsl
 
   void WhiteRectScene::Draw()
   {
-    glClearColor(0, 0, 0, 0);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 

DemoApps/GLES2/DeBayer/source/DeBayer.cpp

@@ -284,7 +284,7 @@ namespace Fsl
     pthread_mutex_lock(&gstThreadMutex);
     pthread_cond_wait(&gstCON, &gstThreadMutex);
     {
-      glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT);
 
       void* logical = (void*)vYaddr;

DemoApps/GLES2/DirectMultiSamplingVideoYUV/source/DirectMultiSamplingVideoYUV.cpp

@@ -297,7 +297,7 @@ namespace Fsl
     pthread_mutex_lock(&gstThreadMutex);
     pthread_cond_wait(&gstCON, &gstThreadMutex);
     {
-      glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT);
 
       void* logical = (void*)vYaddr;

DemoApps/GLES2/ModelLoaderBasics/source/ModelLoaderBasics.cpp

@@ -169,7 +169,7 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_resources.Program.Get());

DemoApps/GLES2/ModelViewer/source/ModelViewer.cpp

@@ -328,7 +328,7 @@ namespace Fsl
       glDisable(GL_CULL_FACE);
     }
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_resources.Program.Get());

DemoApps/GLES2/OpenCV101/source/OpenCV101.cpp

@@ -116,7 +116,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   }
 }

DemoApps/GLES2/System/DFGraphicsBasic2D/source/DFGraphicsBasic2D.cpp

@@ -65,7 +65,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     m_shared.Draw();

DemoApps/GLES2/System/InputEvents/source/InputEvents.cpp

@@ -98,7 +98,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     m_logger.Draw(GetWindowSizePx());

DemoApps/GLES2/UI/SimpleUI100/source/SimpleUI100.cpp

@@ -134,7 +134,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     // Calling this last allows the UI to draw on top of everything.

DemoApps/GLES3/Bloom/source/Bloom.cpp

@@ -382,7 +382,7 @@ namespace Fsl
     }
     else
     {
-      glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 

DemoApps/GLES3/Bloom/source/RenderScene.cpp

@@ -219,8 +219,8 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 
-    // glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
-    glClearColor(0, 0, 0, 0);
+    // glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_program.Get());

DemoApps/GLES3/Bloom/source/WhiteRectScene.cpp

@@ -91,7 +91,7 @@ namespace Fsl
 
   void WhiteRectScene::Draw()
   {
-    glClearColor(0, 0, 0, 0);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 

DemoApps/GLES3/D1_1_VBOs/source/D1_1_VBOs.cpp

@@ -26,7 +26,7 @@ namespace Fsl
     GL_CHECK(glUseProgram(hProgram));
 
     GL_CHECK(glEnable(GL_DEPTH_TEST));
-    glClearColor(1.0f, 1.0f, 1.0f, 0.0f);
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
 
     {    // Initialization
       // 3 vertices, with (x,y,z), (r, g, b, a) per-vertex

DemoApps/GLES3/D1_2_VAOs/source/D1_2_VAOs.cpp

@@ -24,7 +24,7 @@ namespace Fsl
     GL_CHECK(glUseProgram(hProgram));
 
     GL_CHECK(glEnable(GL_DEPTH_TEST));
-    glClearColor(1.0f, 1.0f, 1.0f, 0.0f);
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
 
     {    // Initialization
       // 3 vertices, with (x,y,z), (r, g, b, a) per-vertex

DemoApps/GLES3/DirectMultiSamplingVideoYUV/source/DirectMultiSamplingVideoYUV.cpp

@@ -296,7 +296,7 @@ namespace Fsl
     pthread_mutex_lock(&gstThreadMutex);
     pthread_cond_wait(&gstCON, &gstThreadMutex);
     {
-      glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT);
 
       void* logical = (void*)vYaddr;

DemoApps/GLES3/E1_1_VBOs/source/E1_1_VBOs.cpp

@@ -35,7 +35,7 @@ namespace Fsl
     GL_CHECK(glUseProgram(hProgram));
 
     GL_CHECK(glEnable(GL_DEPTH_TEST));
-    glClearColor(1.0f, 1.0f, 1.0f, 0.0f);
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
 
 
     // vboIds[0] - used to store vertex attribute data

DemoApps/GLES3/E1_2_VAOs/source/E1_2_VAOs.cpp

@@ -38,7 +38,7 @@ namespace Fsl
     GL_CHECK(glUseProgram(hProgram));
 
     GL_CHECK(glEnable(GL_DEPTH_TEST));
-    GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 0.0f));
+    GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 1.0f));
 
     // vboIds[0] - used to store vertex attribute data
     // vboIds[l] - used to store element indices

DemoApps/GLES3/E2_1_CopyBuffer/source/E2_1_CopyBuffer.cpp

@@ -37,7 +37,7 @@ namespace Fsl
     GL_CHECK(glUseProgram(hProgram));
 
     GL_CHECK(glEnable(GL_DEPTH_TEST));
-    glClearColor(1.0f, 1.0f, 1.0f, 0.0f);
+    glClearColor(1.0f, 1.0f, 1.0f, 1.0f);
   }
 
 

DemoApps/GLES3/E3_0_InstancingSimple/source/E3_0_InstancingSimple.cpp

@@ -159,7 +159,7 @@ namespace Fsl
     GL_CHECK(glUseProgram(hProgram));
 
     GL_CHECK(glEnable(GL_DEPTH_TEST));
-    GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 0.0f));
+    GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 1.0f));
 
     std::vector<GLfloat> positions;
     std::vector<GLuint> indices;

DemoApps/GLES3/E4_0_PRestart/source/E4_0_PRestart.cpp

@@ -102,7 +102,7 @@ namespace Fsl
       GL_CHECK(glBindVertexArray(0));
 
       GL_CHECK(glEnable(GL_DEPTH_TEST));
-      GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 0.0f));
+      GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 1.0f));
     }
     catch (const std::exception&)
     {

DemoApps/GLES3/E6_0_MultipleRenderTargets/source/E6_0_MultipleRenderTargets.cpp

@@ -31,7 +31,7 @@ namespace Fsl
       InitFBO();
 
       GL_CHECK(glEnable(GL_DEPTH_TEST));
-      GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 0.0f));
+      GL_CHECK(glClearColor(1.0f, 1.0f, 1.0f, 1.0f));
     }
     catch (const std::exception&)
     {

DemoApps/GLES3/ModelInstancing/README.md

@@ -26,6 +26,9 @@ Command line arguments':
 
 Argument                        |Description                                                                                                                                                         |Source
 --------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------
+-x, --MaxInstancesX \<arg>      |Select the maximum number of instances to render. WARNING a too large number can crash the app on some drivers                                                      |Demo
+-y, --MaxInstancesY \<arg>      |Select the maximum number of instances to render. WARNING a too large number can crash the app on some drivers                                                      |Demo
+-z, --MaxInstancesZ \<arg>      |Select the maximum number of instances to render. WARNING a too large number can crash the app on some drivers                                                      |Demo
 --ActualDpi \<arg>              |ActualDpi [x,y] Override the actual dpi reported by the native window                                                                                               |DemoHost
 --DensityDpi \<arg>             |DensityDpi \<number> Override the density dpi reported by the native window                                                                                         |DemoHost
 --DisplayId \<arg>              |DisplayId \<number>                                                                                                                                                 |DemoHost

DemoApps/GLES3/ModelInstancing/source/ModelInstancing.cpp

@@ -118,7 +118,7 @@ namespace Fsl
         indexCount += mesh->GetIndexCount();
       }
       FSLLOG3_INFO("Total vertex count: {}, Total index count: {}", vertexCount, indexCount);
-      m_resources.InstanceBuffer.Reset(GL_ARRAY_BUFFER, MeshInstancingConfig::ModelMaxInstances, sizeof(MeshInstanceData), GL_DYNAMIC_DRAW);
+      m_resources.InstanceBuffer.Reset(GL_ARRAY_BUFFER, m_shared.GetInstanceSetup().MaxInstances, sizeof(MeshInstanceData), GL_DYNAMIC_DRAW);
     }
 
 
@@ -190,7 +190,7 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_resources.Program.Get());

DemoApps/GLES3/ModelInstancing/source/ModelInstancing_Register.cpp

@@ -30,6 +30,7 @@
  ****************************************************************************************************************************************************/
 
 #include <FslDemoApp/OpenGLES3/Setup/RegisterDemoApp.hpp>
+#include <Shared/ModelInstancing/OptionParser.hpp>
 #include <EGL/egl.h>
 #include <array>
 #include "ModelInstancing.hpp"
@@ -47,6 +48,6 @@ namespace Fsl
   {
     DemoAppHostConfigEGL config(g_eglConfigAttribs.data());
 
-    DemoAppRegister::GLES3::Register<ModelInstancing>(rSetup, "GLES3.ModelInstancing", config);
+    DemoAppRegister::GLES3::Register<ModelInstancing, OptionParser>(rSetup, "GLES3.ModelInstancing", config);
   }
 }

DemoApps/GLES3/ModelLoaderBasics/source/ModelLoaderBasics.cpp

@@ -171,7 +171,7 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_resources.Program.Get());

DemoApps/GLES3/ModelViewer/source/ModelViewer.cpp

@@ -327,7 +327,7 @@ namespace Fsl
       glDisable(GL_CULL_FACE);
     }
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_resources.Program.Get());

DemoApps/GLES3/ObjectSelection/source/ObjectSelection.cpp

@@ -217,7 +217,7 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 

DemoApps/GLES3/OpenCV101/source/OpenCV101.cpp

@@ -116,7 +116,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
   }
 }

DemoApps/GLES3/OpenVX101/source/OpenVX101.cpp

@@ -201,7 +201,7 @@ namespace Fsl
 
     auto resPx = GetWindowSizePx();
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     const PxSize1D halfWidth = resPx.Width() / PxSize1D::Create(2);

DemoApps/GLES3/ParticleSystem/source/ParticleSystem.cpp

@@ -141,7 +141,7 @@ namespace Fsl
 
     if (!m_scene)
     {
-      glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+      glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
     else

DemoApps/GLES3/ParticleSystem/source/ParticleSystemBasicScene.cpp

@@ -282,7 +282,7 @@ namespace Fsl
     glEnable(GL_CULL_FACE);
     // glDisable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 

DemoApps/GLES3/ParticleSystem/source/ParticleSystemScene.cpp

@@ -404,7 +404,7 @@ namespace Fsl
     glEnable(GL_CULL_FACE);
     // glDisable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
 

DemoApps/GLES3/SpringBackground/source/Bloom/BloomRender.cpp

@@ -219,7 +219,7 @@ namespace Fsl
     }
     else
     {
-      glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+      glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     }
 

DemoApps/GLES3/SpringBackground/source/GridScene.cpp

@@ -151,7 +151,7 @@ namespace Fsl
 
   void GridScene::Draw()
   {
-    glClearColor(0, 0, 0, 0);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     assert(m_activeRenderQueueIndex >= 0 && m_activeRenderQueueIndex <= static_cast<int32_t>(m_renderDeque.size()));

DemoApps/GLES3/System/DFGraphicsBasic2D/source/DFGraphicsBasic2D.cpp

@@ -65,7 +65,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     m_shared.Draw();

DemoApps/GLES3/Tessellation101/source/Tessellation101.cpp

@@ -187,7 +187,7 @@ namespace Fsl
     glDisable(GL_DEPTH_TEST);
     glDisable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT);
 
     // Do the actual tessellated draw

DemoApps/GLES3/TessellationSample/source/AScene.cpp

@@ -186,7 +186,7 @@ namespace Fsl
       glDisable(GL_CULL_FACE);
     }
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     // Do the actual tessellated draw
@@ -254,7 +254,7 @@ namespace Fsl
     glEnable(GL_DEPTH_TEST);
     glDisable(GL_CULL_FACE);
 
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
     {
       glUseProgram(m_basicShader.Program.Get());

DemoApps/GLES3/UI/SimpleUI100/source/SimpleUI100.cpp

@@ -133,7 +133,7 @@ namespace Fsl
   void SimpleUI100::Draw(const FrameInfo& frameInfo)
   {
     FSL_PARAM_NOT_USED(frameInfo);
-    glClearColor(0.5f, 0.5f, 0.5f, 0.5f);
+    glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     // Calling this last allows the UI to draw on top of everything.

DemoApps/GLES3/VerletIntegration101/source/VerletIntegration101.cpp

@@ -123,7 +123,7 @@ namespace Fsl
   {
     FSL_PARAM_NOT_USED(frameInfo);
 
-    glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.0f, 0.0f, 0.0f, 1.0f);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     m_batch->Begin();