Changeset 930

Timestamp:

12/22/07 13:58:05 (1 year ago)

Author:

glslang

Message:

+ bug fix for when shaders are not present

Location:

trunk

Files:

• installer/jahplayer.nsi (modified) (1 diff)
• jahwidgets/src/qt3/widgets/player.cpp (modified) (1 diff)
• jahwidgets/src/qt3/widgets/shader_state.cpp (modified) (1 diff)
• jahwidgets/src/qt3/widgets/shader_state.h (modified) (1 diff)

trunk/installer/jahplayer.nsi

@@ -183 +183 @@
   File /r "C:\Program Files\OpenLibraries\bin\*"
   File /r "C:\Program Files\OpenLibraries\python\release\*"
+  File /r "C:\Program Files\OpenLibraries\shaders\*"
   File "C:\Python25\DLLs\_socket.pyd"
   

trunk/jahwidgets/src/qt3/widgets/player.cpp

@@ -441 +441 @@
         glewInit( );
 
-        shaders_[ YUV444_TO_RGB ].init( "cg:passthrough.cg", "cg:yuv444_to_rgb.cg", "glsl:passthrough.vert", "glsl:yuv444_to_rgb.frag" );
+        shaders_[ YUV444_TO_RGB ].init( "cg:passthrough.cg", "cg:yuv444_to_rgb.cg", "glsl:passthrough.vert", "glsl:yuv444_to_rgb.frag", false );
         shaders_[ YUV444_TO_RGB_DEINTERLACE ].init( "cg:passthrough.cg", 
                                                                                                 "cg:yuv444_to_rgb_deinterlace.cg", 
                                                                                                 "glsl:passthrough.vert", 
-                                                                                                "glsl:yuv444_to_rgb_deinterlace.frag" );
-        shaders_[ CHANNEL_SELECTOR ].init( "cg:passthrough.cg", "cg:channel_selector.cg", "glsl:passthrough.vert", "glsl:channel_selector.frag" );
+                                                                                                "glsl:yuv444_to_rgb_deinterlace.frag", false );
+        shaders_[ CHANNEL_SELECTOR ].init( "cg:passthrough.cg", "cg:channel_selector.cg", "glsl:passthrough.vert", "glsl:channel_selector.frag", false );
 }
 

trunk/jahwidgets/src/qt3/widgets/shader_state.cpp

@@ -10 +10 @@
 namespace jahwidgets { namespace qt3 {
 
-void shader_state::init( const std::string& cg_vert, const std::string& cg_frag, const std::string& glsl_vert, const std::string& glsl_frag )
+void shader_state::init( const std::string& cg_vert, const std::string& cg_frag, const std::string& glsl_vert, const std::string& glsl_frag, bool prefix )
 {
 #ifdef HAVE_CG_RUNTIME
-        Cg_.init( cg_vert, cg_frag );
+        Cg_.init( cg_vert, cg_frag, prefix );
 #endif
 
-        GLSL_.init( glsl_vert, glsl_frag );
+        GLSL_.init( glsl_vert, glsl_frag, prefix );
 }
 

trunk/jahwidgets/src/qt3/widgets/shader_state.h

@@ -31 +31 @@
         // Goncalo - the runtime choice should be based on some benchmark and not on the texture target.
         // Goncalo - also this state should be held by oel (i.e. over ool ).
-        void init( const std::string& cg_vert, const std::string& cg_frag, const std::string& glsl_vert, const std::string& glsl_frag );
+        void init( const std::string& cg_vert, const std::string& cg_frag, const std::string& glsl_vert, const std::string& glsl_frag, bool prefix = true );
         void enable( GLenum target, GLuint tex_id, float alpha, float offset, float* channel_selector );
         void disable( );