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

Code refactor: replace graphics::ObjectHandle() by graphics::ObjectHandle::null

Browse Source
This commit is contained in:
Sergey Lipskiy 2017-02-22 16:45:27 +07:00
parent bfe5b6078e
commit 827b6bb9cd
24 changed files with 63 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
projects/msvc12/GLideN64.vcxproj
View File

@ -292,6 +292,7 @@
<ClCompile Include="..\..\src\GLideN64.cpp" />
<ClCompile Include="..\..\src\Graphics\CombinerProgram.cpp" />
<ClCompile Include="..\..\src\Graphics\Context.cpp" />
<ClCompile Include="..\..\src\Graphics\ObjectHandle.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLFunctions.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerInputs.cpp" />
<ClCompile Include="..\..\src\Graphics\OpenGLContext\GLSL\glsl_CombinerProgramBuilder.cpp" />

3
projects/msvc12/GLideN64.vcxproj.filters
View File

@ -341,6 +341,9 @@
<ClCompile Include="..\..\src\F3DTEXA.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\Graphics\ObjectHandle.cpp">
<Filter>Source Files\Graphics</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\3DMath.h">

2
src/BufferCopy/ColorBufferToRDRAM.cpp
View File

@ -112,7 +112,7 @@ void ColorBufferToRDRAM::_initFBTexture(void)
// check if everything is OK
assert(!gfxContext.isFramebufferError());
gfxContext.bindFramebuffer(graphics::bufferTarget::DRAW_FRAMEBUFFER, graphics::ObjectHandle());
gfxContext.bindFramebuffer(graphics::bufferTarget::DRAW_FRAMEBUFFER, graphics::ObjectHandle::null);
m_bufferReader.reset(gfxContext.createColorBufferReader(m_pTexture));
}

2
src/BufferCopy/DepthBufferToRDRAM.cpp
View File

@ -114,7 +114,7 @@ void DepthBufferToRDRAM::init()
// check if everything is OK
assert(!gfxContext.isFramebufferError());
assert(!gfxContext.isError());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
// Generate and initialize Pixel Buffer Objects
m_pbuf.reset(gfxContext.createPixelReadBuffer(m_pDepthTexture->textureBytes));

1
src/CMakeLists.txt
View File

@ -65,6 +65,7 @@ set(GLideN64_SOURCES
common/CommonAPIImpl_common.cpp
Graphics/Context.cpp
Graphics/CombinerProgram.cpp
Graphics/ObjectHandle.cpp
Graphics/OpenGLContext/GLFunctions.cpp
Graphics/OpenGLContext/opengl_Attributes.cpp
Graphics/OpenGLContext/opengl_BufferedDrawer.cpp

6
src/DepthBuffer.cpp
View File

@ -38,7 +38,7 @@ DepthBuffer::DepthBuffer(DepthBuffer && _other) :
_other.m_pDepthImageZTexture = nullptr;
_other.m_pDepthImageDeltaZTexture = nullptr;
_other.m_pDepthBufferTexture = nullptr;
_other.m_depthRenderbuffer = ObjectHandle();
_other.m_depthRenderbuffer = ObjectHandle::null;
_other.m_pResolveDepthBufferTexture = nullptr;
_other.m_resolved = false;
_other.m_pDepthBufferCopyTexture = nullptr;
@ -273,7 +273,7 @@ CachedTexture * DepthBuffer::resolveDepthBufferTexture(FrameBuffer * _pBuffer)
gfxContext.blitFramebuffers(blitParams);
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle::null);
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, _pBuffer->m_FBO);
m_resolved = true;
@ -324,7 +324,7 @@ CachedTexture * DepthBuffer::copyDepthBufferTexture(FrameBuffer * _pBuffer)
gfxContext.blitFramebuffers(blitParams);
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle::null);
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, _pBuffer->m_FBO);
m_copied = true;

20
src/FrameBuffer.cpp
View File

