Add ShaderManager and Shader class.

5 files changed, 186 insertions, 1 deletions

diff --git a/src/render/mgltypes.h b/src/render/mgltypes.h
index 65fd8a978..497fa6afa 100644
--- a/src/render/mgltypes.h
+++ b/src/render/mgltypes.h
@@ -83,7 +83,7 @@ typedef void (APIENTRY *glDeleteBuffers_t) (GLsizei n, GLuint *buffers);
 typedef void (APIENTRY *glBindBuffer_t) (GLenum target, GLuint buffer);
 typedef void (APIENTRY *glBufferData_t) (GLenum target, GLsizeiptr size,
     const GLvoid *data, GLenum usage);
-typedef void (APIENTRY *glCreateShader_t) (GLenum shaderType);
+typedef GLuint (APIENTRY *glCreateShader_t) (GLenum shaderType);
 typedef void (APIENTRY *glDeleteShader_t) (GLenum shader);
 typedef void (APIENTRY *glGetShaderiv_t) (GLuint shader,
     GLenum pname, GLint *params);
diff --git a/src/render/shaders/shader.cpp b/src/render/shaders/shader.cpp
new file mode 100644
index 000000000..9a0d317a5
--- /dev/null
+++ b/src/render/shaders/shader.cpp
@@ -0,0 +1,39 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef USE_OPENGL
+
+#include "render/shaders/shader.h"
+
+#include "render/mgl.h"
+
+Shader::Shader(const unsigned int id) :
+    Resource(),
+    mShaderId(id)
+{
+}
+
+Shader::~Shader()
+{
+    if (mShaderId)
+        mglDeleteShader(mShaderId);
+}
+
+#endif  // USE_OPENGL
diff --git a/src/render/shaders/shader.h b/src/render/shaders/shader.h
new file mode 100644
index 000000000..6ee964704
--- /dev/null
+++ b/src/render/shaders/shader.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RENDER_SHADER_H
+#define RENDER_SHADER_H
+
+#ifdef USE_OPENGL
+
+#include "resources/resource.h"
+
+class Shader final : public Resource
+{
+    public:
+        Shader(const unsigned int id);
+
+        ~Shader();
+
+        A_DELETE_COPY(Shader)
+
+    protected:
+        unsigned int mShaderId;
+};
+
+#endif  // USE_OPENGL
+#endif  // RENDER_SHADER_H
diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp
new file mode 100644
index 000000000..85c5bf64e
--- /dev/null
+++ b/src/render/shaders/shadersmanager.cpp
@@ -0,0 +1,62 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "render/shaders/shadersmanager.h"
+
+#ifdef USE_OPENGL
+
+#include "logger.h"
+#include "settings.h"
+
+#include "render/mgl.h"
+
+#include "render/shaders/shader.h"
+
+#include "utils/files.h"
+
+#include "debug.h"
+
+ShadersManager shaders;
+
+Shader *ShadersManager::createShader(const unsigned int type,
+                                     const std::string &fileName)
+{
+    const std::string str = Files::loadTextFileString(fileName);
+    const char *ptrStr = str.c_str();
+    GLuint shaderId = mglCreateShader(type);
+    mglShaderSource(shaderId, 1, &ptrStr, nullptr);
+    mglCompileShader(shaderId);
+
+    GLint isCompiled = 0;
+    mglGetShaderiv(shaderId, GL_COMPILE_STATUS, &isCompiled);
+    if (isCompiled == GL_TRUE)
+        return new Shader(shaderId);
+    GLint len = 0;
+    mglGetShaderiv(shaderId, GL_INFO_LOG_LENGTH, &len);
+    char *buf = new char[len + 1];
+    mglGetShaderInfoLog(shaderId, len, &len, buf);
+    buf[len] = 0;
+    logger->log("Shader '%s' compilation error: %s", fileName.c_str(), buf);
+    delete [] buf;
+    mglDeleteShader(shaderId);
+    return nullptr;
+}
+
+#endif
diff --git a/src/render/shaders/shadersmanager.h b/src/render/shaders/shadersmanager.h
new file mode 100644
index 000000000..0ad8556c8
--- /dev/null
+++ b/src/render/shaders/shadersmanager.h
@@ -0,0 +1,42 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2014  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef RENDER_SHADERSMANAGER_H
+#define RENDER_SHADERSMANAGER_H
+
+#ifdef USE_OPENGL
+
+#include <string>
+
+#include "localconsts.h"
+
+struct Shader;
+
+class ShadersManager final
+{
+    public:
+        Shader *createShader(const unsigned int type,
+                             const std::string &fileName) A_WARN_UNUSED;
+};
+
+extern ShadersManager shaders;
+
+#endif  // USE_OPENGL
+#endif  // RENDER_SHADERSMANAGER_H