[Gnash-commit] [SCM] Gnash branch, openvg, updated. d186bc22eeb0fd225c3bbd640a06f2527943b09c

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, openvg has been updated
       via  d186bc22eeb0fd225c3bbd640a06f2527943b09c (commit)
       via  3bfa6b47866967d15fea6aed7392d3a9f44d6382 (commit)
       via  eada2da5d0ddee6e95b88c6adf01de58bf060089 (commit)
       via  0d2f41f5ee4ff27d5bbb5e35fa1329ab638ca129 (commit)
       via  2b5e24a213297a1bcfd5e3334578bcbd8ca28b86 (commit)
       via  3611df505971535ae88367f3d9e789ebdaeb044f (commit)
       via  dd0f568b91bf9a79de2f33e0bf7e09ac1d353d3a (commit)
       via  20d9992796753505bd1a803b0ab0ae84f6e72e37 (commit)
       via  643eb345b4711f8d83d6ac79e4f5431162c32903 (commit)
       via  ef9cc2c9bc55a0f582cf14e59a5a845ae284c160 (commit)
      from  d153c8ecc14ddca06554b28caa3c97a7c0b7e84a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=d186bc22eeb0fd225c3bbd640a06f2527943b09c


commit d186bc22eeb0fd225c3bbd640a06f2527943b09c
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:27:38 2010 -0600

    reformat

diff --git a/gui/fb/gui_fb.cpp b/gui/fb/gui_fb.cpp
index ff6f0db..9690f2f 100644
--- a/gui/fb/gui_fb.cpp
+++ b/gui/fb/gui_fb.cpp
@@ -34,12 +34,12 @@ namespace gnash {
 #ifdef GUI_FB
 std::auto_ptr<Gui> createFBGui(unsigned long windowid, float scale, bool 
do_loop, RunResources& r)
 {
-       return std::auto_ptr<Gui>(new FBGui(windowid, scale, do_loop, r));
+    return std::auto_ptr<Gui>(new FBGui(windowid, scale, do_loop, r));
 }
 #else // ! GUI_FB
 std::auto_ptr<Gui> createFBGui(unsigned long , float, bool, RunResourcesfloat 
, bool , unsigned int )
 {
-       throw GnashException("Support for FB gui was not compiled in");
+    throw GnashException("Support for FB gui was not compiled in");
 }
 #endif // ! GUI_FB
 

http://git.savannah.gnu.org/cgit//commit/?id=3bfa6b47866967d15fea6aed7392d3a9f44d6382


commit 3bfa6b47866967d15fea6aed7392d3a9f44d6382
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:21:23 2010 -0600

    use underbar for private data name

diff --git a/gui/fb/fbsup.h b/gui/fb/fbsup.h
index b09e4e2..3a91389 100644
--- a/gui/fb/fbsup.h
+++ b/gui/fb/fbsup.h
@@ -132,7 +132,7 @@ private:
     // Keyboard SHIFT/CTRL/ALT states (left + right)
     bool keyb_lshift, keyb_rshift, keyb_lctrl, keyb_rctrl, keyb_lalt, 
keyb_ralt;
     
-    boost::scoped_ptr<FBGlue> fb_glue;
+    boost::scoped_ptr<FBGlue> _fb_glue;
     
     /// Tries to find a accessible tty
     char* find_accessible_tty(int no);

http://git.savannah.gnu.org/cgit//commit/?id=eada2da5d0ddee6e95b88c6adf01de58bf060089


commit eada2da5d0ddee6e95b88c6adf01de58bf060089
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:19:57 2010 -0600

    minor cleanup

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 793ab60..9523244 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -212,17 +212,19 @@ FBGui::~FBGui()
     if (_fd > 0) {
        enable_terminal();
        log_debug(_("Closing framebuffer device"));
-       close(_fd);
+       ::close(_fd);
+        _fd = -1;
     }
     
-    close(input_fd);
+    ::close(input_fd);
+    input_fd = -1;
     
-#ifdef ENABLE_DOUBLE_BUFFERING
-    if (_buffer) {
-       log_debug(_("Free'ing offscreen buffer"));
-       delete[] _buffer;
-    }
-#endif
+// #ifdef ENABLE_DOUBLE_BUFFERING
+//     if (_buffer) {
+//     log_debug(_("Free'ing offscreen buffer"));
+//     delete[] _buffer;
+//     }
+// #endif
 }
     
 bool
@@ -264,66 +266,54 @@ FBGui::init(int argc, char ***argv)
 #ifdef RENDERER_OPENVG
         // Use OpenVG, which uses EGL as the display API. This works with
         // Mesa on desktop unix systems, and on ARM based devices running