@ -320,7 +320,7 @@ void FrameBuffer::resolveMultisampledTexture(bool _bForce)
gfxContext.blitFramebuffers(blitParams);
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle::null);
frameBufferList().setCurrentDrawBuffer();
m_resolved = true;
@ -399,7 +399,7 @@ CachedTexture * FrameBuffer::_getSubTexture(u32 _t)
gfxContext.blitFramebuffers(blitParams);
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle::null);
frameBufferList().setCurrentDrawBuffer();
@ -470,7 +470,7 @@ void FrameBufferList::init()
{
m_pCurrent = nullptr;
m_pCopy = nullptr;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
m_prevColorImageHeight = 0;
}
@ -478,7 +478,7 @@ void FrameBufferList::destroy() {
m_list.clear();
m_pCurrent = nullptr;
m_pCopy = nullptr;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
}
void FrameBufferList::setBufferChanged()
@ -577,7 +577,7 @@ void FrameBufferList::saveBuffer(u32 _address, u16 _format, u16 _size, u16 _widt
if (VI.width == 0 || _height == 0) {
m_pCurrent = nullptr;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
return;
}
@ -697,7 +697,7 @@ void FrameBufferList::removeAux()
while (iter->m_width != VI.width && iter->m_height != VI.height) {
if (&(*iter) == m_pCurrent) {
m_pCurrent = nullptr;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
}
iter = m_list.erase(iter);
if (iter == m_list.end())
@ -712,7 +712,7 @@ void FrameBufferList::removeBuffer(u32 _address )
if (iter->m_startAddress == _address) {
if (&(*iter) == m_pCurrent) {
m_pCurrent = nullptr;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
}
m_list.erase(iter);
return;
@ -726,7 +726,7 @@ void FrameBufferList::removeBuffers(u32 _width)
while (iter->m_width == _width) {
if (&(*iter) == m_pCurrent) {
m_pCurrent = nullptr;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
}
iter = m_list.erase(iter);
if (iter == m_list.end())
@ -924,7 +924,7 @@ void FrameBufferList::renderBuffer(u32 _address)
hOffset + X1,
vOffset + (s32)(dstY1*dstScaleY) };
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
float clearColor[4] = { 0.0f, 0.0f, 0.0f, 0.0f };
drawer.clearColorBuffer(clearColor);
@ -1006,7 +1006,7 @@ void FrameBufferList::renderBuffer(u32 _address)
}
}
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle::null);
wnd.swapBuffers();
if (m_pCurrent != nullptr) {

7
src/Graphics/ObjectHandle.cpp Normal file
View File

@ -0,0 +1,7 @@
#include "ObjectHandle.h"
namespace graphics {
ObjectHandle ObjectHandle::null;
}

1
src/Graphics/ObjectHandle.h
View File

@ -17,6 +17,7 @@ namespace graphics {
void reset() { m_name = 0; }
static ObjectHandle null;
private:
u32 m_name;
};

2
src/Graphics/OpenGLContext/GLSL/glsl_CombinerProgramImpl.cpp
View File

@ -26,7 +26,7 @@ CombinerProgramImpl::CombinerProgramImpl(const CombinerKey & _key,
CombinerProgramImpl::~CombinerProgramImpl()
{
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
glDeleteProgram(GLuint(m_program));
}

18
src/Graphics/OpenGLContext/GLSL/glsl_SpecialShadersFactory.cpp
View File

@ -464,7 +464,7 @@ namespace glsl {
~SpecialShader()
{
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
glDeleteProgram(GLuint(m_program));
}
@ -494,7 +494,7 @@ namespace glsl {
{
m_useProgram->useProgram(m_program);
m_loc = glGetUniformLocation(GLuint(m_program), "uFogColor");
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
void activate() override {
@ -529,7 +529,7 @@ namespace glsl {
glUniform1i(samplesLoc, config.video.multisampling);
} else
glUniform1i(texLoc, u32(graphics::textureIndices::Tex[0]));
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
};
@ -575,12 +575,12 @@ namespace glsl {
m_textureBoundsLoc = glGetUniformLocation(GLuint(m_program), "uTextureBounds");
assert(m_textureBoundsLoc >= 0);
m_enableAlphaTestLoc = glGetUniformLocation(GLuint(m_program), "uEnableAlphaTest");
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
~TexrectDrawerShaderDraw()
{
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
glDeleteProgram(GLuint(m_program));
}
@ -640,7 +640,7 @@ namespace glsl {
m_useProgram->useProgram(m_program);
const int texLoc = glGetUniformLocation(GLuint(m_program), "uTex0");
glUniform1i(texLoc, 0);
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
};
@ -665,7 +665,7 @@ namespace glsl {
assert(levelLoc >= 0);
const f32 gammaLevel = (config.gammaCorrection.force != 0) ? config.gammaCorrection.level : 2.0f;
glUniform1f(levelLoc, gammaLevel);
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
};
@ -684,7 +684,7 @@ namespace glsl {
m_useProgram->useProgram(m_program);
const int texLoc = glGetUniformLocation(GLuint(m_program), "uTex0");
glUniform1i(texLoc, 0);
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
};
@ -707,7 +707,7 @@ namespace glsl {
glUniform1i(texLoc, 0);
const int colorLoc = glGetUniformLocation(GLuint(m_program), "uColor");
glUniform4fv(colorLoc, 1, config.font.colorf);
m_useProgram->useProgram(graphics::ObjectHandle());
m_useProgram->useProgram(graphics::ObjectHandle::null);
}
};

12
src/Graphics/OpenGLContext/opengl_BufferManipulationObjectFactory.cpp
View File

@ -132,7 +132,7 @@ public:
glGenBuffers(1, &m_PBO);
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle(m_PBO));
glBufferData(GL_PIXEL_UNPACK_BUFFER, m_size, nullptr, GL_DYNAMIC_DRAW);
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle());
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle::null);
}
~PBOWriteBuffer() {
@ -161,7 +161,7 @@ public:
}
void unbind() override {
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle());
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle::null);
}
private:
@ -182,7 +182,7 @@ public:
glBufferStorage(GL_PIXEL_UNPACK_BUFFER, m_size * 32, nullptr, m_bufAccessBits);
m_bufferData = glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, 0, m_size * 32, m_bufMapBits);
m_bufferOffset = 0;
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle());
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle::null);
}
~PersistentWriteBuffer() {
@ -216,7 +216,7 @@ public:
}
void unbind() override {
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle());
m_bind->bind(graphics::Parameter(GL_PIXEL_UNPACK_BUFFER), graphics::ObjectHandle::null);
}
private:
@ -299,7 +299,7 @@ public:
glGenBuffers(1, &m_PBO);
m_bind->bind(graphics::Parameter(GL_PIXEL_PACK_BUFFER), graphics::ObjectHandle(m_PBO));
glBufferData(GL_PIXEL_PACK_BUFFER, m_size, nullptr, GL_DYNAMIC_READ);
m_bind->bind(graphics::Parameter(GL_PIXEL_PACK_BUFFER), graphics::ObjectHandle());
m_bind->bind(graphics::Parameter(GL_PIXEL_PACK_BUFFER), graphics::ObjectHandle::null);
}
~PBOReadBuffer() {
@ -330,7 +330,7 @@ public:
}
void unbind() override {
m_bind->bind(graphics::Parameter(GL_PIXEL_PACK_BUFFER), graphics::ObjectHandle());
m_bind->bind(graphics::Parameter(GL_PIXEL_PACK_BUFFER), graphics::ObjectHandle::null);
}
private:

