Rename size to array_size in Program variable info structs

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

diff --git a/source/core/program.cpp b/source/core/program.cpp
index 789fa32473392d75a0bd34a13aac7208ddf14637..dd22033e7e4369df1fa7818dbc59f70f29436bb1 100644 (file)
--- a/source/core/program.cpp
+++ b/source/core/program.cpp
@@ -80,6 +80,9 @@ Program::~Program()
 
 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);
@@ -220,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);
@@ -248,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);
@@ -284,10 +275,10 @@ void Program::query_uniforms()
                        UniformInfo &info = uniforms[name];
                        info.block = 0;
                        info.name = name;
-                       info.size = size;
+                       info.array_size = size;
                        info.array_stride = 0;
                        info.matrix_stride = 0;
-                       info.type = type;
+                       info.type = from_gl_type(type);
                        uniforms_by_index[i] = &info;
                }
        }
@@ -352,7 +343,7 @@ void Program::query_uniform_blocks(const vector<UniformInfo *> &uniforms_by_inde
 
                indices2.clear();
                for(vector<int>::iterator j=indices.begin(); j!=indices.end(); ++j)
-                       if(uniforms_by_index[*j]->size>1)
+                       if(uniforms_by_index[*j]->array_size>1)
                                indices2.push_back(*j);
                if(!indices2.empty())
                {
@@ -364,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())
@@ -406,8 +395,8 @@ void Program::query_attributes()
                        AttributeInfo &info = attributes[name];
                        info.name = name;
                        info.location = glGetAttribLocation(id, name);
-                       info.size = size;
-                       info.type = type;
+                       info.array_size = size;
+                       info.type = from_gl_type(type);
                }
        }
 }
@@ -416,7 +405,7 @@ Program::LayoutHash Program::compute_layout_hash(const vector<const UniformInfo
 {
        string layout_descriptor;
        for(vector<const UniformInfo *>::const_iterator i = uniforms.begin(); i!=uniforms.end(); ++i)
-               layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->size);
+               layout_descriptor += format("%d:%s:%x:%d\n", (*i)->location, (*i)->name, (*i)->type, (*i)->array_size);
        return hash32(layout_descriptor);
 }