summaryrefslogtreecommitdiff
path: root/src/render/vertexes
diff options
context:
space:
mode:
Diffstat (limited to 'src/render/vertexes')
-rw-r--r--src/render/vertexes/imagecollection.cpp4
-rw-r--r--src/render/vertexes/imagecollection.h3
-rw-r--r--src/render/vertexes/imagevertexes.cpp2
-rw-r--r--src/render/vertexes/imagevertexes.h3
-rw-r--r--src/render/vertexes/openglgraphicsvertexes.cpp2
-rw-r--r--src/render/vertexes/openglgraphicsvertexes.h6
6 files changed, 11 insertions, 9 deletions
diff --git a/src/render/vertexes/imagecollection.cpp b/src/render/vertexes/imagecollection.cpp
index 47c45b18c..6e8e74877 100644
--- a/src/render/vertexes/imagecollection.cpp
+++ b/src/render/vertexes/imagecollection.cpp
@@ -27,7 +27,7 @@
ImageCollection::ImageCollection() :
#ifdef USE_OPENGL
currentGLImage(0),
-#endif
+#endif // USE_OPENGL
currentImage(nullptr),
currentVert(nullptr),
draws()
@@ -43,7 +43,7 @@ void ImageCollection::clear() restrict2
{
#ifdef USE_OPENGL
currentGLImage = 0;
-#endif
+#endif // USE_OPENGL
currentImage = nullptr;
currentVert = nullptr;
diff --git a/src/render/vertexes/imagecollection.h b/src/render/vertexes/imagecollection.h
index 922fb6bd5..211a2959e 100644
--- a/src/render/vertexes/imagecollection.h
+++ b/src/render/vertexes/imagecollection.h
@@ -40,7 +40,8 @@ class ImageCollection final
#ifdef USE_OPENGL
GLuint currentGLImage;
-#endif
+#endif // USE_OPENGL
+
const Image *restrict currentImage;
ImageVertexes *restrict currentVert;
diff --git a/src/render/vertexes/imagevertexes.cpp b/src/render/vertexes/imagevertexes.cpp
index 675078faf..6a43baa34 100644
--- a/src/render/vertexes/imagevertexes.cpp
+++ b/src/render/vertexes/imagevertexes.cpp
@@ -28,7 +28,7 @@ ImageVertexes::ImageVertexes() :
image(nullptr),
#ifdef USE_OPENGL
ogl(),
-#endif
+#endif // USE_OPENGL
sdl()
{
sdl.reserve(30);
diff --git a/src/render/vertexes/imagevertexes.h b/src/render/vertexes/imagevertexes.h
index 16d50f158..74c1baa30 100644
--- a/src/render/vertexes/imagevertexes.h
+++ b/src/render/vertexes/imagevertexes.h
@@ -47,7 +47,8 @@ class ImageVertexes final
const Image *restrict image;
#ifdef USE_OPENGL
OpenGLGraphicsVertexes ogl;
-#endif
+#endif // USE_OPENGL
+
DoubleRects sdl;
};
diff --git a/src/render/vertexes/openglgraphicsvertexes.cpp b/src/render/vertexes/openglgraphicsvertexes.cpp
index ee442355f..b60efbc4f 100644
--- a/src/render/vertexes/openglgraphicsvertexes.cpp
+++ b/src/render/vertexes/openglgraphicsvertexes.cpp
@@ -222,4 +222,4 @@ GLint *OpenGLGraphicsVertexes::continueIntTexArray() restrict2
}
return mIntTexArray;
}
-#endif
+#endif // USE_OPENGL
diff --git a/src/render/vertexes/openglgraphicsvertexes.h b/src/render/vertexes/openglgraphicsvertexes.h
index 853161b87..ea2ff86d2 100644
--- a/src/render/vertexes/openglgraphicsvertexes.h
+++ b/src/render/vertexes/openglgraphicsvertexes.h
@@ -25,12 +25,12 @@
#ifdef ANDROID
#include <GLES/gl.h>
-#else
+#else // ANDROID
#ifndef USE_SDL2
#define GL_GLEXT_PROTOTYPES 1
-#endif
+#endif // USE_SDL2
#include <SDL_opengl.h>
-#endif
+#endif // ANDROID
#include <vector>