Use DataType instead of GLenum for Program variable types

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

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 6cad69c4e322200b86b7f439f239e01113fa90ea..dd155d5c5c9ed4c3296591bd1ea645b7018e46b8 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -35,7 +35,7 @@ Program::Program(const std::string &source)
 {
        init();
 
-       Module mod;
+       GlslModule mod;
        mod.set_source(source);
        add_stages(mod);
 
@@ -78,6 +78,18 @@ Program::~Program()
        glDeleteProgram(id);
 }
 
+void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
+{
+       if(!stage_ids.empty())
+               throw invalid_operation("Program::add_stages");
+
+       switch(mod.get_format())
+       {
+       case Module::GLSL: return add_glsl_stages(static_cast<const GlslModule &>(mod), spec_values);
+       default: throw invalid_argument("Program::add_stages");
+       }
+}
+
 unsigned Program::add_stage(GLenum type)
 {
        switch(type)
@@ -95,12 +107,12 @@ unsigned Program::add_stage(GLenum type)
        return stage_id;
 }
 
-void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
+void Program::add_glsl_stages(const GlslModule &mod, const map<string, int> &spec_values)
 {
        module = &mod;
 
        SL::Compiler compiler;
-       compiler.set_source(module->get_prepared_source(), "<module>");
+       compiler.set_source(mod.get_prepared_source(), "<module>");
        compiler.specialize(spec_values);
        compiler.compile(SL::Compiler::PROGRAM);
 #ifdef DEBUG
@@ -140,11 +152,11 @@ void Program::add_stages(const Module &mod, const map<string, int> &spec_values)
                                glBindFragDataLocation(id, j->second, j->first.c_str());
                }
 
-               compile_stage(stage_id);
+               compile_glsl_stage(stage_id);
        }
 }
 
-void Program::compile_stage(unsigned stage_id)
+void Program::compile_glsl_stage(unsigned stage_id)
 {
        glCompileShader(stage_id);
        bool compiled = get_shader_i(stage_id, GL_COMPILE_STATUS);
@@ -153,8 +165,8 @@ void Program::compile_stage(unsigned stage_id)
        string info_log(info_log_len+1, 0);
        glGetShaderInfoLog(stage_id, info_log_len+1, &info_log_len, &info_log[0]);
        info_log.erase(info_log_len);
-       if(module)
-               info_log = module->get_source_map().translate_errors(info_log);
+       if(module && module->get_format()==Module::GLSL)
+               info_log = static_cast<const GlslModule *>(module)->get_source_map().translate_errors(info_log);
 
        if(!compiled)
                throw compile_error(info_log);
@@ -172,7 +184,7 @@ void Program::attach_shader(Shader &shader)
        if(!shader_id)
                throw invalid_argument("Program::attach_shader");
        stage_ids.push_back(shader_id);
-       compile_stage(shader_id);
+       compile_glsl_stage(shader_id);
 }
 
 void Program::attach_shader_owned(Shader *shader)
@@ -211,6 +223,9 @@ void Program::bind_fragment_data(unsigned index, const string &name)
 
 void Program::link()
 {
+       if(stage_ids.empty())
+               throw invalid_operation("Program::link");
+
        uniforms.clear();
 
        glLinkProgram(id);
@@ -220,7 +235,8 @@ void Program::link()
        string info_log(info_log_len+1, 0);
        glGetProgramInfoLog(id, info_log_len+1, &info_log_len, &info_log[0]);
        info_log.erase(info_log_len);
-       info_log = module->get_source_map().translate_errors(info_log);
+       if(module && module->get_format()==Module::GLSL)
+               info_log = static_cast<const GlslModule *>(module)->get_source_map().translate_errors(info_log);
 
        if(!linked)
                throw compile_error(info_log);
@@ -238,21 +254,6 @@ void Program::link()
                require_type(i->second.type);
 }
 
-void Program::require_type(GLenum t)
-{
-       switch(t)
-       {
-       case GL_FLOAT_MAT2x3:
-       case GL_FLOAT_MAT2x4:
-       case GL_FLOAT_MAT3x2:
-       case GL_FLOAT_MAT3x4:
-       case GL_FLOAT_MAT4x2:
-       case GL_FLOAT_MAT4x3:
-               { static Require _req(NV_non_square_matrices); }
-               break;
-       }
-}
-
 void Program::query_uniforms()
 {
        unsigned count = get_program_i(id, GL_ACTIVE_UNIFORMS);
@@ -277,7 +278,7 @@ void Program::query_uniforms()
                        info.size = size;
                        info.array_stride = 0;
                        info.matrix_stride = 0;
-                       info.type = type;
+                       info.type = from_gl_type(type);
                        uniforms_by_index[i] = &info;
                }
        }
@@ -354,10 +355,8 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
                indices2.clear();
                for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
                {
-                       GLenum t = uniforms_by_index[*j]->type;
-                       if(t==GL_FLOAT_MAT4 || t==GL_FLOAT_MAT3 || t==GL_FLOAT_MAT2 ||
-                               t==GL_FLOAT_MAT2x3 || t==GL_FLOAT_MAT2x4 || t==GL_FLOAT_MAT3x2 ||
-                               t==GL_FLOAT_MAT3x4 || t==GL_FLOAT_MAT4x2 || t==GL_FLOAT_MAT4x3)
+                       DataType t = uniforms_by_index[*j]->type;
+                       if(is_matrix(t))
                                indices2.push_back(*j);
                }
                if(!indices2.empty())
@@ -397,7 +396,7 @@ void Program::query_attributes()
                        info.name = name;
                        info.location = glGetAttribLocation(id, name);
                        info.size = size;
-                       info.type = type;
+                       info.type = from_gl_type(type);
                }
        }
 }