Add TEX_FORMAT_X24_TYPELESS_G8_UINT, TEX_FORMAT_X32_TYPELESS_G8X24_UINT and GL_STENCIL_INDEX support

Author: hzqst

Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp

@@ -72,7 +72,7 @@ class FormatToGLInternalTexFormatMap
         m_FmtToGLFmtMap[TEX_FORMAT_R32G8X24_TYPELESS]      = GL_DEPTH32F_STENCIL8;
         m_FmtToGLFmtMap[TEX_FORMAT_D32_FLOAT_S8X24_UINT]   = GL_DEPTH32F_STENCIL8;
         m_FmtToGLFmtMap[TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS]=GL_DEPTH32F_STENCIL8;
-        m_FmtToGLFmtMap[TEX_FORMAT_X32_TYPELESS_G8X24_UINT]= 0;//GL_DEPTH32F_STENCIL8;
+        m_FmtToGLFmtMap[TEX_FORMAT_X32_TYPELESS_G8X24_UINT]= GL_DEPTH32F_STENCIL8;
 
         m_FmtToGLFmtMap[TEX_FORMAT_RGB10A2_TYPELESS]       = GL_RGB10_A2;
         m_FmtToGLFmtMap[TEX_FORMAT_RGB10A2_UNORM]          = GL_RGB10_A2;
@@ -102,7 +102,7 @@ class FormatToGLInternalTexFormatMap
         m_FmtToGLFmtMap[TEX_FORMAT_R24G8_TYPELESS]         = GL_DEPTH24_STENCIL8;
         m_FmtToGLFmtMap[TEX_FORMAT_D24_UNORM_S8_UINT]      = GL_DEPTH24_STENCIL8;
         m_FmtToGLFmtMap[TEX_FORMAT_R24_UNORM_X8_TYPELESS]  = GL_DEPTH24_STENCIL8;
-        m_FmtToGLFmtMap[TEX_FORMAT_X24_TYPELESS_G8_UINT]   = 0;//GL_DEPTH24_STENCIL8;
+        m_FmtToGLFmtMap[TEX_FORMAT_X24_TYPELESS_G8_UINT]   = GL_DEPTH24_STENCIL8;
 
         m_FmtToGLFmtMap[TEX_FORMAT_RG8_TYPELESS]           = GL_RG8;
         m_FmtToGLFmtMap[TEX_FORMAT_RG8_UNORM]              = GL_RG8;

Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp

@@ -1253,7 +1253,7 @@ void RenderDeviceGLImpl::FlagSupportedTexFormats()
     FlagFormat(TEX_FORMAT_R32G8X24_TYPELESS,          true                                      );
     FlagFormat(TEX_FORMAT_D32_FLOAT_S8X24_UINT,       true,         BIND_DEPTH_STENCIL          );
     FlagFormat(TEX_FORMAT_R32_FLOAT_X8X24_TYPELESS,   true,         TexBindFlags,     bDekstopGL);
-    FlagFormat(TEX_FORMAT_X32_TYPELESS_G8X24_UINT,    false                                     );
+    FlagFormat(TEX_FORMAT_X32_TYPELESS_G8X24_UINT,    true,         BIND_SHADER_RESOURCE,  false);
     FlagFormat(TEX_FORMAT_RGB10A2_TYPELESS,           true                                      );
     FlagFormat(TEX_FORMAT_RGB10A2_UNORM,              true,         BindSrvRtvUav,          true);
     FlagFormat(TEX_FORMAT_RGB10A2_UINT,               true,         BindSrvRtvUav               );
@@ -1278,7 +1278,7 @@ void RenderDeviceGLImpl::FlagSupportedTexFormats()
     FlagFormat(TEX_FORMAT_R24G8_TYPELESS,             true                                      );
     FlagFormat(TEX_FORMAT_D24_UNORM_S8_UINT,          true,         BIND_DEPTH_STENCIL          );
     FlagFormat(TEX_FORMAT_R24_UNORM_X8_TYPELESS,      true,         TexBindFlags,           true);
-    FlagFormat(TEX_FORMAT_X24_TYPELESS_G8_UINT,       false                                     );
+    FlagFormat(TEX_FORMAT_X24_TYPELESS_G8_UINT,       true,         BIND_SHADER_RESOURCE,  false);
     FlagFormat(TEX_FORMAT_RG8_TYPELESS,               true                                      );
     FlagFormat(TEX_FORMAT_RG8_UNORM,                  true,         U8BindFlags,            true);
     FlagFormat(TEX_FORMAT_RG8_UINT,                   true,         UI8BindFlags                );

Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp

@@ -490,9 +490,23 @@ void TextureBaseGL::CreateViewInternal(const TextureViewDesc& OrigViewDesc, ITex
                     LOG_ERROR_AND_THROW("glTextureView is not supported");
 
                 glTextureView(pViewOGL->GetHandle(), GLViewTarget, m_GlTexture, GLViewFormat, ViewDesc.MostDetailedMip, ViewDesc.NumMipLevels, ViewDesc.FirstArraySlice, NumLayers);
+                
                 DEV_CHECK_GL_ERROR_AND_THROW("Failed to create texture view");
                 pViewOGL->SetBindTarget(GLViewTarget);
 
+                if(GLViewFormat == TEX_FORMAT_X24_TYPELESS_G8_UINT || GLViewFormat == TEX_FORMAT_X32_TYPELESS_G8X24_UINT)
+                {
+                    RefCntAutoPtr<DeviceContextGLImpl> pDeviceContext = pDeviceGLImpl->GetImmediateContext(0);
+                    VERIFY(pDeviceContext, "Immediate device context has been destroyed");
+                    GLContextState& GLState = pDeviceContext->GetContextState();
+
+                    GLState.BindTexture(-1, GLViewTarget, pViewOGL->GetHandle());
+
+                    glTexParameteri(GLViewTarget, GL_DEPTH_STENCIL_TEXTURE_MODE, GL_STENCIL_INDEX);
+
+                    GLState.BindTexture(-1, GLViewTarget, GLObjectWrappers::GLTextureObj::Null());
+                }
+
                 if (!IsIdentityComponentMapping(ViewDesc.Swizzle))
                 {
                     RefCntAutoPtr<DeviceContextGLImpl> pDeviceContext = pDeviceGLImpl->GetImmediateContext(0);
@@ -508,6 +522,7 @@ void TextureBaseGL::CreateViewInternal(const TextureViewDesc& OrigViewDesc, ITex
                     DEV_CHECK_GL_ERROR("Failed to set GL_TEXTURE_SWIZZLE_B texture parameter");
                     glTexParameteri(GLViewTarget, GL_TEXTURE_SWIZZLE_A, TextureComponentSwizzleToGLTextureSwizzle(ViewDesc.Swizzle.A, GL_ALPHA));
                     DEV_CHECK_GL_ERROR("Failed to set GL_TEXTURE_SWIZZLE_A texture parameter");
+
                     GLState.BindTexture(-1, GLViewTarget, GLObjectWrappers::GLTextureObj::Null());
                 }
             }