MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Resolve multisampled depth buufer before using it as texture.

Browse Source
This commit is contained in:
Sergey Lipskiy 2015-02-13 18:06:59 +06:00
parent d12e33c521
commit 916e083bfa
3 changed files with 92 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
DepthBuffer.cpp
View File

@ -16,18 +16,21 @@ const GLuint ZlutImageUnit = 0;
const GLuint TlutImageUnit = 1; const GLuint TlutImageUnit = 1;
const GLuint depthImageUnit = 2; const GLuint depthImageUnit = 2;
DepthBuffer::DepthBuffer() : m_address(0), m_width(0), m_FBO(0), m_pDepthImageTexture(NULL), m_pDepthBufferTexture(NULL) DepthBuffer::DepthBuffer() : m_address(0), m_width(0), m_FBO(0), m_pDepthImageTexture(NULL), m_pDepthBufferTexture(NULL), m_pResolveDepthBufferTexture(NULL), m_resolved(false)
{ {
glGenFramebuffers(1, &m_FBO); glGenFramebuffers(1, &m_FBO);
} }
DepthBuffer::DepthBuffer(DepthBuffer && _other) : DepthBuffer::DepthBuffer(DepthBuffer && _other) :
m_address(_other.m_address), m_width(_other.m_width), m_address(_other.m_address), m_width(_other.m_width),
m_FBO(_other.m_FBO), m_pDepthImageTexture(_other.m_pDepthImageTexture), m_pDepthBufferTexture(_other.m_pDepthBufferTexture) m_FBO(_other.m_FBO), m_pDepthImageTexture(_other.m_pDepthImageTexture), m_pDepthBufferTexture(_other.m_pDepthBufferTexture),
m_pResolveDepthBufferTexture(_other.m_pResolveDepthBufferTexture), m_resolved(_other.m_resolved)
{ {
_other.m_FBO = 0; _other.m_FBO = 0;
_other.m_pDepthImageTexture = NULL; _other.m_pDepthImageTexture = NULL;
_other.m_pDepthBufferTexture = NULL; _other.m_pDepthBufferTexture = NULL;
_other.m_pResolveDepthBufferTexture = NULL;
_other.m_resolved = false;
} }
DepthBuffer::~DepthBuffer() DepthBuffer::~DepthBuffer()
@ -38,6 +41,8 @@ DepthBuffer::~DepthBuffer()
textureCache().removeFrameBufferTexture(m_pDepthImageTexture); textureCache().removeFrameBufferTexture(m_pDepthImageTexture);
if (m_pDepthBufferTexture != NULL) if (m_pDepthBufferTexture != NULL)
textureCache().removeFrameBufferTexture(m_pDepthBufferTexture); textureCache().removeFrameBufferTexture(m_pDepthBufferTexture);
if (m_pResolveDepthBufferTexture != NULL)
textureCache().removeFrameBufferTexture(m_pResolveDepthBufferTexture);
} }
void DepthBuffer::initDepthImageTexture(FrameBuffer * _pBuffer) void DepthBuffer::initDepthImageTexture(FrameBuffer * _pBuffer)
@ -83,55 +88,50 @@ void DepthBuffer::initDepthImageTexture(FrameBuffer * _pBuffer)
#endif // GL_IMAGE_TEXTURES_SUPPORT #endif // GL_IMAGE_TEXTURES_SUPPORT
} }
void DepthBuffer::initDepthBufferTexture(FrameBuffer * _pBuffer) void DepthBuffer::_initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture * _pTexture, bool _multisample)
{ {
if (m_pDepthBufferTexture != NULL)
return;
m_pDepthBufferTexture = textureCache().addFrameBufferTexture();
if (_pBuffer != NULL) { if (_pBuffer != NULL) {
m_pDepthBufferTexture->width = (u32)(_pBuffer->m_pTexture->width); _pTexture->width = (u32)(_pBuffer->m_pTexture->width);
m_pDepthBufferTexture->height = (u32)(_pBuffer->m_pTexture->height); _pTexture->height = (u32)(_pBuffer->m_pTexture->height);
m_pDepthBufferTexture->address = _pBuffer->m_startAddress; _pTexture->address = _pBuffer->m_startAddress;
m_pDepthBufferTexture->clampWidth = _pBuffer->m_width; _pTexture->clampWidth = _pBuffer->m_width;
m_pDepthBufferTexture->clampHeight = _pBuffer->m_height; _pTexture->clampHeight = _pBuffer->m_height;
} }
else { else {
m_pDepthBufferTexture->width = video().getWidth(); _pTexture->width = video().getWidth();
m_pDepthBufferTexture->height = video().getHeight(); _pTexture->height = video().getHeight();
m_pDepthBufferTexture->address = VI.lastOrigin; _pTexture->address = VI.lastOrigin;
m_pDepthBufferTexture->clampWidth = VI.width; _pTexture->clampWidth = VI.width;
m_pDepthBufferTexture->clampHeight = VI.height; _pTexture->clampHeight = VI.height;
} }
m_pDepthBufferTexture->format = 0; _pTexture->format = 0;
m_pDepthBufferTexture->size = 2; _pTexture->size = 2;
m_pDepthBufferTexture->clampS = 1; _pTexture->clampS = 1;
m_pDepthBufferTexture->clampT = 1; _pTexture->clampT = 1;
m_pDepthBufferTexture->frameBufferTexture = TRUE; _pTexture->frameBufferTexture = TRUE;
m_pDepthBufferTexture->maskS = 0; _pTexture->maskS = 0;
m_pDepthBufferTexture->maskT = 0; _pTexture->maskT = 0;
m_pDepthBufferTexture->mirrorS = 0; _pTexture->mirrorS = 0;
m_pDepthBufferTexture->mirrorT = 0; _pTexture->mirrorT = 0;
m_pDepthBufferTexture->realWidth = m_pDepthBufferTexture->width; _pTexture->realWidth = _pTexture->width;
m_pDepthBufferTexture->realHeight = m_pDepthBufferTexture->height; _pTexture->realHeight = _pTexture->height;
m_pDepthBufferTexture->textureBytes = m_pDepthBufferTexture->realWidth * m_pDepthBufferTexture->realHeight * sizeof(float); _pTexture->textureBytes = _pTexture->realWidth * _pTexture->realHeight * sizeof(float);
textureCache().addFrameBufferTextureSize(m_pDepthBufferTexture->textureBytes); textureCache().addFrameBufferTextureSize(_pTexture->textureBytes);
#ifndef GLES2 #ifndef GLES2
const GLenum format = GL_DEPTH_COMPONENT; const GLenum format = GL_DEPTH_COMPONENT;
#else #else
const GLenum format = GL_DEPTH_COMPONENT24_OES; const GLenum format = GL_DEPTH_COMPONENT24_OES;
#endif #endif
if (config.video.multisampling != 0) { if (_multisample) {
glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_pDepthBufferTexture->glName); glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, _pTexture->glName);
if (_pBuffer != NULL) if (_pBuffer != NULL)
glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, false); glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, false);
else else
glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, video().getWidth(), video().getHeight(), false); glTexImage2DMultisample(GL_TEXTURE_2D_MULTISAMPLE, config.video.multisampling, GL_DEPTH_COMPONENT, video().getWidth(), video().getHeight(), false);
} }
else { else {
glBindTexture(GL_TEXTURE_2D, m_pDepthBufferTexture->glName); glBindTexture(GL_TEXTURE_2D, _pTexture->glName);
if (_pBuffer != NULL) if (_pBuffer != NULL)
glTexImage2D(GL_TEXTURE_2D, 0, format, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL); glTexImage2D(GL_TEXTURE_2D, 0, format, _pBuffer->m_pTexture->realWidth, _pBuffer->m_pTexture->realHeight, 0, GL_DEPTH_COMPONENT, GL_FLOAT, NULL);
else else
@ -140,21 +140,65 @@ void DepthBuffer::initDepthBufferTexture(FrameBuffer * _pBuffer)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
} }
glBindTexture( GL_TEXTURE_2D, 0); glBindTexture(GL_TEXTURE_2D, 0);
} }
void DepthBuffer::setDepthAttachment() { void DepthBuffer::setDepthAttachment()
{
if (config.video.multisampling != 0) if (config.video.multisampling != 0)
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D_MULTISAMPLE, m_pDepthBufferTexture->glName, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D_MULTISAMPLE, m_pDepthBufferTexture->glName, 0);
else else
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_pDepthBufferTexture->glName, 0); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_pDepthBufferTexture->glName, 0);
m_resolved = false;
} }
void DepthBuffer::activateDepthBufferTexture() { void DepthBuffer::initDepthBufferTexture(FrameBuffer * _pBuffer)
textureCache().activateTexture(0, m_pDepthBufferTexture); {
if (m_pDepthBufferTexture == NULL) {
m_pDepthBufferTexture = textureCache().addFrameBufferTexture();
_initDepthBufferTexture(_pBuffer, m_pDepthBufferTexture, config.video.multisampling != 0);
}
if (config.video.multisampling != 0 && m_pResolveDepthBufferTexture == NULL) {
m_pResolveDepthBufferTexture = textureCache().addFrameBufferTexture();
_initDepthBufferTexture(_pBuffer, m_pResolveDepthBufferTexture, false);
}
} }
void DepthBuffer::bindDepthImageTexture() { CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
{
if (config.video.multisampling == 0)
return m_pDepthBufferTexture;
if (m_resolved)
return m_pResolveDepthBufferTexture;
glDisable(GL_SCISSOR_TEST);
glBindFramebuffer(GL_READ_FRAMEBUFFER, _pBuffer->m_FBO);
glReadBuffer(GL_COLOR_ATTACHMENT0);
GLuint attachment = GL_COLOR_ATTACHMENT0;
glDrawBuffers(1, &attachment);
assert(checkFBO());
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _pBuffer->m_resolveFBO);
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, m_pResolveDepthBufferTexture->glName, 0);
assert(checkFBO());
glBlitFramebuffer(
0, 0, m_pDepthBufferTexture->realWidth, m_pDepthBufferTexture->realHeight,
0, 0, m_pResolveDepthBufferTexture->realWidth, m_pResolveDepthBufferTexture->realHeight,
GL_DEPTH_BUFFER_BIT, GL_NEAREST
);
glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, _pBuffer->m_FBO);
glEnable(GL_SCISSOR_TEST);
m_resolved = true;
return m_pResolveDepthBufferTexture;
}
void DepthBuffer::activateDepthBufferTexture(FrameBuffer * _pBuffer)
{
textureCache().activateTexture(0, resolveDepthBufferTexture(_pBuffer));
}
void DepthBuffer::bindDepthImageTexture()
{
#ifdef GL_IMAGE_TEXTURES_SUPPORT #ifdef GL_IMAGE_TEXTURES_SUPPORT
glBindImageTexture(depthImageUnit, m_pDepthImageTexture->glName, 0, GL_FALSE, 0, GL_READ_WRITE, GL_RG32F); glBindImageTexture(depthImageUnit, m_pDepthImageTexture->glName, 0, GL_FALSE, 0, GL_READ_WRITE, GL_RG32F);
#endif #endif

9
DepthBuffer.h
View File

@ -11,9 +11,10 @@ struct DepthBuffer
~DepthBuffer(); ~DepthBuffer();
void initDepthImageTexture(FrameBuffer * _pBuffer); void initDepthImageTexture(FrameBuffer * _pBuffer);
void initDepthBufferTexture(FrameBuffer * _pBuffer); void initDepthBufferTexture(FrameBuffer * _pBuffer);
CachedTexture * resolveDepthBufferTexture(FrameBuffer * _pBuffer);
void setDepthAttachment(); void setDepthAttachment();
void activateDepthBufferTexture(); void activateDepthBufferTexture(FrameBuffer * _pBuffer);
void bindDepthImageTexture(); void bindDepthImageTexture();
@ -21,6 +22,12 @@ struct DepthBuffer
GLuint m_FBO; GLuint m_FBO;
CachedTexture *m_pDepthImageTexture; CachedTexture *m_pDepthImageTexture;
CachedTexture *m_pDepthBufferTexture; CachedTexture *m_pDepthBufferTexture;
// multisampling
CachedTexture *m_pResolveDepthBufferTexture;
bool m_resolved;
private:
void _initDepthBufferTexture(FrameBuffer * _pBuffer, CachedTexture *_pTexture, bool _multisample);
}; };
class DepthBufferList class DepthBufferList

2
OpenGL.cpp
View File

@ -913,7 +913,7 @@ bool texturedRectShadowMap(const OGLRender::TexturedRectParams &)
FrameBufferList & fb = frameBufferList(); FrameBufferList & fb = frameBufferList();
if (fb.isFboMode()) { if (fb.isFboMode()) {
if (gDP.textureImage.size == 2 && gDP.textureImage.address >= gDP.depthImageAddress && gDP.textureImage.address < (gDP.depthImageAddress + gDP.colorImage.width*gDP.colorImage.width * 6 / 4)) { if (gDP.textureImage.size == 2 && gDP.textureImage.address >= gDP.depthImageAddress && gDP.textureImage.address < (gDP.depthImageAddress + gDP.colorImage.width*gDP.colorImage.width * 6 / 4)) {
fb.getCurrent()->m_pDepthBuffer->activateDepthBufferTexture(); fb.getCurrent()->m_pDepthBuffer->activateDepthBufferTexture(fb.getCurrent());
SetDepthFogCombiner(); SetDepthFogCombiner();
} }
} }