Changeset 300 for trunk/src/gl/gl_program.cc

Timestamp:

08/07/14 10:29:34 (11 years ago)

Author:

epyon

Message:

• removed gl_names - too much bloat for too little gain

File:

• trunk/src/gl/gl_program.cc (modified) (12 diffs)

trunk/src/gl/gl_program.cc

@@ -88 +88 @@
         : vertex_shader( GL_VERTEX_SHADER ), fragment_shader( GL_FRAGMENT_SHADER )
 {
+        glid = glCreateProgram();
         compile( vertex_program, fragment_program );
 }
@@ -93 +94 @@
 gl_program::~gl_program()
 {
-        if ( is_valid() )
+        if ( glid != 0 )
         {
                 // Detach the shaders from the program
-                glDetachShader( m_name.get_value(), vertex_shader.get_id() );
-                glDetachShader( m_name.get_value(), fragment_shader.get_id() );
+                glDetachShader( glid, vertex_shader.get_id() );
+                glDetachShader( glid, fragment_shader.get_id() );
+                glDeleteProgram( glid );
         }
 }
@@ -106 +108 @@
         if (!fragment_shader.compile( fragment_program )) { return false; }
 
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::POSITION   ), "nv_position"  );
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::TEXCOORD   ), "nv_texcoord"  );
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::NORMAL     ), "nv_normal"    );
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::COLOR      ), "nv_color"     );
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::TANGENT    ), "nv_tangent"   );
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::BONEINDEX  ), "nv_boneindex" );
-        glBindAttribLocation( m_name.get_value(), static_cast<GLuint>( slot::BONEWEIGHT ), "nv_boneweight");
-
-        glAttachShader( m_name.get_value(), fragment_shader.get_id() );
-        glAttachShader( m_name.get_value(), vertex_shader.get_id() );
-        glLinkProgram( m_name.get_value() );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::POSITION   ), "nv_position"  );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::TEXCOORD   ), "nv_texcoord"  );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::NORMAL     ), "nv_normal"    );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::COLOR      ), "nv_color"     );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::TANGENT    ), "nv_tangent"   );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::BONEINDEX  ), "nv_boneindex" );
+        glBindAttribLocation( glid, static_cast<GLuint>( slot::BONEWEIGHT ), "nv_boneweight");
+
+        glAttachShader( glid, fragment_shader.get_id() );
+        glAttachShader( glid, vertex_shader.get_id() );
+        glLinkProgram( glid );
 
         if (!validate())
@@ -129 +131 @@
 bool gl_program::is_valid() const
 {
-        return m_name.is_valid();
+        return glid != 0;
 }
 
@@ -135 +137 @@
 {
         int params;
-        glGetProgramiv( m_name.get_value(), GL_ACTIVE_ATTRIBUTES, &params );
+        glGetProgramiv( glid, GL_ACTIVE_ATTRIBUTES, &params );
 
         for ( unsigned i = 0; i < (unsigned)params; ++i )
@@ -144 +146 @@
                 char name_buffer[128];
 
-                glGetActiveAttrib( m_name.get_value(), i, 128, &attr_nlen, &attr_len, &attr_type, name_buffer );
+                glGetActiveAttrib( glid, i, 128, &attr_nlen, &attr_len, &attr_type, name_buffer );
 
                 string name( name_buffer, size_t(attr_nlen) );
@@ -151 +153 @@
                 if ( name.substr(0,3) == "gl_" ) continue;
 
-                int attr_loc = glGetAttribLocation( m_name.get_value(), name.c_str() );
+                int attr_loc = glGetAttribLocation( glid, name.c_str() );
 
                 m_attribute_map[ name ] = new attribute( name, attr_loc, gl_enum_to_datatype( attr_type ), attr_len );
@@ -160 +162 @@
 {
         int params;
-        glGetProgramiv( m_name.get_value(), GL_ACTIVE_UNIFORMS, &params );
+        glGetProgramiv( glid, GL_ACTIVE_UNIFORMS, &params );
 
         for ( unsigned i = 0; i < size_t(params); ++i )
@@ -169 +171 @@
                 char name_buffer[128];
 
-                glGetActiveUniform( m_name.get_value(), i, 128, &uni_nlen, &uni_len, &uni_type, name_buffer );
+                glGetActiveUniform( glid, i, 128, &uni_nlen, &uni_len, &uni_type, name_buffer );
 
                 string name( name_buffer, size_t(uni_nlen) );
@@ -176 +178 @@
                 if ( name.substr(0,3) == "gl_" ) continue;
 
-                int uni_loc = glGetUniformLocation( m_name.get_value(), name.c_str() );
+                int uni_loc = glGetUniformLocation( glid, name.c_str() );
                 datatype utype = gl_enum_to_datatype( uni_type );
                 
@@ -232 +234 @@
         int status;
 
-        glGetProgramiv( m_name.get_value(), GL_LINK_STATUS, &status );
-        glGetProgramInfoLog( m_name.get_value(), buffer_size, &length, buffer );
-
-        NV_LOG( LOG_INFO, "Program #" << m_name.get_value() << (status == GL_FALSE ? " failed to compile!" : " compiled successfully.") );
+        glGetProgramiv( glid, GL_LINK_STATUS, &status );
+        glGetProgramInfoLog( glid, buffer_size, &length, buffer );
+
+        NV_LOG( LOG_INFO, "Program #" << glid << (status == GL_FALSE ? " failed to compile!" : " compiled successfully.") );
 
         if ( length > 0 )
         {
-                NV_LOG( LOG_INFO, "Program #" << m_name.get_value() << " log: " << buffer );
+                NV_LOG( LOG_INFO, "Program #" << glid << " log: " << buffer );
         }
 
@@ -247 +249 @@
         }
 
-        glValidateProgram( m_name.get_value() );
-        glGetProgramiv( m_name.get_value(), GL_VALIDATE_STATUS, &status );
+        glValidateProgram( glid );
+        glGetProgramiv( glid, GL_VALIDATE_STATUS, &status );
 
         if ( status == GL_FALSE )
         {
-                glGetProgramInfoLog( m_name.get_value(), buffer_size, &length, buffer );
-                NV_LOG( LOG_ERROR, "Program #" << m_name.get_value() << " validation error : " << buffer );
+                glGetProgramInfoLog( glid, buffer_size, &length, buffer );
+                NV_LOG( LOG_ERROR, "Program #" << glid << " validation error : " << buffer );
                 return false;
         }