4
src/Graphics/OpenGLContext/opengl_BufferedDrawer.cpp
View File

@ -64,8 +64,8 @@ void BufferedDrawer::_initBuffer(Buffer & _buffer, GLuint _bufSize)
BufferedDrawer::~BufferedDrawer()
{
m_bindBuffer->bind(Parameter(GL_ARRAY_BUFFER), ObjectHandle());
m_bindBuffer->bind(Parameter(GL_ELEMENT_ARRAY_BUFFER), ObjectHandle());
m_bindBuffer->bind(Parameter(GL_ARRAY_BUFFER), ObjectHandle::null);
m_bindBuffer->bind(Parameter(GL_ELEMENT_ARRAY_BUFFER), ObjectHandle::null);
GLuint buffers[3] = { m_rectsBuffers.vbo.handle, m_trisBuffers.vbo.handle, m_trisBuffers.ebo.handle };
glDeleteBuffers(3, buffers);
glBindVertexArray(0);

4
src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithBufferStorage.cpp
View File

@ -30,7 +30,7 @@ void ColorBufferReaderWithBufferStorage::_initBuffers()
m_PBOData[index] = glMapBufferRange(GL_PIXEL_PACK_BUFFER, 0, m_pTexture->textureBytes, GL_MAP_READ_BIT | GL_MAP_PERSISTENT_BIT);
}
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle());
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null);
}
void ColorBufferReaderWithBufferStorage::_destroyBuffers()
@ -90,5 +90,5 @@ u8 * ColorBufferReaderWithBufferStorage::readPixels(s32 _x0, s32 _y0, u32 _width
void ColorBufferReaderWithBufferStorage::cleanUp()
{
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle());
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null);
}

