Skip to content

Add capability of creating seperated stencil view in OpenGL. #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheMostDiligent merged 8 commits into from
Aug 1, 2025
Merged

Add capability of creating seperated stencil view in OpenGL. #690

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8fea35a
Add TEX_FORMAT_X24_TYPELESS_G8_UINT, TEX_FORMAT_X32_TYPELESS_G8X24_UI…
hzqst Jul 28, 2025
9e3dcad
Fix typo
hzqst Jul 28, 2025
98064f9
Add GL_ARB_stencil_texturing capability checking, and FormatInfo.Supp…
hzqst Jul 29, 2025
086a4c5
Add DEV_CHECK_GL_ERROR for glTexParameteri GL_DEPTH_STENCIL_TEXTURE_M…
hzqst Aug 1, 2025
f9e63f2
Fix formatting
hzqst Aug 1, 2025
cda2b7c
Replace auto with actual type
hzqst Aug 1, 2025
81e77a1
Add missing definition for GL_DEPTH_STENCIL_TEXTURE_MODE and GL_STENC…
hzqst Aug 1, 2025
d8e2b47
Fix formatting in GLStubsIOS.h
hzqst Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 5 additions & 2 deletions Graphics/GraphicsEngineOpenGL/src/RenderDeviceGLImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,13 +1138,16 @@ void RenderDeviceGLImpl::FlagSupportedTexFormats()
{
const RenderDeviceInfo& DeviceInfo = GetDeviceInfo();
const bool bDekstopGL = DeviceInfo.Type == RENDER_DEVICE_TYPE_GL;
const bool bGL430OrAbove = DeviceInfo.Type == RENDER_DEVICE_TYPE_GL && DeviceInfo.APIVersion >= Version{4, 3};
const bool bGLES30OrAbove = DeviceInfo.Type == RENDER_DEVICE_TYPE_GLES && DeviceInfo.APIVersion >= Version{3, 0};
const bool bGLES31OrAbove = DeviceInfo.Type == RENDER_DEVICE_TYPE_GLES && DeviceInfo.APIVersion >= Version{3, 1};

const bool bRGTC = CheckExtension("GL_EXT_texture_compression_rgtc") || CheckExtension("GL_ARB_texture_compression_rgtc");
const bool bBPTC = CheckExtension("GL_EXT_texture_compression_bptc") || CheckExtension("GL_ARB_texture_compression_bptc");
const bool bS3TC = CheckExtension("GL_EXT_texture_compression_s3tc") || CheckExtension("GL_WEBGL_compressed_texture_s3tc");
const bool bTexNorm16 = bDekstopGL || CheckExtension("GL_EXT_texture_norm16"); // Only for ES3.1+
const bool bTexSwizzle = bDekstopGL || bGLES30OrAbove || CheckExtension("GL_ARB_texture_swizzle");
const bool bStencilTex = bGL430OrAbove || bGLES31OrAbove || CheckExtension("GL_ARB_stencil_texturing");

#if PLATFORM_WEB
const bool bETC2 = CheckExtension("GL_WEBGL_compressed_texture_etc");
Expand Down Expand Up @@ -1253,7 +1256,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, bStencilTex, 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 );
Expand All @@ -1278,7 +1281,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, bStencilTex, 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 );
Expand Down
18 changes: 18 additions & 0 deletions Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,24 @@ void TextureBaseGL::CreateViewInternal(const TextureViewDesc& OrigViewDesc, ITex
DEV_CHECK_GL_ERROR_AND_THROW("Failed to create texture view");
pViewOGL->SetBindTarget(GLViewTarget);

if (ViewDesc.Format == TEX_FORMAT_X24_TYPELESS_G8_UINT || ViewDesc.Format == TEX_FORMAT_X32_TYPELESS_G8X24_UINT)
{
const auto &FormatInfo = pDeviceGLImpl->GetTextureFormatInfo(ViewDesc.Format);
Comment thread
hzqst marked this conversation as resolved.
Outdated

if (FormatInfo.Supported)
{
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);
Comment thread
hzqst marked this conversation as resolved.

GLState.BindTexture(-1, GLViewTarget, GLObjectWrappers::GLTextureObj::Null());
}
Comment thread
hzqst marked this conversation as resolved.
}

if (!IsIdentityComponentMapping(ViewDesc.Swizzle))
{
RefCntAutoPtr<DeviceContextGLImpl> pDeviceContext = pDeviceGLImpl->GetImmediateContext(0);
Expand Down
Loading