[Gnash-commit] gnash ./ChangeLog backend/gnash.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Bastiaan Jacques <address@hidden>       06/05/17 11:10:51

Modified files:
        .              : ChangeLog 
        backend        : gnash.cpp 

Log message:
        Create the OpenGL render handler only after OpenGL has been initialised.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.349&tr2=1.350&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.349 gnash/ChangeLog:1.350
--- gnash/ChangeLog:1.349       Wed May 17 11:05:09 2006
+++ gnash/ChangeLog     Wed May 17 11:10:51 2006
@@ -1,3 +1,8 @@
+2006-05-17 Bastiaan Jacques <address@hidden>
+
+       * backend/gnash.cpp: Create the OpenGL render handler only after
+       OpenGL has been initialised.
+
 2006-05-17 Sandro Santilli <address@hidden>
        
        * server/StreamProvider.cpp: added temporary support for
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.35 gnash/backend/gnash.cpp:1.36
--- gnash/backend/gnash.cpp:1.35        Tue May 16 18:29:55 2006
+++ gnash/backend/gnash.cpp     Wed May 17 11:10:51 2006
@@ -366,7 +366,6 @@
     gnash::register_fscommand_callback(fs_callback);
     
     gnash::sound_handler  *sound = NULL;
-    gnash::render_handler *render = NULL;
     if (do_render) {
         if (do_sound) {
 #ifdef HAVE_SDL_MIXER_H
@@ -374,8 +373,6 @@
             gnash::set_sound_handler(sound);
 #endif
         }
-        render = gnash::create_render_handler_ogl();
-        gnash::set_render_handler(render);
     }
     
     // Get info about the width & height of the movie.
@@ -401,6 +398,8 @@
     if (!height) {
         height = int(movie_height * s_scale);
     }
+
+    gnash::render_handler* render = NULL;
     
     if (do_render) {
 #ifndef GUI_GTK
@@ -535,7 +534,10 @@
         gtk_widget_show(drawing_area);      
         gtk_widget_show(window);
 #endif
-        
+       render = gnash::create_render_handler_ogl();
+       gnash::set_render_handler(render);
+
+
         // Change the LOD BIAS values to tweak blurriness.
         if (tex_lod_bias != 0.0f) {
             glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 
tex_lod_bias);