Changeset 1351

Timestamp:

12/22/07 13:59:21 (1 year ago)

Author:

glslang

Message:

+ bug fix for when shaders are not present

Location:

trunk/src

Files:

• openmedialib/plugins/avformat/avformat_vc8.vcproj (modified) (2 diffs)
• openpluginlib/pl/shader_manager.cpp (modified) (5 diffs)
• openpluginlib/pl/shader_manager.hpp (modified) (2 diffs)

trunk/src/openmedialib/plugins/avformat/avformat_vc8.vcproj

@@ -68 +68 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="true"
-                                AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib"
+                                AdditionalDependencies="avcodec.lib avformat.lib avutil.lib"
                                 OutputFile="$(OutDir)\openmedialib_avformat-vc80-d-0_5_0.dll"
                                 LinkIncremental="2"
@@ -152 +152 @@
                                 Name="VCLinkerTool"
                                 IgnoreImportLibrary="true"
-                                AdditionalDependencies="avcodec-51.lib avformat-51.lib avutil-49.lib"
+                                AdditionalDependencies="avcodec.lib avformat.lib avutil.lib"
                                 OutputFile="$(OutDir)\openmedialib_avformat-vc80-r-0_5_0.dll"
                                 LinkIncremental="1"

trunk/src/openpluginlib/pl/shader_manager.cpp

@@ -247 +247 @@
 
         cgGLLoadProgram( vert );
+        if( cgGetError( ) != CG_NO_ERROR )
+                return false;
+        
         cgGLLoadProgram( frag );
+        if( cgGetError( ) != CG_NO_ERROR )
+                return false;
 
         shader.v_profile( ) = v_profile;
@@ -273 +278 @@
 #endif
 
-bool shader_manager::create_shader_object( const std::string& v_uri, const std::string& f_uri, shader_object& sobj )
-{
-        return sobj.init( v_uri, f_uri );
+bool shader_manager::create_shader_object( const std::string& v_uri, const std::string& f_uri, shader_object& sobj, bool prefix )
+{
+        return sobj.init( v_uri, f_uri, prefix );
 }
 
@@ -467 +472 @@
 #endif
 
-bool shader_object::init( const std::string& v_uri, const std::string& f_uri )
+bool shader_object::init( const std::string& v_uri, const std::string& f_uri, bool prefix )
 {
         set_retry( false );
@@ -476 +481 @@
                 
                 shader_string vert, frag;
-                vert = shader_manager_instance( ).open_shader_file( v_uri.substr( 5 ) );
-                frag = shader_manager_instance( ).open_shader_file( f_uri.substr( 5 ) );
+                vert = shader_manager_instance( ).open_shader_file( v_uri.substr( 5 ), prefix );
+                frag = shader_manager_instance( ).open_shader_file( f_uri.substr( 5 ), prefix );
                 
                 if( shader_manager_instance( ).create_GLSL_shader( vert, frag, *obj ) )
@@ -491 +496 @@
                 
                 shader_string vert, frag;
-                vert = shader_manager_instance( ).open_shader_file( v_uri.substr( 3 ) );
-                frag = shader_manager_instance( ).open_shader_file( f_uri.substr( 3 ) );
+                vert = shader_manager_instance( ).open_shader_file( v_uri.substr( 3 ), prefix );
+                frag = shader_manager_instance( ).open_shader_file( f_uri.substr( 3 ), prefix );
                 
                 if( shader_manager_instance( ).create_Cg_shader( vert, frag, *obj ) )

trunk/src/openpluginlib/pl/shader_manager.hpp

@@ -162 +162 @@
         virtual ~shader_object( ) { }
 
-        bool init( const std::string& v_uri, const std::string& f_uri );
+        bool init( const std::string& v_uri, const std::string& f_uri, bool prefix = true );
         void fini( );
         
@@ -255 +255 @@
 #endif
 
-        bool create_shader_object( const std::string& v_uri, const std::string& f_uri, shader_object& sobj );
+        bool create_shader_object( const std::string& v_uri, const std::string& f_uri, shader_object& sobj, bool prefix = true );
 
 public: