mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-07 03:13:49 +00:00
Correct issues in ColorBufferReaderWithEGLImage.
Disable its use for now.
This commit is contained in:
parent
38bba9f804
commit
b5466c109d
|
@ -55,9 +55,9 @@ u8 * ColorBufferReaderWithEGLImage::readPixels(s32 _x0, s32 _y0, u32 _width, u32
|
||||||
if (!_sync) {
|
if (!_sync) {
|
||||||
void* ptr;
|
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_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 widthBytes = _width*colorFormatBytes;
|
||||||
int strideBytes = m_pTexture->realWidth * colorFormatBytes;
|
int strideBytes = m_pTexture->realWidth * colorFormatBytes;
|
||||||
|
|
||||||
|
|
|
@ -8,8 +8,7 @@
|
||||||
#include <EGL/egl.h>
|
#include <EGL/egl.h>
|
||||||
#include <EGL/eglext.h>
|
#include <EGL/eglext.h>
|
||||||
|
|
||||||
typedef void (GL_APIENTRY* PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, EGLImageKHR image);
|
typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, EGLImageKHR image);
|
||||||
typedef void (GL_APIENTRY* PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, EGLImageKHR image);
|
|
||||||
|
|
||||||
using namespace android;
|
using namespace android;
|
||||||
|
|
||||||
|
|
|
@ -269,9 +269,10 @@ graphics::PixelReadBuffer * ContextImpl::createPixelReadBuffer(size_t _sizeInByt
|
||||||
|
|
||||||
graphics::ColorBufferReader * ContextImpl::createColorBufferReader(CachedTexture * _pTexture)
|
graphics::ColorBufferReader * ContextImpl::createColorBufferReader(CachedTexture * _pTexture)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
#ifdef EGL
|
#ifdef EGL
|
||||||
return new ColorBufferReaderWithEGLImage(_pTexture, m_cachedFunctions->getCachedBindTexture());
|
return new ColorBufferReaderWithEGLImage(_pTexture, m_cachedFunctions->getCachedBindTexture());
|
||||||
#endif
|
#endif*/
|
||||||
|
|
||||||
if (glBufferStorage != nullptr && glMemoryBarrier != nullptr)
|
if (glBufferStorage != nullptr && glMemoryBarrier != nullptr)
|
||||||
return new ColorBufferReaderWithBufferStorage(_pTexture, m_cachedFunctions->getCachedBindBuffer());
|
return new ColorBufferReaderWithBufferStorage(_pTexture, m_cachedFunctions->getCachedBindBuffer());
|
||||||
|
|
Loading…
Reference in New Issue
Block a user