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

Fixes crash at GoldenEye startup

Browse Source
This commit is contained in:
Francisco Zurita 2016-07-01 00:13:14 -04:00 committed by Sergey Lipskiy
parent c0c4d16abc
commit 62ec0cb821
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BufferCopy/ColorBufferToRDRAM.cpp
View File

@ -84,8 +84,6 @@ void ColorBufferToRDRAM::_initFBTexture(void)
void ColorBufferToRDRAM::_destroyFBTexure(void)
{
_destroyBuffers();
if (m_pTexture != nullptr) {
textureCache().removeFrameBufferTexture(m_pTexture);
m_pTexture = nullptr;

1
src/BufferCopy/ColorBufferToRDRAM.h
View File

@ -31,7 +31,6 @@ private:
virtual void _init() = 0;
virtual void _destroy() = 0;
virtual void _initBuffers(void) = 0;
virtual void _destroyBuffers(void) = 0;
virtual bool _readPixels(GLint _x0, GLint _y0, GLsizei _width, GLsizei _height, u32 _size, bool _sync) = 0;
virtual void _cleanUp() = 0;

1
src/BufferCopy/ColorBufferToRDRAMStub.cpp
View File

@ -10,7 +10,6 @@ private:
void _init() override {}
void _destroy() override {}
void _initBuffers() override {}
void _destroyBuffers() override {}
bool _readPixels(GLint _x0, GLint _y0, GLsizei _width, GLsizei _height, u32 _size, bool _sync) override {}
void _cleanUp() override {}
};

5
src/BufferCopy/ColorBufferToRDRAM_GL.cpp
View File

@ -15,7 +15,6 @@ private:
bool _readPixels(GLint _x0, GLint _y0, GLsizei _width, GLsizei _height, u32 _size, bool _sync) override;
void _cleanUp() override;
void _initBuffers(void) override;
void _destroyBuffers(void) override;
static const int _numPBO = 3;
GLuint m_PBO[_numPBO];
u32 m_curIndex;
@ -60,10 +59,6 @@ void ColorBufferToRDRAM_GL::_initBuffers(void)
glBindBuffer(GL_PIXEL_PACK_BUFFER, 0);
}
void ColorBufferToRDRAM_GL::_destroyBuffers(void)
{
}
bool ColorBufferToRDRAM_GL::_readPixels(GLint _x0, GLint _y0, GLsizei _width, GLsizei _height, u32 _size, bool _sync)
{
GLenum colorFormat, colorType, colorFormatBytes;

12
src/BufferCopy/ColorBufferToRDRAM_GLES.cpp
View File

@ -26,7 +26,6 @@ private:
bool _readPixels(GLint _x0, GLint _y0, GLsizei _width, GLsizei _height, u32 _size, bool _sync) override;
void _cleanUp() override;
void _initBuffers(void) override;
void _destroyBuffers(void) override;
GraphicBuffer* m_window;
EGLImageKHR m_image;
@ -62,16 +61,11 @@ void ColorBufferToRDRAM_GLES::_initBuffers(void)
m_window->reallocate(m_pTexture->realWidth, m_pTexture->realHeight,
PIXEL_FORMAT_RGBA_8888, GraphicBuffer::USAGE_SW_READ_OFTEN | GraphicBuffer::USAGE_HW_TEXTURE);
EGLint eglImgAttrs[] = { EGL_IMAGE_PRESERVED_KHR, EGL_TRUE, EGL_NONE, EGL_NONE };
m_image = eglCreateImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY), EGL_NO_CONTEXT,
EGL_NATIVE_BUFFER_ANDROID, (EGLClientBuffer)m_window->getNativeBuffer(), eglImgAttrs);
}
void ColorBufferToRDRAM_GLES::_destroyBuffers(void)
{
if(m_image != 0)
if(m_image == 0)
{
eglDestroyImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY), m_image);
m_image = 0;
m_image = eglCreateImageKHR(eglGetDisplay(EGL_DEFAULT_DISPLAY), EGL_NO_CONTEXT,
EGL_NATIVE_BUFFER_ANDROID, (EGLClientBuffer)m_window->getNativeBuffer(), eglImgAttrs);
}
}