-        // Linux, often with manufacturer provided SDKs.
+        // GNU/Linux, often with manufacturer provided SDKs.
         if (renderer == "openvg") {
-            // FIXME: canvas->glue.reset(new gnash::GtkEGLGlue);
-            // Set the renderer to the next one to try if initializing
-            // fails.
 //            fb_glue.reset(new gnash::GtkEGLGlue);
+            initialized_renderer = true;
             break;
         }
 #endif
 #ifdef RENDERER_GLES1
         // Use OpenGLES 1. This works with Mesa on desktop unix
-        // systems, and on ARM based devices running Linux, often with
+        // systems, and on ARM based devices running GNU/Linux, often with
         // manufacturer provided SDKs.
         if (renderer == "gles1") {
-            // Set the renderer to the next one to try if initializing
-            // fails.
-            fb_glue.reset(new gnash::FBgles1Glue(_fd));
+            _fb_glue.reset(new gnash::FBgles1Glue(_fd));
+            initialized_renderer = true;
             break;
         }
 #endif
 #ifdef RENDERER_GLES2
         // Use OpenGLES 2. This works with Mesa on desktop unix
-        // systems, and on ARM based devices running Linux, often with
+        // systems, and on ARM based devices running GNU/Linux, often with
         // manufacturer provided SDKs.
         if (renderer == "gles2") {
-            // FIXME: canvas->glue.reset(new gnash::GtkEGLGlue);
-            // Set the renderer to the next one to try if initializing
-            // fails.
-            fb_glue.reset(new FBgles2Glue(_fd));
+            _fb_glue.reset(new FBgles2Glue(_fd));
+            initialized_renderer = true;
             break;
         }
 #endif
 #ifdef RENDERER_AGG
-        // Use OpenVG, which uses EGL as the display API. This works with
-        // Mesa on desktop unix systems, and on ARM based devices running
-        // Linux, often with manufacturer provided SDKs.
         if (renderer == "agg") {
-            // FIXME: canvas->glue.reset(new gnash::GtkEGLGlue);
-            // Set the renderer to the next one to try if initializing
-            // fails.
-            fb_glue.reset(new FBAggGlue(_fd));
+            _fb_glue.reset(new FBAggGlue(_fd));
             initialized_renderer = true;
+            break;
         }
 #endif
     }
-
-    fb_glue->init(argc, argv);
     
