pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[graphics] typo fix

Browse source
This commit is contained in:
Darafei Praliaskouski 2013-05-27 16:21:43 +03:00 • committed by Alex Zolotarev
parent 43f5a24edd
commit 06affcead0
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
graphics/opengl/framebuffer.cpp
View file

@ -115,9 +115,9 @@ namespace graphics
if (res == GL_FRAMEBUFFER_UNSUPPORTED_MWM)
LOG(LINFO, ("unsupported combination of attached target formats. could be possibly skipped. id=", m_id));
else if (res == GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_MWM)
LOG(LINFO, ("incomplete attachement. id=", m_id));
LOG(LINFO, ("incomplete attachment. id=", m_id));
else if (res == GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_MWM)
LOG(LINFO, ("incomplete missing attachement. id=", m_id));
LOG(LINFO, ("incomplete missing attachment. id=", m_id));
else if (res == GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_MWM)
{
LOG(LINFO, ("incomplete dimensions. id=", m_id));

2
graphics/opengl/opengl.cpp
View file

@ -124,7 +124,7 @@ namespace graphics
void (OPENGL_CALLING_CONVENTION * glGenFramebuffersFn) (GLsizei n, GLuint *framebuffers);
void (OPENGL_CALLING_CONVENTION * glDeleteFramebuffersFn) (GLsizei n, const GLuint *framebuffers);
GLenum (OPENGL_CALLING_CONVENTION * glCheckFramebufferStatusFn) (GLenum target);
void (OPENGL_CALLING_CONVENTION * glDiscardFramebufferFn)(GLenum target, GLsizei numAttachments, GLenum const * attachements) = 0;
void (OPENGL_CALLING_CONVENTION * glDiscardFramebufferFn)(GLenum target, GLsizei numAttachments, GLenum const * attachments) = 0;
void (OPENGL_CALLING_CONVENTION * glGenRenderbuffersFn) (GLsizei n, GLuint *renderbuffers);
void (OPENGL_CALLING_CONVENTION * glDeleteRenderbuffersFn) (GLsizei n, const GLuint *renderbuffers);

2
graphics/opengl/opengl.hpp
View file

@ -135,7 +135,7 @@ namespace graphics
extern void (OPENGL_CALLING_CONVENTION * glGenFramebuffersFn) (GLsizei n, GLuint *framebuffers);
extern void (OPENGL_CALLING_CONVENTION * glDeleteFramebuffersFn) (GLsizei n, const GLuint *framebuffers);
extern GLenum (OPENGL_CALLING_CONVENTION * glCheckFramebufferStatusFn) (GLenum target);
extern void (OPENGL_CALLING_CONVENTION * glDiscardFramebufferFn)(GLenum target, GLsizei numAttachments, GLenum const * attachements);
extern void (OPENGL_CALLING_CONVENTION * glDiscardFramebufferFn)(GLenum target, GLsizei numAttachments, GLenum const * attachments);
// renderbuffer extensions

10
graphics/opengl/renderer.cpp
View file

@ -119,13 +119,13 @@ namespace graphics
void Renderer::DiscardFramebuffer::perform()
{
GLenum attachements[2];
int numAttachements = 0;
GLenum attachments[2];
int numAttachments = 0;
if (m_doDiscardColor)
attachements[numAttachements++] = GL_COLOR_ATTACHMENT0_MWM;
attachments[numAttachments++] = GL_COLOR_ATTACHMENT0_MWM;
if (m_doDiscardDepth)
attachements[numAttachements++] = GL_DEPTH_ATTACHMENT_MWM;
glDiscardFramebufferFn(GL_FRAMEBUFFER_MWM, numAttachements, attachements);
attachments[numAttachments++] = GL_DEPTH_ATTACHMENT_MWM;
glDiscardFramebufferFn(GL_FRAMEBUFFER_MWM, numAttachments, attachments);
}
void Renderer::discardFramebuffer(bool doDiscardColor, bool doDiscardDepth)