4
src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithPixelBuffer.cpp
View File

@ -36,7 +36,7 @@ void ColorBufferReaderWithPixelBuffer::_initBuffers()
glBindBuffer(GL_PIXEL_PACK_BUFFER, m_PBO[i]);
glBufferData(GL_PIXEL_PACK_BUFFER, m_pTexture->textureBytes, nullptr, GL_DYNAMIC_READ);
}
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle());
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null);
}
u8 * ColorBufferReaderWithPixelBuffer::readPixels(s32 _x0, s32 _y0, u32 _width, u32 _height, u32 _size, bool _sync)
@ -83,5 +83,5 @@ u8 * ColorBufferReaderWithPixelBuffer::readPixels(s32 _x0, s32 _y0, u32 _width,
void ColorBufferReaderWithPixelBuffer::cleanUp()
{
glUnmapBuffer(GL_PIXEL_PACK_BUFFER);
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle());
m_bindBuffer->bind(Parameter(GL_PIXEL_PACK_BUFFER), ObjectHandle::null);
}

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

@ -373,7 +373,7 @@ graphics::ShaderProgram * ContextImpl::createTextDrawerShader()
void ContextImpl::resetShaderProgram()
{
m_cachedFunctions->getCachedUseProgram()->useProgram(graphics::ObjectHandle());
m_cachedFunctions->getCachedUseProgram()->useProgram(graphics::ObjectHandle::null);
}
void ContextImpl::drawTriangles(const graphics::Context::DrawTriangleParameters & _params)

2
src/GraphicsDrawer.cpp
View File

@ -1326,7 +1326,7 @@ void GraphicsDrawer::drawOSD()
if ((config.onScreenDisplay.fps | config.onScreenDisplay.vis | config.onScreenDisplay.percent) == 0)
return;
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
DisplayWindow & wnd = DisplayWindow::get();
const s32 X = (wnd.getScreenWidth() - wnd.getWidth()) / 2;

2
src/PaletteTexture.cpp
View File

@ -72,7 +72,7 @@ void PaletteTexture::destroy()
Context::BindImageTextureParameters bindParams;
bindParams.imageUnit = textureImageUnits::Tlut;
bindParams.texture = ObjectHandle();
bindParams.texture = ObjectHandle::null;
bindParams.accessMode = textureImageAccessMode::READ_ONLY;
bindParams.textureFormat = fbTexFormats.lutInternalFormat;

6
src/PostProcessor.cpp
View File

@ -315,7 +315,7 @@ void PostProcessor::_initCommon()
_initFBO(ObjectHandle(m_pResultBuffer->m_FBO), m_pResultBuffer->m_pTexture);
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER,
ObjectHandle());
ObjectHandle::null);
}
void PostProcessor::_initGammaCorrection()
@ -480,13 +480,13 @@ void PostProcessor::_preDraw(FrameBuffer * _pBuffer)
m_pTextureOriginal = _pBuffer->m_pTexture;
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER,
ObjectHandle());
ObjectHandle::null);
}
void PostProcessor::_postDraw()
{
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER,
ObjectHandle());
ObjectHandle::null);
gfxContext.resetShaderProgram();
}

