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

Use gfxContext in FrameBuffer

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-01-02 00:09:19 +07:00
parent 84b7050339
commit 7fdf97cf29
5 changed files with 85 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/FrameBuffer.cpp
View File

@ -25,6 +25,9 @@
#include "BufferCopy/DepthBufferToRDRAM.h"
#include "BufferCopy/RDRAMtoColorBuffer.h"
#include <Graphics/Context.h>
#include <Graphics/Parameters.h>
using namespace std;
FrameBuffer::FrameBuffer() :
@ -84,8 +87,9 @@ void FrameBuffer::_initTexture(u16 _width, u16 _height, u16 _format, u16 _size,
textureCache().addFrameBufferTextureSize(_pTexture->textureBytes);
}
void FrameBuffer::_setAndAttachTexture(u16 _size, CachedTexture *_pTexture)
void FrameBuffer::_setAndAttachTexture(u16 _size, CachedTexture *_pTexture, u32 _t, bool _multisampling)
{
#ifndef GRAPHICS_CONTEXT
glBindTexture(GL_TEXTURE_2D, _pTexture->glName);
if (_size > G_IM_SIZ_8b) {
@ -106,6 +110,36 @@ void FrameBuffer::_setAndAttachTexture(u16 _size, CachedTexture *_pTexture)
}
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
#else // GRAPHICS_CONTEXT
{
graphics::Context::InitTextureParams params;
params.handle = graphics::ObjectHandle(_pTexture->glName);
if (_multisampling)
params.msaaLevel = config.video.multisampling;
params.width = _pTexture->realWidth;
params.height = _pTexture->realHeight;
if (_size > G_IM_SIZ_8b) {
params.internalFormat = fboFormats.colorInternalFormat;
params.format = fboFormats.colorFormat;
params.dataType = fboFormats.colorType;
}
else {
params.internalFormat = fboFormats.monochromeInternalFormat;
params.format = fboFormats.monochromeFormat;
params.dataType = fboFormats.monochromeType;
}
gfxContext.init2DTexture(params);
}
{
graphics::Context::TexParameters params;
params.handle = graphics::ObjectHandle(_pTexture->glName);
params.target = _multisampling ? graphics::target::TEXTURE_2D_MULTISAMPLE : graphics::target::TEXTURE_2D;
params.textureUnitIndex = _t;
params.minFilter = graphics::textureParameters::FILTER_NEAREST;
params.magFilter = graphics::textureParameters::FILTER_NEAREST;
gfxContext.setTextureParameters(params);
}
#endif // GRAPHICS_CONTEXT
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _pTexture->glName, 0);
}
@ -151,6 +185,8 @@ void FrameBuffer::init(u32 _address, u32 _endAddress, u16 _format, u16 _size, u1
_initTexture(_width, _height, _format, _size, m_pTexture);
glBindFramebuffer(GL_FRAMEBUFFER, m_FBO);
#ifndef GRAPHICS_CONTEXT
#ifdef GL_MULTISAMPLING_SUPPORT
if (config.video.multisampling != 0) {
glBindTexture(GL_TEXTURE_2D_MULTISAMPLE, m_pTexture->glName);
@ -172,13 +208,33 @@ void FrameBuffer::init(u32 _address, u32 _endAddress, u16 _format, u16 _size, u1
_initTexture(_width, _height, _format, _size, m_pResolveTexture);
glGenFramebuffers(1, &m_resolveFBO);
glBindFramebuffer(GL_FRAMEBUFFER, m_resolveFBO);
_setAndAttachTexture(_size, m_pResolveTexture);
_setAndAttachTexture(_size, m_pResolveTexture, 0, false);
assert(checkFBO());
glBindFramebuffer(GL_FRAMEBUFFER, m_FBO);
} else
#endif // GL_MULTISAMPLING_SUPPORT
_setAndAttachTexture(_size, m_pTexture);
_setAndAttachTexture(_size, m_pTexture, 0, false);
#else // GRAPHICS_CONTEXT
if (config.video.multisampling != 0) {
_setAndAttachTexture(_size, m_pTexture, 0, true);
m_pTexture->frameBufferTexture = CachedTexture::fbMultiSample;
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D_MULTISAMPLE, m_pTexture->glName, 0);
m_pResolveTexture = textureCache().addFrameBufferTexture(false);
_initTexture(_width, _height, _format, _size, m_pResolveTexture);
glGenFramebuffers(1, &m_resolveFBO);
glBindFramebuffer(GL_FRAMEBUFFER, m_resolveFBO);
_setAndAttachTexture(_size, m_pResolveTexture, 0, false);
assert(checkFBO());
glBindFramebuffer(GL_FRAMEBUFFER, m_FBO);
} else
_setAndAttachTexture(_size, m_pTexture, 0, false);
#endif // GRAPHICS_CONTEXT
ogl.getRender().clearColorBuffer(nullptr);
}
@ -347,6 +403,8 @@ bool FrameBuffer::_initSubTexture(u32 _t)
m_pSubTexture->offsetS = 0.0f;
m_pSubTexture->offsetT = m_pSubTexture->clampHeight;
#ifndef GRAPHICS_CONTEXT
glActiveTexture(GL_TEXTURE0 + _t);
glBindTexture(GL_TEXTURE_2D, m_pSubTexture->glName);
if (m_pSubTexture->size > G_IM_SIZ_8b) {
@ -370,6 +428,13 @@ bool FrameBuffer::_initSubTexture(u32 _t)
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_SubFBO);
glFramebufferTexture2D(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_pSubTexture->glName, 0);
#else // GRAPHICS_CONTEXT
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_SubFBO);
_setAndAttachTexture(m_pSubTexture->size, m_pSubTexture, _t, false);
#endif // GRAPHICS_CONTEXT
return true;
}

