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

Correct issues in ColorBufferReaderWithEGLImage.

Browse Source 
Disable its use for now.
This commit is contained in:
Francisco Zurita 2017-01-29 22:03:41 +07:00 committed by Sergey Lipskiy
parent 38bba9f804
commit b5466c109d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,9 +55,9 @@ u8 * ColorBufferReaderWithEGLImage::readPixels(s32 _x0, s32 _y0, u32 _width, u32
if (!_sync) {
void* ptr;
m_bindTexture->bind(Parameter(GL_TEXTURE_2D), m_pTexture->name);
m_bindTexture->bind(graphics::Parameter(0), graphics::Parameter(GL_TEXTURE_2D), m_pTexture->name);
m_glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, m_image);
m_bindTexture->bind(Parameter(GL_TEXTURE_2D), ObjectHandle());
m_bindTexture->bind(graphics::Parameter(0), graphics::Parameter(GL_TEXTURE_2D), ObjectHandle());
int widthBytes = _width*colorFormatBytes;
int strideBytes = m_pTexture->realWidth * colorFormatBytes;

3
src/Graphics/OpenGLContext/opengl_ColorBufferReaderWithEGLImage.h
View File

@ -8,8 +8,7 @@
#include <EGL/egl.h>
#include <EGL/eglext.h>
typedef void (GL_APIENTRY* PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, EGLImageKHR image);
typedef void (GL_APIENTRY* PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, EGLImageKHR image);
typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, EGLImageKHR image);
using namespace android;

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

@ -269,9 +269,10 @@ graphics::PixelReadBuffer * ContextImpl::createPixelReadBuffer(size_t _sizeInByt
graphics::ColorBufferReader * ContextImpl::createColorBufferReader(CachedTexture * _pTexture)
{
/*
#ifdef EGL
return new ColorBufferReaderWithEGLImage(_pTexture, m_cachedFunctions->getCachedBindTexture());
#endif
#endif*/
if (glBufferStorage != nullptr && glMemoryBarrier != nullptr)
return new ColorBufferReaderWithBufferStorage(_pTexture, m_cachedFunctions->getCachedBindBuffer());