-    if (fb_glue) {
+    if (!_fb_glue) {
         log_error("No renderer created!");
-        //     return false;
-        // } else if (!fb_glue->init(argc, argv)) {
-        //     return false;
+        return false;
+    } else if (!_fb_glue->init(argc, argv)) {
+        return false;
     }
     
-    m_stage_width = fb_glue->width();
-    m_stage_height = fb_glue->height();
+    m_stage_width = _fb_glue->width();
+    m_stage_height = _fb_glue->height();
     _validbounds.setTo(0, 0, m_stage_width-1, m_stage_height-1);
 
-    _renderer.reset(fb_glue->createRenderHandler());
+    _renderer.reset(_fb_glue->createRenderHandler());
     _runResources.setRenderer(_renderer);
     
     disable_terminal();
@@ -339,18 +329,17 @@ FBGui::run()
     struct timeval tv;
     double start_timer;
     
-    if (!gettimeofday(&tv, NULL))
+    if (!gettimeofday(&tv, NULL)) {
        start_timer = static_cast<double>(tv.tv_sec) +
            static_cast<double>(tv.tv_usec) / 1000000.0;
-    else
+    } else {
        start_timer = 0.0;
-    
+    }
     
     // let the GUI recompute the x/y scale factors to best fit the whole screen
     resize_view(_validbounds.width(), _validbounds.height());
     
-    while (!terminate_request) {
-       
+    while (!terminate_request) {       
        // wait the "heartbeat" inteval
        gnashSleep(_interval * 1000);    
        // TODO: Do we need to check the real time slept or is it OK when we 
woke
@@ -371,7 +360,7 @@ FBGui::run()
 
 void FBGui::renderBuffer()
 {
-    fb_glue->render();
+    _fb_glue->render();
 }
 
 bool
@@ -490,7 +479,7 @@ FBGui::setInvalidatedRegions(const InvalidatedRanges& 
ranges)
 char *
 FBGui::find_accessible_tty(int no)
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
     
     char* fn;
     
@@ -527,7 +516,7 @@ FBGui::find_accessible_tty(const char* format, int no)
 bool
 FBGui::disable_terminal() 
 {
-    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     original_kd = -1;
     
@@ -682,9 +671,7 @@ FBGui::enable_terminal()
            log_debug(_("WARNING: Error waiting for VT %d becoming active"), 
original_vt);
            //close(tty);
            //return false;   don't abort
-       }
-
-  
+       }  
   
        // Restore keyboard
   
@@ -769,7 +756,8 @@ FBGui::enable_terminal()
        unsigned char buf[10];
 
        if (fcntl(input_fd, F_SETFL, fcntl(input_fd, F_GETFL) | O_NONBLOCK)<0) {
-           log_error("Could not set non-blocking mode for touchpad device: 
%s", strerror(errno));
+           log_error("Could not set non-blocking mode for touchpad device: %s",
+                      strerror(errno));
            close(input_fd);
            input_fd=-1;
            return false; 
@@ -830,10 +818,10 @@ FBGui::enable_terminal()
            */
     
     
-           new_x = static_cast<int>(((static_cast<double>(new_x )- 355) / 
(1702 - 355)
-                                     * 1536 + 256));
-           new_y = static_cast<int>(((static_cast<double>(new_y) - 482) / 
(1771 - 482)
-                                     * 1536 + 256));
+           new_x = static_cast<int>(((static_cast<double>
+                                       (new_x )- 355) / (1702 - 355) * 1536 + 
256));
+           new_y = static_cast<int>(((static_cast<double>
+                                       (new_y) - 482) / (1771 - 482) * 1536 + 
256));
     
     
            new_x = new_x * m_stage_width / 2048;

http://git.savannah.gnu.org/cgit//commit/?id=0d2f41f5ee4ff27d5bbb5e35fa1329ab638ca129


commit 0d2f41f5ee4ff27d5bbb5e35fa1329ab638ca129
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:18:49 2010 -0600

    cleanup comment

diff --git a/gui/fb/fb.am b/gui/fb/fb.am
index 8224d97..0672369 100644
--- a/gui/fb/fb.am
+++ b/gui/fb/fb.am
@@ -53,7 +53,7 @@ fb_gnash_CPPFLAGS += $(GLES1_CFLAGS) $(EGL_CFLAGS)
 fb_gnash_LDADD += $(GLES1_LIBS) $(EGL_LIBS)
 endif  # BUILD_GLES1_RENDERER
 
-# This supports only OpenGLES 1.1 with EGL support.
+# This supports only OpenGLES 2 with EGL support.
 if BUILD_GLES2_RENDERER
 fb_gnash_SOURCES += fb/fb_glue_gles2.cpp fb/fb_glue_gles2.h
 fb_gnash_CPPFLAGS += $(GLES2_CFLAGS) $(EGL_CFLAGS)

http://git.savannah.gnu.org/cgit//commit/?id=2b5e24a213297a1bcfd5e3334578bcbd8ca28b86


commit 2b5e24a213297a1bcfd5e3334578bcbd8ca28b86
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:18:26 2010 -0600

    handle error if fbmem memory doesn't exist.

diff --git a/gui/fb/fb_glue_agg.cpp b/gui/fb/fb_glue_agg.cpp
index c1b0486..88b6e94 100644
--- a/gui/fb/fb_glue_agg.cpp
+++ b/gui/fb/fb_glue_agg.cpp
@@ -86,6 +86,11 @@ FBAggGlue::init (int argc, char ***argv)
     _fbmem.reset(static_cast<boost::uint8_t *>(mmap(0, 
_fix_screeninfo.smem_len,
                                           PROT_READ|PROT_WRITE, MAP_SHARED,
                                           _fd, 0)));
+
+    if (!_fbmem) {
+        log_error("Couldn't mmap() %d bytes of memory!",
+                  _fix_screeninfo.smem_len);
+    }
     
 #ifdef ENABLE_DOUBLE_BUFFERING
     // allocate offscreen buffer

http://git.savannah.gnu.org/cgit//commit/?id=3611df505971535ae88367f3d9e789ebdaeb044f


commit 3611df505971535ae88367f3d9e789ebdaeb044f
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:17:22 2010 -0600

    minor cleanup

diff --git a/gui/fb/fb_glue_gles2.cpp b/gui/fb/fb_glue_gles2.cpp
index baede8a..a3e5f77 100644
--- a/gui/fb/fb_glue_gles2.cpp
+++ b/gui/fb/fb_glue_gles2.cpp
@@ -47,23 +47,26 @@
 namespace gnash
 {
 
-FBgles2Glue::FBgles2Glue()
+FBgles2Glue::FBgles2Glue(int fd)
+    : _fd(fd)
 {
 }
 
-FBgles2Glue::~FBgles2Glue () {
+FBgles2Glue::~FBgles2Glue ()
+{
 }
 
 bool
 FBgles2Glue::init(int /*argc*/, char *** /*argv*/)
 {
-
+    return false;
 }
 
 Renderer*
 FBgles2Glue::createRenderHandler()
 {
-
+    Renderer *rend = 0;
+    return rend;
 }
 
 int 

http://git.savannah.gnu.org/cgit//commit/?id=dd0f568b91bf9a79de2f33e0bf7e09ac1d353d3a


commit dd0f568b91bf9a79de2f33e0bf7e09ac1d353d3a
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:16:13 2010 -0600

    use a scoped pointer

diff --git a/gui/fb/fb_glue_gles1.h b/gui/fb/fb_glue_gles1.h
index 6e40d6a..1d39200 100644
--- a/gui/fb/fb_glue_gles1.h
+++ b/gui/fb/fb_glue_gles1.h
@@ -46,11 +46,9 @@
 #include <boost/scoped_ptr.hpp>
 
 #include "fbsup.h"
-//#include "render_handler_gles.h"
 
 namespace gnash
 {
-class render_handler;
 class Renderer;
 
 class FBgles1Glue: public FBGlue
@@ -75,7 +73,6 @@ protected:
     int         _fd;
 
 private:
-    render_handler *_render_handler;
     boost::scoped_ptr<Renderer> _renderer;
     EGLDisplay  _display;
     EGLConfig   _config;

http://git.savannah.gnu.org/cgit//commit/?id=20d9992796753505bd1a803b0ab0ae84f6e72e37


commit 20d9992796753505bd1a803b0ab0ae84f6e72e37
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:15:10 2010 -0600

    cleanup

diff --git a/gui/fb/fb_glue_gles2.h b/gui/fb/fb_glue_gles2.h
index ba4e295..1cca514 100644
--- a/gui/fb/fb_glue_gles2.h
+++ b/gui/fb/fb_glue_gles2.h
@@ -44,7 +44,6 @@
 #endif
 
 #include "fbsup.h"
-//#include "render_handler_gles.h"
 
 namespace gnash
 {

http://git.savannah.gnu.org/cgit//commit/?id=643eb345b4711f8d83d6ac79e4f5431162c32903


commit 643eb345b4711f8d83d6ac79e4f5431162c32903
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:13:23 2010 -0600

    be gles1 specific

diff --git a/librender/render_handler_gles.h b/librender/render_handler_gles.h
index dba2eef..f00a607 100644
--- a/librender/render_handler_gles.h
+++ b/librender/render_handler_gles.h
@@ -47,8 +47,6 @@
 #endif
 #endif
 
-// #include <glues.h>
-
 namespace gnash {
 
 typedef GLfloat oglCoord;
@@ -60,7 +58,7 @@ typedef GLfloat oglCoord;
 class OglGlue;
 class render_handler;
 
-render_handler* create_render_handler_ogl (bool init, OglGlue* glue);
+render_handler* create_render_handler_gles1 (bool init, OglGlue* glue);
 
 } // namespace gnash
 

http://git.savannah.gnu.org/cgit//commit/?id=ef9cc2c9bc55a0f582cf14e59a5a845ae284c160


commit ef9cc2c9bc55a0f582cf14e59a5a845ae284c160
Author: Rob Savoye <address@hidden>
Date:   Mon Oct 25 20:10:29 2010 -0600

    be less verbose

diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index de1af19..66849c2 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -960,7 +960,7 @@ movie_root::timeToNextFrame() const
 void
 movie_root::display()
 {
-//    GNASH_REPORT_FUNCTION;
+    // GNASH_REPORT_FUNCTION;
 
     assert(testInvariant());
 

-----------------------------------------------------------------------

Summary of changes:
 gui/fb/fb.am                    |    2 +-
 gui/fb/fb.cpp                   |   94 +++++++++++++++++----------------------
 gui/fb/fb_glue_agg.cpp          |    5 ++
 gui/fb/fb_glue_gles1.h          |    3 -
 gui/fb/fb_glue_gles2.cpp        |   11 +++--
 gui/fb/fb_glue_gles2.h          |    1 -
 gui/fb/fbsup.h                  |    2 +-
 gui/fb/gui_fb.cpp               |    4 +-
 libcore/movie_root.cpp          |    2 +-
 librender/render_handler_gles.h |    4 +-
 10 files changed, 59 insertions(+), 69 deletions(-)


hooks/post-receive
-- 
Gnash