Merge pull request #44 from Crisspl/spirv-optimizer

Ex22 and other minor fixes

Author: devshgraphicsprogramming

source/Nabla/COpenGLDriver.h

@@ -453,7 +453,7 @@ class COpenGLDriver final : public CNullDriver, public COpenGLExtensionHandler
 				default:
 				{
 					GLint res = GL_FALSE;
-					extGlGetInternalformativ(GL_TEXTURE_2D, getSizedOpenGLFormatFromOurFormat(_fmt), GL_COLOR_RENDERABLE, sizeof(res), &res);
+					extGlGetInternalformativ(GL_TEXTURE_2D, getSizedOpenGLFormatFromOurFormat(_fmt), GL_COLOR_RENDERABLE, 1, &res);
 					return res==GL_TRUE;
 				}
             }

src/nbl/ext/RadeonRays/RadeonRays.cpp

@@ -124,14 +124,11 @@ void Manager::makeInstance(	NblInstanceRRInstanceCache& instanceCache, MockScene
 				if (!gpumeshbuffer)
 					continue;
 				::RadeonRays::Shape* shape = cpuAssociation.second;
-				auto successAndLocation = gpuCache.emplace(gpumeshbuffer,shape);
-				if (gpumeshbuffer == mb)
-				{
-					found = successAndLocation.first;
-					break;
-				}
+				gpuCache.emplace(gpumeshbuffer,shape);
 			}
 			notRefreshedAlready = false;
+
+			found = gpuCache.find(mb);
 		}
 		if (found==gpuCache.end())
 			continue;