Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed framebuffer binding messed up after a call to Texture::copyToImage() on OpenGL ES

Browse Source
This commit is contained in:
Laurent Gomila 2013-10-22 23:04:10 +02:00 committed by Jonathan De Wachter
parent 218c0897c8
commit 67177ce55c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Graphics/GLExtensions.hpp
View File

@ -48,6 +48,7 @@
#define glFramebufferTexture2D glFramebufferTexture2DOES #define glFramebufferTexture2D glFramebufferTexture2DOES
#define glCheckFramebufferStatus glCheckFramebufferStatusOES #define glCheckFramebufferStatus glCheckFramebufferStatusOES
#define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES #define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
#define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_OES
#define GL_RENDERBUFFER GL_RENDERBUFFER_OES #define GL_RENDERBUFFER GL_RENDERBUFFER_OES
#define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_OES #define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_OES
#define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES #define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_OES
@ -75,6 +76,7 @@
#define glFramebufferTexture2D glFramebufferTexture2DEXT #define glFramebufferTexture2D glFramebufferTexture2DEXT
#define glCheckFramebufferStatus glCheckFramebufferStatusEXT #define glCheckFramebufferStatus glCheckFramebufferStatusEXT
#define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT #define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
#define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
#define GL_RENDERBUFFER GL_RENDERBUFFER_EXT #define GL_RENDERBUFFER GL_RENDERBUFFER_EXT
#define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT #define GL_COLOR_ATTACHMENT0 GL_COLOR_ATTACHMENT0_EXT
#define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT #define GL_DEPTH_ATTACHMENT GL_DEPTH_ATTACHMENT_EXT

7
src/SFML/Graphics/Texture.cpp
View File

@ -267,17 +267,22 @@ Image Texture::copyToImage() const
std::vector<Uint8> pixels(m_size.x * m_size.y * 4); std::vector<Uint8> pixels(m_size.x * m_size.y * 4);
#ifdef SFML_OPENGL_ES #ifdef SFML_OPENGL_ES
// OpenGL ES doesn't have the glGetTexImage function, the only way to read // OpenGL ES doesn't have the glGetTexImage function, the only way to read
// from a texture is to bind it to a FBO and use glReadPixels // from a texture is to bind it to a FBO and use glReadPixels
GLuint frameBuffer = 0; GLuint frameBuffer = 0;
glCheck(glGenFramebuffers(1, &frameBuffer)); glCheck(glGenFramebuffers(1, &frameBuffer));
if (frameBuffer) if (frameBuffer)
{ {
GLint previousFrameBuffer;
glCheck(glGetIntegerv(GL_FRAMEBUFFER_BINDING, &previousFrameBuffer));
glCheck(glBindFramebuffer(GL_FRAMEBUFFER, frameBuffer)); glCheck(glBindFramebuffer(GL_FRAMEBUFFER, frameBuffer));
glCheck(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0)); glCheck(glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, m_texture, 0));
glCheck(glReadPixels(0, 0, m_size.x, m_size.y, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[0])); glCheck(glReadPixels(0, 0, m_size.x, m_size.y, GL_RGBA, GL_UNSIGNED_BYTE, &pixels[0]));
glCheck(glDeleteFramebuffers(1, &frameBuffer)); glCheck(glDeleteFramebuffers(1, &frameBuffer));
glCheck(glBindFramebuffer(GL_FRAMEBUFFER, previousFrameBuffer));
} }
#else #else