Changeset 40 for trunk/src/gl

Timestamp:

05/28/13 02:11:06 (12 years ago)

Author:

epyon

Message:

• bugfixes

Location:

trunk/src/gl

Files:

• gl_enum.cc (modified) (10 diffs)
• gl_program.cc (modified) (3 diffs)

trunk/src/gl/gl_enum.cc

@@ -9 +9 @@
 using namespace nv;
 
-unsigned int clear_state_buffers_to_mask( clear_state::buffers_type type )
+unsigned int nv::clear_state_buffers_to_mask( clear_state::buffers_type type )
 {
         unsigned int mask = 0;
@@ -18 +18 @@
 }
 
-unsigned int depth_state_function_to_enum( depth_test::function_type type )
+unsigned int nv::depth_state_function_to_enum( depth_test::function_type type )
 {
         switch( type )
@@ -34 +34 @@
 }
 
-unsigned int blending_factor_to_enum( blending::factor type )
+unsigned int nv::blending_factor_to_enum( blending::factor type )
 {
         switch( type )
@@ -57 +57 @@
 }
 
-unsigned int blending_equation_to_enum( blending::equation type )
+unsigned int nv::blending_equation_to_enum( blending::equation type )
 {
         switch( type )
@@ -70 +70 @@
 }
 
-unsigned int culling_face_type_to_enum( culling::face_type type )
+unsigned int nv::culling_face_type_to_enum( culling::face_type type )
 {
         switch( type )
@@ -81 +81 @@
 }
 
-unsigned int culling_order_type_to_enum( culling::order_type type )
+unsigned int nv::culling_order_type_to_enum( culling::order_type type )
 {
         switch( type )
@@ -91 +91 @@
 }
 
-unsigned int stencil_function_to_enum( stencil_test_face::function_type type )
+unsigned int nv::stencil_function_to_enum( stencil_test_face::function_type type )
 {
         switch( type )
@@ -107 +107 @@
 }
 
-unsigned int stencil_operation_to_enum( stencil_test_face::operation type )
+unsigned int nv::stencil_operation_to_enum( stencil_test_face::operation type )
 {
         switch( type )
@@ -123 +123 @@
 }
 
-unsigned int type_to_gl_enum( type type )
+unsigned int nv::type_to_gl_enum( type type )
 {
         switch( type )
@@ -142 +142 @@
 }
 
-nv::type gl_enum_to_type( unsigned int gl_enum )
+nv::type nv::gl_enum_to_type( unsigned int gl_enum )
 {
         switch( gl_enum )

trunk/src/gl/gl_program.cc

@@ -60 +60 @@
         char buffer[ buffer_size ] = { 0 };
         int length;
+        int compile_ok = GL_FALSE;
+        glGetShaderiv(object_id, GL_COMPILE_STATUS, &compile_ok);
         glGetShaderInfoLog( object_id, buffer_size, &length, buffer );
 
         if ( length > 0 )
         {
-                NV_LOG( LOG_INFO, "Shader #" << object_id << " compiled: " << buffer );
+                if ( compile_ok == 0 )
+                {
+                        NV_LOG( LOG_ERROR, "Shader #" << object_id << " error: " << buffer );
+                }
+                else
+                {
+                        NV_LOG( LOG_INFO, "Shader #" << object_id << " compiled successfully: " << buffer );
+                }
         }
         else
@@ -70 +79 @@
                 NV_LOG( LOG_INFO, "Shader #" << object_id << " compiled successfully." );
         }
-        return true;
+        return compile_ok != 0;
 }
 
@@ -182 +191 @@
         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 successfuly.") );
+        NV_LOG( LOG_INFO, "Program #" << m_name.get_value() << (status == GL_FALSE ? " failed to compile!" : " compiled successfully.") );
 
         if ( length > 0 )