summaryrefslogtreecommitdiff
path: root/src/render/shaders
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-20 17:42:33 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-20 21:11:13 +0300
commit8963c582f2d2f2879b69821337a5c396f9712a06 (patch)
tree9cc8f89e3116bb09ad3f4a30f7552fad6e83fe57 /src/render/shaders
parent65f5f9343a75a5adabdf840db93106cda71c703f (diff)
downloadmanaverse-8963c582f2d2f2879b69821337a5c396f9712a06.tar.gz
manaverse-8963c582f2d2f2879b69821337a5c396f9712a06.tar.bz2
manaverse-8963c582f2d2f2879b69821337a5c396f9712a06.tar.xz
manaverse-8963c582f2d2f2879b69821337a5c396f9712a06.zip
Fix code style.
Diffstat (limited to 'src/render/shaders')
-rw-r--r--src/render/shaders/shader.cpp2
-rw-r--r--src/render/shaders/shader.h8
-rw-r--r--src/render/shaders/shaderprogram.cpp2
-rw-r--r--src/render/shaders/shaderprogram.h6
-rw-r--r--src/render/shaders/shadersmanager.cpp1
-rw-r--r--src/render/shaders/shadersmanager.h6
6 files changed, 14 insertions, 11 deletions
diff --git a/src/render/shaders/shader.cpp b/src/render/shaders/shader.cpp
index 9a0d317a5..242a9fbdc 100644
--- a/src/render/shaders/shader.cpp
+++ b/src/render/shaders/shader.cpp
@@ -24,6 +24,8 @@
#include "render/mgl.h"
+#include "debug.h"
+
Shader::Shader(const unsigned int id) :
Resource(),
mShaderId(id)
diff --git a/src/render/shaders/shader.h b/src/render/shaders/shader.h
index adcc29702..c5bd2d490 100644
--- a/src/render/shaders/shader.h
+++ b/src/render/shaders/shader.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_SHADER_H
-#define RENDER_SHADER_H
+#ifndef RENDER_SHADERS_SHADER_H
+#define RENDER_SHADERS_SHADER_H
#ifdef USE_OPENGL
@@ -28,7 +28,7 @@
class Shader final : public Resource
{
public:
- Shader(const unsigned int id);
+ explicit Shader(const unsigned int id);
~Shader();
@@ -42,4 +42,4 @@ class Shader final : public Resource
};
#endif // USE_OPENGL
-#endif // RENDER_SHADER_H
+#endif // RENDER_SHADERS_SHADER_H
diff --git a/src/render/shaders/shaderprogram.cpp b/src/render/shaders/shaderprogram.cpp
index 7d79e5cb9..fd2db9ba8 100644
--- a/src/render/shaders/shaderprogram.cpp
+++ b/src/render/shaders/shaderprogram.cpp
@@ -26,6 +26,8 @@
#include "render/shaders/shader.h"
+#include "debug.h"
+
ShaderProgram::ShaderProgram(const unsigned int id,
Shader *const vertex,
Shader *const fragment) :
diff --git a/src/render/shaders/shaderprogram.h b/src/render/shaders/shaderprogram.h
index a0781d684..5289567aa 100644
--- a/src/render/shaders/shaderprogram.h
+++ b/src/render/shaders/shaderprogram.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_SHADERPROGRAM_H
-#define RENDER_SHADERPROGRAM_H
+#ifndef RENDER_SHADERS_SHADERPROGRAM_H
+#define RENDER_SHADERS_SHADERPROGRAM_H
#ifdef USE_OPENGL
@@ -48,4 +48,4 @@ class ShaderProgram final : public Resource
};
#endif // USE_OPENGL
-#endif // RENDER_SHADERPROGRAM_H
+#endif // RENDER_SHADERS_SHADERPROGRAM_H
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
index 2c37f56d5..efaa97c77 100644
--- a/src/render/shaders/shadersmanager.cpp
+++ b/src/render/shaders/shadersmanager.cpp
@@ -24,7 +24,6 @@
#include "configuration.h"
#include "logger.h"
-#include "settings.h"
#include "render/mgl.h"
diff --git a/src/render/shaders/shadersmanager.h b/src/render/shaders/shadersmanager.h
index 50e714aba..841f3f072 100644
--- a/src/render/shaders/shadersmanager.h
+++ b/src/render/shaders/shadersmanager.h
@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef RENDER_SHADERSMANAGER_H
-#define RENDER_SHADERSMANAGER_H
+#ifndef RENDER_SHADERS_SHADERSMANAGER_H
+#define RENDER_SHADERS_SHADERSMANAGER_H
#ifdef USE_OPENGL
@@ -46,4 +46,4 @@ class ShadersManager final
extern ShadersManager shaders;
#endif // USE_OPENGL
-#endif // RENDER_SHADERSMANAGER_H
+#endif // RENDER_SHADERS_SHADERSMANAGER_H