Upgrade SPV default target to 1.6

Also test examples 1-4 and update the example matrix

Author: devshgraphicsprogramming

examples_tests/Readme.md

@@ -33,8 +33,8 @@ N = No support
 |                                 | Win32 OpenGL | Win32 OpenGL ES* | Win32 Vulkan | X11** OpenGL | X11** OpenGL ES | X11** Vulkan | Android OpenGL ES | Android Vulkan | Required CMake Options****                        |
 |---------------------------------|--------------|------------------|--------------|--------------|-----------------|--------------|-------------------|----------------|---------------------------------------------------|
 | 01.HelloWorld                   | Y            | Y                | Y            | S            | S               | S            | Y                 | S              |                                                   |
-| 02.ComputeShader                | B            | B                | Y            | B            | B               | S            | B                 | S              |                                                   |
-| 03.GPU_Mesh                     | S            | S                | S            | S            | S               | S            | S                 | S              |                                                   |
+| 02.ComputeShader                | Y            | Y                | Y            | B            | B               | S            | B                 | S              |                                                   |
+| 03.GPU_Mesh                     | W            | W                | W            | W            | W               | W            | W                 | W              |                                                   |
 | 04.Keyframe                     | S            | S                | S            | S            | S               | S            | S                 | S              |                                                   |
 | 05.NablaTutorialExample         | Y            | Y                | Y            | S            | S               | S            | S                 | S              |                                                   |
 | 06.MeshLoaders                  | Y            | Y                | Y            | S            | S               | S            | Y                 | Y              |                                                   |

include/nbl/asset/utils/IGLSLCompiler.h

@@ -48,7 +48,7 @@ class IGLSLCompiler final : public core::IReferenceCounted
 			bool _genDebugInfo = true,
 			std::string* _outAssembly = nullptr,
 			system::logger_opt_ptr logger = nullptr,
-			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_5) const;
+			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_6) const;
 
 		/**
 		If _stage is ESS_UNKNOWN, then compiler will try to deduce shader stage from #pragma annotation, i.e.:
@@ -80,7 +80,7 @@ class IGLSLCompiler final : public core::IReferenceCounted
 			bool _genDebugInfo = true,
 			std::string* _outAssembly = nullptr,
 			system::logger_opt_ptr logger = nullptr,
-			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_5) const;
+			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_6) const;
 
 		core::smart_refctd_ptr<ICPUShader> createSPIRVFromGLSL(
 			system::IFile* _sourcefile,
@@ -91,7 +91,7 @@ class IGLSLCompiler final : public core::IReferenceCounted
 			bool _genDebugInfo = true,
 			std::string* _outAssembly = nullptr,
 			system::logger_opt_ptr logger = nullptr,
-			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_5) const;
+			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_6) const;
 
 		/**
 		Resolves ALL #include directives regardless of any other preprocessor directive.
@@ -113,15 +113,15 @@ class IGLSLCompiler final : public core::IReferenceCounted
 			const char* _originFilepath,
 			uint32_t _maxSelfInclusionCnt = 4u,
 			system::logger_opt_ptr logger = nullptr,
-			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_5) const;
+			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_6) const;
 
 		core::smart_refctd_ptr<ICPUShader> resolveIncludeDirectives(
 			system::IFile* _sourcefile,
 			IShader::E_SHADER_STAGE _stage,
 			const char* _originFilepath,
 			uint32_t _maxSelfInclusionCnt = 4u,
 			system::logger_opt_ptr logger = nullptr,
-			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_5) const;
+			const E_SPIRV_VERSION targetSpirvVersion = ESV_1_6) const;
 
 		/*
 			Creates a formatted copy of the original

src/nbl/video/CVulkanPhysicalDevice.h

@@ -106,7 +106,7 @@ class CVulkanPhysicalDevice final : public IPhysicalDevice
                 m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_5;
                 break;
             case 3:
-                m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_5; // TODO: change this to spirv 1.6
+                m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_6;
                 break;
             default:
                 _NBL_DEBUG_BREAK_IF("Invalid Vulkan minor version!");

src/nbl/video/IOpenGL_PhysicalDeviceBase.h

@@ -493,7 +493,7 @@ class IOpenGL_PhysicalDeviceBase : public IOpenGLPhysicalDeviceBase
 
 			m_limits.nonCoherentAtomSize = 256ull;
 
-			m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_5;
+			m_limits.spirvVersion = asset::IGLSLCompiler::ESV_1_6;
 
 			if (m_glfeatures.isFeatureAvailable(COpenGLFeatureMap::NBL_KHR_shader_subgroup))
 			{