6
src/TexrectDrawer.cpp
View File

@ -77,7 +77,7 @@ void TexrectDrawer::init()
// check if everything is OK
assert(!gfxContext.isFramebufferError());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, ObjectHandle::null);
m_programTex.reset(gfxContext.createTexrectDrawerDrawShader());
m_programClear.reset(gfxContext.createTexrectDrawerClearShader());
@ -282,7 +282,7 @@ bool TexrectDrawer::draw()
rect[3].t0 = t1;
drawer.updateScissor(m_pBuffer);
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, m_pBuffer != nullptr ? m_pBuffer->m_FBO : ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, m_pBuffer != nullptr ? m_pBuffer->m_FBO : ObjectHandle::null);
Context::DrawRectParameters rectParams;
rectParams.mode = drawmode::TRIANGLE_STRIP;
@ -312,7 +312,7 @@ bool TexrectDrawer::draw()
gfxContext.enable(enable::SCISSOR_TEST, true);
m_pBuffer = frameBufferList().getCurrent();
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, m_pBuffer != nullptr ? m_pBuffer->m_FBO : ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::DRAW_FRAMEBUFFER, m_pBuffer != nullptr ? m_pBuffer->m_FBO : ObjectHandle::null);
m_numRects = 0;
m_vecRectCoords.clear();

2
src/TextureFilterHandler.cpp
View File

@ -67,7 +67,7 @@ void displayLoadProgress(const wchar_t *format, ...)
FrameBuffer* pBuffer = frameBufferList().getCurrent();
if (pBuffer != nullptr)
gfxContext.bindFramebuffer(graphics::bufferTarget::DRAW_FRAMEBUFFER, graphics::ObjectHandle());
gfxContext.bindFramebuffer(graphics::bufferTarget::DRAW_FRAMEBUFFER, graphics::ObjectHandle::null);
GraphicsDrawer & drawer = dwnd().getDrawer();
drawer.clearColorBuffer(nullptr);

2
src/ZlutTexture.cpp
View File

@ -70,7 +70,7 @@ void ZlutTexture::destroy() {
Context::BindImageTextureParameters bindParams;
bindParams.imageUnit = textureImageUnits::Zlut;
bindParams.texture = ObjectHandle();
bindParams.texture = ObjectHandle::null;
bindParams.accessMode = textureImageAccessMode::READ_ONLY;
bindParams.textureFormat = fbTexFormats.lutInternalFormat;

2
src/gSP.cpp
View File

@ -2178,7 +2178,7 @@ void _copyDepthBuffer()
// Restore objects
if (pTmpBuffer->m_pDepthBuffer != nullptr)
pTmpBuffer->m_pDepthBuffer->setDepthAttachment(fbList.getCurrent()->m_FBO, bufferTarget::READ_FRAMEBUFFER);
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle());
gfxContext.bindFramebuffer(bufferTarget::READ_FRAMEBUFFER, ObjectHandle::null);
// Set back current depth buffer
dbList.saveBuffer(gDP.depthImageAddress);

1
src/mupen64plus-video-gliden64.mk
View File

@ -80,6 +80,7 @@ MY_LOCAL_SRC_FILES := \
$(SRCDIR)/BufferCopy/RDRAMtoColorBuffer.cpp \
$(SRCDIR)/Graphics/Context.cpp \
$(SRCDIR)/Graphics/CombinerProgram.cpp \
$(SRCDIR)/Graphics/ObjectHandle.cpp \
$(SRCDIR)/Graphics/OpenGLContext/GLFunctions.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_Attributes.cpp \
$(SRCDIR)/Graphics/OpenGLContext/opengl_BufferedDrawer.cpp \