2
src/FrameBuffer.h
View File

@ -67,7 +67,7 @@ private:
} m_clearParams;
void _initTexture(u16 _width, u16 _height, u16 _format, u16 _size, CachedTexture *_pTexture);
void _setAndAttachTexture(u16 _size, CachedTexture *_pTexture);
void _setAndAttachTexture(u16 _size, CachedTexture *_pTexture, u32 _t, bool _multisampling);
bool _initSubTexture(u32 _t);
CachedTexture * _getSubTexture(u32 _t);
mutable u32 m_validityChecked;

1
src/Graphics/OpenGLContext/opengl_ContextImpl.cpp
View File

@ -46,6 +46,7 @@ void ContextImpl::deleteTexture(graphics::ObjectHandle _name)
{
u32 glName(_name);
glDeleteTextures(1, &glName);
m_init2DTexture->reset(_name);
}
void ContextImpl::init2DTexture(const graphics::Context::InitTextureParams & _params)

14
src/Graphics/OpenGLContext/opengl_TextureManipulationObjectFactory.cpp
View File

@ -75,6 +75,8 @@ namespace opengl {
}
}
void reset(graphics::ObjectHandle _deleted) override {}
private:
CachedBindTexture* m_bind;
};
@ -126,6 +128,12 @@ namespace opengl {
}
void reset(graphics::ObjectHandle _deleted) override
{
if (m_handle == _deleted)
m_handle = graphics::ObjectHandle(0);
}
private:
CachedBindTexture* m_bind;
graphics::ObjectHandle m_handle;
@ -172,6 +180,12 @@ namespace opengl {
}
}
void reset(graphics::ObjectHandle _deleted) override
{
if (m_handle == _deleted)
m_handle = graphics::ObjectHandle(0);
}
private:
graphics::ObjectHandle m_handle;
};

1
src/Graphics/OpenGLContext/opengl_TextureManipulationObjectFactory.h
View File

@ -20,6 +20,7 @@ namespace opengl {
public:
virtual ~Init2DTexture() {};
virtual void init2DTexture(const graphics::Context::InitTextureParams & _params) = 0;
virtual void reset(graphics::ObjectHandle _deleted) = 0;
};
class Set2DTextureParameters