Bugfix: Properly create depth-stencil cubemaps when using the OpenGL 4.1 feature-set

Source/BansheeCore/Managers/BsTextureManager.cpp

@@ -85,7 +85,7 @@ namespace bs
 	namespace ct
 	{
 	void TextureManager::onStartUp()
-    {
+	{
 		TEXTURE_DESC desc;
 		desc.type = TEX_TYPE_2D;
 		desc.width = 2;

Source/BansheeGLRenderAPI/BsGLRenderAPI.cpp

@@ -342,10 +342,12 @@ namespace bs { namespace ct
 				// Set stencil buffer options
 				setStencilCheckEnabled(stateProps.getStencilEnable());
 
-				setStencilBufferOperations(stateProps.getStencilFrontFailOp(), stateProps.getStencilFrontZFailOp(), stateProps.getStencilFrontPassOp(), true);
+				setStencilBufferOperations(stateProps.getStencilFrontFailOp(), stateProps.getStencilFrontZFailOp(), 
+					stateProps.getStencilFrontPassOp(), true);
 				setStencilBufferFunc(stateProps.getStencilFrontCompFunc(), stateProps.getStencilReadMask(), true);
 
-				setStencilBufferOperations(stateProps.getStencilBackFailOp(), stateProps.getStencilBackZFailOp(), stateProps.getStencilBackPassOp(), false);
+				setStencilBufferOperations(stateProps.getStencilBackFailOp(), stateProps.getStencilBackZFailOp(), 
+					stateProps.getStencilBackPassOp(), false);
 				setStencilBufferFunc(stateProps.getStencilBackCompFunc(), stateProps.getStencilReadMask(), false);
 
 				setStencilBufferWriteMask(stateProps.getStencilWriteMask());
@@ -2433,17 +2435,7 @@ namespace bs { namespace ct
 
 		GLRTTManager::startUp<GLRTTManager>();
 
-		UINT32 curTexUnitOffset = 0;
-		for (UINT32 i = 0; i < 6; i++)
-			curTexUnitOffset += caps->getNumTextureUnits((GpuProgramType)i);
-
-		UINT32 totalNumTexUnits = curTexUnitOffset;
-		UINT16 numCombinedTexUnits = caps->getNumCombinedTextureUnits();
-
-		if (totalNumTexUnits > numCombinedTexUnits)
-			BS_EXCEPT(InternalErrorException, "Number of combined texture units less than the number of individual units!?");
-
-		mNumTextureUnits = numCombinedTexUnits;
+		mNumTextureUnits = caps->getNumCombinedTextureUnits();
 		mTextureInfos = bs_newN<TextureInfo>(mNumTextureUnits);
 		for (UINT16 i = 0; i < mNumTextureUnits; i++)
 			mTextureInfos[i].type = GL_TEXTURE_2D;
@@ -2454,21 +2446,17 @@ namespace bs { namespace ct
 
 	void GLRenderAPI::switchContext(const SPtr<GLContext>& context, const RenderWindow& window)
 	{
-		// Unbind GPU programs and rebind to new context later, because
-		// scene manager treat render system as ONE 'context' ONLY, and it
-		// cached the GPU programs using state.
+		// Unbind pipeline and rebind to new context later	
 		setGraphicsPipeline(nullptr);
 
-		// It's ready for switching
 		if (mCurrentContext)
 			mCurrentContext->endCurrent();
 
 		mCurrentContext = context;
 		mCurrentContext->setCurrent(window);
 
-		// Must reset depth/colour write mask to according with user desired, otherwise,
-		// clearFrameBuffer would be wrong because the value we recorded may be
-		// different from the real state stored in GL context.
+		// Must reset depth/colour write mask to according with user desired, otherwise, clearFrameBuffer would be wrong 
+		// because the value we recorded may be different from the real state stored in GL context.
 		glDepthMask(mDepthWrite);
 		BS_CHECK_GL_ERROR();
 
@@ -2495,12 +2483,12 @@ namespace bs { namespace ct
 		driverVersion.build = 0;
 
 		caps.setDriverVersion(driverVersion);
+		caps.setRenderAPIName(getName());
+
 		const char* deviceName = (const char*)glGetString(GL_RENDERER);
-		const char* vendorName = (const char*)glGetString(GL_VENDOR);
 		caps.setDeviceName(deviceName);
-		caps.setRenderAPIName(getName());
 
-		// determine vendor
+		const char* vendorName = (const char*)glGetString(GL_VENDOR);
 		if (strstr(vendorName, "NVIDIA"))
 			caps.setVendor(GPU_NVIDIA);
 		else if (strstr(vendorName, "ATI"))

Source/BansheeGLRenderAPI/BsGLTexture.cpp

@@ -171,20 +171,43 @@ namespace bs { namespace ct
 				break;
 			}
 #else
-			if((usage & TU_DEPTHSTENCIL) != 0 && mProperties.getTextureType() == TEX_TYPE_2D)
-			{
+			if((usage & TU_DEPTHSTENCIL) != 0)
+			{ 
 				GLenum depthStencilType = GLPixelUtil::getDepthStencilTypeFromPF(mInternalFormat);
 				GLenum depthStencilFormat = GLPixelUtil::getDepthStencilFormatFromPF(mInternalFormat);
 
-				if (numFaces <= 1)
+				if(texType == TEX_TYPE_2D)
+				{
+					if (numFaces <= 1)
+					{
+						glTexImage2D(GL_TEXTURE_2D, 0, mGLFormat, width, height, 0,
+							depthStencilFormat, depthStencilType, nullptr);
+					}
+					else
+					{
+						glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, mGLFormat, width, height, numFaces, 0,
+							depthStencilFormat, depthStencilType, nullptr);
+					}
+				}
+				else if(texType == TEX_TYPE_CUBE_MAP)
 				{
-					glTexImage2D(GL_TEXTURE_2D, 0, mGLFormat, width, height, 0,
-						depthStencilFormat, depthStencilType, nullptr);
+					if (numFaces <= 6)
+					{
+						for (UINT32 face = 0; face < 6; face++)
+						{
+							glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + face, 0, mGLFormat,
+								width, height, 0, depthStencilFormat, depthStencilType, nullptr);
+						}
+					}
+					else
+					{
+						glTexImage3D(GL_TEXTURE_CUBE_MAP_ARRAY, 0, mGLFormat,
+							width, height, numFaces, 0, depthStencilFormat, depthStencilType, nullptr);
+					}
 				}
 				else
 				{
-					glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, mGLFormat, width, height, numFaces, 0,
-						depthStencilFormat, depthStencilType, nullptr);
+					LOGERR("Unsupported texture type for depth-stencil attachment usage.");
 				}
 			}
 			else