summaryrefslogtreecommitdiff
path: root/src/render
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-13 17:51:41 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-13 17:51:41 +0300
commite17da4740c510e3b28634b02298b661a151987f0 (patch)
treee83d868000186a249c946d80aa478b0119eda494 /src/render
parentd8e20baa960b95c1ca1dfd7b7e6fc457c695d106 (diff)
downloadManaVerse-e17da4740c510e3b28634b02298b661a151987f0.tar.gz
ManaVerse-e17da4740c510e3b28634b02298b661a151987f0.tar.bz2
ManaVerse-e17da4740c510e3b28634b02298b661a151987f0.tar.xz
ManaVerse-e17da4740c510e3b28634b02298b661a151987f0.zip
Fix code style.
Diffstat (limited to 'src/render')
-rw-r--r--src/render/graphics.cpp1
-rw-r--r--src/render/mglemu.cpp2
-rw-r--r--src/render/mglemu.h14
-rw-r--r--src/render/mobileopengl2graphics.cpp5
-rw-r--r--src/render/modernopenglgraphics.cpp3
-rw-r--r--src/render/modernopenglgraphics.h3
-rw-r--r--src/render/normalopenglgraphics.cpp3
7 files changed, 19 insertions, 12 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index ed613000b..a8dde9626 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -542,7 +542,6 @@ bool Graphics::resizeScreen(const int width, const int height)
naclResizeBuffers(mActualWidth, mActualHeight);
glViewport(0, 0, mActualWidth, mActualHeight);
#endif // USE_OPENGL
-
}
else
#endif // __native_client__
diff --git a/src/render/mglemu.cpp b/src/render/mglemu.cpp
index 4b46b341b..216d5ab8f 100644
--- a/src/render/mglemu.cpp
+++ b/src/render/mglemu.cpp
@@ -40,7 +40,7 @@ void APIENTRY emuglTextureSubImage2D(GLuint texture, GLenum target,
format, type, pixels);
}
-void APIENTRY emuglActiveTexture (GLenum texture A_UNUSED)
+void APIENTRY emuglActiveTexture(GLenum texture A_UNUSED)
{
}
diff --git a/src/render/mglemu.h b/src/render/mglemu.h
index 536a02011..bbe1a121e 100644
--- a/src/render/mglemu.h
+++ b/src/render/mglemu.h
@@ -24,14 +24,18 @@
#include "render/mgltypes.h"
-void APIENTRY emuglTextureSubImage2D(GLuint texture, GLenum target,
+void APIENTRY emuglTextureSubImage2D(GLuint texture,
+ GLenum target,
GLint level,
- GLint xoffset, GLint yoffset,
- GLsizei width, GLsizei height,
- GLenum format, GLenum type,
+ GLint xoffset,
+ GLint yoffset,
+ GLsizei width,
+ GLsizei height,
+ GLenum format,
+ GLenum type,
const void *pixels);
-void APIENTRY emuglActiveTexture (GLenum texture);
+void APIENTRY emuglActiveTexture(GLenum texture);
#endif // USE_OPENGL
#endif // RENDER_MGLEMU_H
diff --git a/src/render/mobileopengl2graphics.cpp b/src/render/mobileopengl2graphics.cpp
index 533945fa1..8fdb43655 100644
--- a/src/render/mobileopengl2graphics.cpp
+++ b/src/render/mobileopengl2graphics.cpp
@@ -384,7 +384,8 @@ void MobileOpenGL2Graphics::drawImageCached(const Image *const image A_UNUSED,
{
}
-void MobileOpenGL2Graphics::drawPatternCached(const Image *const image A_UNUSED,
+void MobileOpenGL2Graphics::drawPatternCached(const Image *const image
+ A_UNUSED,
const int x A_UNUSED,
const int y A_UNUSED,
const int w A_UNUSED,
@@ -436,7 +437,7 @@ void MobileOpenGL2Graphics::drawRescaledImage(const Image *const image,
void MobileOpenGL2Graphics::drawPattern(const Image *const image,
const int x, const int y,
const int w, const int h)
-{
+{
drawPatternInline(image, x, y, w, h);
}
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index f9fb6c25f..2c7ecf120 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -1372,4 +1372,5 @@ void ModernOpenGLGraphics::debugBindTexture(const Image *const image A_UNUSED)
}
#endif
-#endif // defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__)
+#endif // defined(USE_OPENGL) && !defined(ANDROID) &&
+ // !defined(__native_client__)
diff --git a/src/render/modernopenglgraphics.h b/src/render/modernopenglgraphics.h
index 5bdb70ea6..03a61858b 100644
--- a/src/render/modernopenglgraphics.h
+++ b/src/render/modernopenglgraphics.h
@@ -135,6 +135,7 @@ class ModernOpenGLGraphics final : public Graphics
#endif
FBOInfo mFbo;
};
-#endif // defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__)
+#endif // defined(USE_OPENGL) && !defined(ANDROID) &&
+ // !defined(__native_client__)
#endif // RENDER_MODERNOPENGLGRAPHICS_H
diff --git a/src/render/normalopenglgraphics.cpp b/src/render/normalopenglgraphics.cpp
index 2c28f4a79..f58e10f92 100644
--- a/src/render/normalopenglgraphics.cpp
+++ b/src/render/normalopenglgraphics.cpp
@@ -1725,4 +1725,5 @@ void NormalOpenGLGraphics::debugBindTexture(const Image *const image A_UNUSED)
}
#endif
-#endif // defined(USE_OPENGL) && !defined(ANDROID) && !defined(__native_client__)
+#endif // defined(USE_OPENGL) && !defined(ANDROID) &&
+ // !defined(__native_client__)