[colobot] 291/377: Fixed colobot-lint warnings
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:34:28 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 1b21c387bbafdecfa61d5a004de713087979715f
Author: krzys-h <krzys_h at interia.pl>
Date: Thu Feb 18 12:20:40 2016 +0100
Fixed colobot-lint warnings
---
src/graphics/opengl/gl33device.h | 2 --
src/graphics/opengl/glutil.h | 5 ++++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h
index 051f7a4..9bb34e8 100644
--- a/src/graphics/opengl/gl33device.h
+++ b/src/graphics/opengl/gl33device.h
@@ -261,8 +261,6 @@ private:
//! Currently bound VAO
GLuint m_currentVAO = 0;
- //! Total memory allocated in textures
- unsigned long m_textureMemory = 0;
//! Total memory allocated in VBOs
unsigned long m_vboMemory = 0;
diff --git a/src/graphics/opengl/glutil.h b/src/graphics/opengl/glutil.h
index 8f96d8d..cef820d 100644
--- a/src/graphics/opengl/glutil.h
+++ b/src/graphics/opengl/glutil.h
@@ -27,6 +27,7 @@
#include "graphics/core/device.h"
#include "math/intpoint.h"
+#include "math/vector.h"
#include <GL/glew.h>
@@ -60,7 +61,9 @@ int GetOpenGLVersion();
// \return First digit is major part, second digit is minor part.
int GetOpenGLVersion(int &major, int &minor);
-bool AreExtensionsSupported(std::string extensions);
+//! Checks if extensions in space-delimited list are supported
+// \return true if all extensions are supported
+bool AreExtensionsSupported(std::string list);
//! Returns information about graphics card
std::string GetHardwareInfo(bool full = false);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list