Style update: add spaces around assignment operators

[libs/gl.git] / source / program.cpp

diff --git a/source/program.cpp b/source/program.cpp
index f0fffb1f3a82dc98f28d7dd24dfd53adb496cbb0..ef1f4c8a63fc0696f363bf21e10b60cb8fe4b80f 100644 (file)
--- a/source/program.cpp
+++ b/source/program.cpp
@@ -5,6 +5,7 @@ Copyright © 2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <algorithm>
 #include "arb_shader_objects.h"
 #include "arb_vertex_shader.h"
 #include "except.h"
@@ -18,28 +19,29 @@ namespace Msp {
 namespace GL {
 
 Program::Program():
-       del_shaders(false),
-       linked(false)
+       del_shaders(false)
 {
-       require_extension("GL_ARB_shader_objects");
-       require_extension("GL_ARB_vertex_shader");
-
-       id=glCreateProgramObjectARB();
+       init();
 }
 
 Program::Program(const string &vert, const string &frag):
-       del_shaders(true),
-       linked(false)
+       del_shaders(true)
 {
-       require_extension("GL_ARB_shader_objects");
-       require_extension("GL_ARB_vertex_shader");
+       init();
 
-       id=glCreateProgramObjectARB();
        attach_shader(*new Shader(VERTEX_SHADER, vert));
        attach_shader(*new Shader(FRAGMENT_SHADER, frag));
        link();
 }
 
+void Program::init()
+{
+       static RequireExtension _ext("GL_ARB_shader_objects");
+
+       linked = false;
+       id = glCreateProgramObjectARB();
+}
+
 Program::~Program()
 {
        if(del_shaders)
@@ -61,7 +63,7 @@ void Program::attach_shader(Shader &shader)
 
 void Program::detach_shader(Shader &shader)
 {
-       list<Shader *>::iterator i=remove(shaders.begin(), shaders.end(), &shader);
+       list<Shader *>::iterator i = remove(shaders.begin(), shaders.end(), &shader);
        if(i!=shaders.end())
        {
                shaders.erase(i, shaders.end());
@@ -71,23 +73,24 @@ void Program::detach_shader(Shader &shader)
 
 void Program::set_del_shaders(bool ds)
 {
-       del_shaders=ds;
+       del_shaders = ds;
 }
 
-void Program::bind_attribute(int index, const string &name)
+void Program::bind_attribute(unsigned index, const string &name)
 {
+       static RequireExtension _ext("GL_ARB_vertex_shader");
        glBindAttribLocationARB(id, index, name.c_str());
 }
 
-bool Program::link()
+void Program::link()
 {
        for(list<Shader *>::iterator i=shaders.begin(); i!=shaders.end(); ++i)
-               if(!(*i)->get_compiled() && !(*i)->compile())
-                       return false;
+               if(!(*i)->get_compiled())
+                       (*i)->compile();
 
        glLinkProgramARB(id);
-       linked=get_param(GL_LINK_STATUS);
-       return linked;
+       if(!(linked = get_param(GL_LINK_STATUS)))
+               throw CompileError(get_info_log());
 }
 
 int Program::get_param(GLenum param) const
@@ -99,19 +102,19 @@ int Program::get_param(GLenum param) const
 
 string Program::get_info_log() const
 {
-       sizei len=get_param(GL_INFO_LOG_LENGTH);
+       GLsizei len = get_param(GL_INFO_LOG_LENGTH);
        char log[len+1];
-       glGetInfoLogARB(id, len+1, reinterpret_cast<GLsizei *>(&len), log);
+       glGetInfoLogARB(id, len+1, &len, log);
        return string(log, len);
 }
 
-void Program::bind()
+void Program::bind() const
 {
        if(!linked)
                throw InvalidState("Program is not linked");
 
        glUseProgramObjectARB(id);
-       cur_prog=this;
+       cur_prog = this;
 }
 
 int Program::get_uniform_location(const string &n) const
@@ -119,47 +122,12 @@ int Program::get_uniform_location(const string &n) const
        return glGetUniformLocationARB(id, n.c_str());
 }
 
-void Program::uniform(int i, int v)
-{
-       glUniform1iARB(i, v);
-}
-
-void Program::uniform(int i, float x)
-{
-       glUniform1fARB(i, x);
-}
-
-void Program::uniform(int i, float x, float y)
-{
-       glUniform2fARB(i, x, y);
-}
-
-void Program::uniform(int i, float x, float y, float z)
-{
-       glUniform3fARB(i, x, y, z);
-}
-
-void Program::uniform(int i, float x, float y, float z, float w)
-{
-       glUniform4fARB(i, x, y, z, w);
-}
-
-void Program::uniform4(int i, const float *v)
-{
-       glUniform4fvARB(i, 1, v);
-}
-
-void Program::uniform_matrix4(int i, const float *v)
-{
-       glUniformMatrix4fvARB(i, 1, false, v);
-}
-
 void Program::unbind()
 {
        if(cur_prog)
        {
                glUseProgramObjectARB(0);
-               cur_prog=0;
+               cur_prog = 0;
        }
 }
 
@@ -169,31 +137,37 @@ void Program::maybe_bind()
                bind();
 }
 
-Program *Program::cur_prog=0;
+const Program *Program::cur_prog = 0;
 
 
 Program::Loader::Loader(Program &p):
-       prog(p)
+       DataFile::ObjectLoader<Program>(p)
 {
-       prog.set_del_shaders(true);
+       obj.set_del_shaders(true);
 
        add("vertex_shader",   &Loader::vertex_shader);
        add("fragment_shader", &Loader::fragment_shader);
+       add("attribute",       &Loader::attribute);
 }
 
-Program::Loader::~Loader()
+void Program::Loader::vertex_shader(const string &src)
 {
-       prog.link();
+       obj.attach_shader(*new Shader(VERTEX_SHADER, src));
 }
 
-void Program::Loader::vertex_shader(const string &src)
+void Program::Loader::fragment_shader(const string &src)
 {
-       prog.attach_shader(*new Shader(VERTEX_SHADER, src));
+       obj.attach_shader(*new Shader(FRAGMENT_SHADER, src));
 }
 
-void Program::Loader::fragment_shader(const string &src)
+void Program::Loader::attribute(unsigned i, const string &n)
+{
+       obj.bind_attribute(i, n);
+}
+
+void Program::Loader::finish()
 {
-       prog.attach_shader(*new Shader(FRAGMENT_SHADER, src));
+       obj.link();
 }
 
 } // namespace GL