Changeset 1375

Timestamp:

05/28/08 03:59:37 (6 months ago)

Author:

timdewhirst

Message:

OPL
- add a few error messages

Files:

• trunk/src/openpluginlib/pl/shader_manager.cpp (modified) (6 diffs)

trunk/src/openpluginlib/pl/shader_manager.cpp

@@ -1 @@
-
+/* -*- mode: C++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */
 // openpluginlib - An plugin interface to openlibraries.
 
@@ -7 +7 @@
 
 #include <fstream>
+#include <iostream>
 
 #include <openpluginlib/pl/openpluginlib.hpp>
@@ -177 +178 @@
 bool shader_manager::create_GLSL_shader( const shader_string& vertex, const shader_string& fragment, GLSL_shader_object& shader )
 {
-        if( !GLEW_VERSION_2_0 && !( GLEW_ARB_shading_language_100 && GLEW_ARB_shader_objects && GLEW_ARB_vertex_shader && GLEW_ARB_fragment_shader ) )
+        if( !GLEW_VERSION_2_0 && 
+                !( GLEW_ARB_shading_language_100 && GLEW_ARB_shader_objects && GLEW_ARB_vertex_shader && GLEW_ARB_fragment_shader ) )
+        {
+                std::cerr << "shader_manager::create_GLSL_shader: system requirements were not met\n";
                 return false;
+        }
                 
         shader.program( )  = create_GLSL_program_object( );
@@ -185 +190 @@
         shader.valid( )    = false;
         
-        if( glIsShader && ( !glIsShader( shader.vertex( ) ) || !glIsShader( shader.fragment( ) ) ) )
+        if( glIsShader && 
+                ( !glIsShader( shader.vertex( ) ) || !glIsShader( shader.fragment( ) ) ) )
+        {
+                std::cerr << "shader_manager::create_GLSL_shader: failed to get shaders\n";
                 return false;
+        }
         
         download_GLSL_shader_code_to_gpu( shader.vertex( ), vertex );
         download_GLSL_shader_code_to_gpu( shader.fragment( ), fragment );
                 
-        if( compile_GLSL_shader( shader.vertex( ) ) && compile_GLSL_shader( shader.fragment( ) ) && link_GLSL_program( shader.program( ), shader.vertex( ), shader.fragment( ) ) )
+        if( compile_GLSL_shader( shader.vertex( ) ) && 
+                compile_GLSL_shader( shader.fragment( ) ) && 
+                link_GLSL_program( shader.program( ), shader.vertex( ), shader.fragment( ) ) )
                 shader.valid( ) = true;
 
@@ -489 +500 @@
                         return true;
                 }
+                else
+                {
+                        std::cerr << "shader_object::init: failed to initialise a GLSL_shader for: " << v_uri << ", " << f_uri << ", " << prefix << "\n"; 
+                }
         }
 #if defined ( HAVE_CG_RUNTIME )
@@ -504 +519 @@
                         return true;
                 }
+                else
+                {
+                        std::cerr << "shader_object::init: failed to initialise a Cg_shader for: " << v_uri << ", " << f_uri << ", " << prefix << "\n";
+                }
         }
 #endif