Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarafei Praliaskouski <komzpa@mapswith.me>2013-05-27 17:21:43 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:55:21 +0300
commit06affcead06490128f456d48d04b3024a51aaf8e (patch)
tree2a20e2e3f523d2fe8c6611e508b3f19c5b111935 /graphics
parent43f5a24edd716244f4d106adc9c2118f0dda95eb (diff)
[graphics] typo fix
Diffstat (limited to 'graphics')
-rw-r--r--graphics/opengl/framebuffer.cpp4
-rw-r--r--graphics/opengl/opengl.cpp2
-rw-r--r--graphics/opengl/opengl.hpp2
-rw-r--r--graphics/opengl/renderer.cpp10
4 files changed, 9 insertions, 9 deletions
diff --git a/graphics/opengl/framebuffer.cpp b/graphics/opengl/framebuffer.cpp
index e4b18fad3f..064a1a4d43 100644
--- a/graphics/opengl/framebuffer.cpp
+++ b/graphics/opengl/framebuffer.cpp
@@ -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));
diff --git a/graphics/opengl/opengl.cpp b/graphics/opengl/opengl.cpp
index 38ca1d352a..3cfe6b9414 100644
--- a/graphics/opengl/opengl.cpp
+++ b/graphics/opengl/opengl.cpp
@@ -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);
diff --git a/graphics/opengl/opengl.hpp b/graphics/opengl/opengl.hpp
index 7c1c780f4a..0af36d61d6 100644
--- a/graphics/opengl/opengl.hpp
+++ b/graphics/opengl/opengl.hpp
@@ -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
diff --git a/graphics/opengl/renderer.cpp b/graphics/opengl/renderer.cpp
index 687d3b381a..fd6d49fc14 100644
--- a/graphics/opengl/renderer.cpp
+++ b/graphics/opengl/renderer.cpp
@@ -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)