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

[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  d153c8ecc14ddca06554b28caa3c97a7c0b7e84a (commit)
       via  a050c33fd0d597bacecc574872c377de0f90f499 (commit)
       via  2e10b506384cabc7720c49049a9c3695d63c7090 (commit)
       via  54ac39ac843259d79de98f7abf51ac25eb4c5ecd (commit)
       via  25ba22066f00fd486c8f1bc9c8c24a94092acab4 (commit)
      from  5ff88673e88250e62bc1b7b6b479e043e76c866a (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=d153c8ecc14ddca06554b28caa3c97a7c0b7e84a


commit d153c8ecc14ddca06554b28caa3c97a7c0b7e84a
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 5 19:41:16 2010 -0600

    always pass the file description for the framebuffer

diff --git a/gui/fb/fb_glue_gles2.h b/gui/fb/fb_glue_gles2.h
index daa8ac3..ba4e295 100644
--- a/gui/fb/fb_glue_gles2.h
+++ b/gui/fb/fb_glue_gles2.h
@@ -52,7 +52,7 @@ namespace gnash
     class FBgles2Glue: public FBGlue // , public OglGlue
 {
 public:
-    FBgles2Glue();
+    FBgles2Glue(int fd);
     virtual ~FBgles2Glue();
     
     virtual bool init(int /*argc*/, char *** /*argv*/);
@@ -67,6 +67,9 @@ public:
     virtual void render_to_pbuffer ();
     virtual void prepare_copy_from_pbuffer ();
     virtual void render_to_display ();
+protected:
+    int         _fd;
+
 private:
 };
 

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


commit a050c33fd0d597bacecc574872c377de0f90f499
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 5 19:40:40 2010 -0600

    move method code from header to source

diff --git a/gui/fb/fb_glue_gles1.h b/gui/fb/fb_glue_gles1.h
index 5c1b48b..6e40d6a 100644
--- a/gui/fb/fb_glue_gles1.h
+++ b/gui/fb/fb_glue_gles1.h
@@ -43,30 +43,24 @@
 #endif
 #endif
 
+#include <boost/scoped_ptr.hpp>
+
 #include "fbsup.h"
 //#include "render_handler_gles.h"
 
 namespace gnash
 {
 class render_handler;
+class Renderer;
 
-    class FBgles1Glue: public FBGlue // , public OglGlue
+class FBgles1Glue: public FBGlue
 {
 public:
-    FBgles1Glue() :
-        _surface (EGL_NO_SURFACE),
-        _pbuffer (EGL_NO_SURFACE) {}
+    FBgles1Glue(int fd);
     virtual ~FBgles1Glue();
+    virtual bool init(int argc, char ***);
     
-    virtual bool init(int /*argc*/, char *** /*argv*/);
-    
-    virtual Renderer* createRenderHandler() {
-        //_render_handler = create_render_handler_ogl (true, this);
-        //        return _render_handler; FIXME: 
-        // error: invalid covariant return type for 'virtual 
gnash::render_handler* gnash::FBglesGlue::createRenderHandler()'
-
-    }
-    
+    virtual Renderer* createRenderHandler();
     virtual void setInvalidatedRegions(const InvalidatedRanges& /* ranges */) 
{}
     
     virtual int width ();
@@ -77,14 +71,18 @@ public:
     virtual void prepare_copy_from_pbuffer ();
     virtual void render_to_display ();
     
+protected:
+    int         _fd;
+
 private:
-    render_handler* _render_handler;
-    EGLDisplay      _display;
-    EGLConfig       _config;
-    EGLContext      _context;
-    EGLSurface      _surface;
-    EGLConfig       _pbuffer_config;
-    EGLSurface      _pbuffer;
+    render_handler *_render_handler;
+    boost::scoped_ptr<Renderer> _renderer;
+    EGLDisplay  _display;
+    EGLConfig   _config;
+    EGLContext  _context;
+    EGLSurface  _surface;
+    EGLConfig   _pbuffer_config;
+    EGLSurface  _pbuffer;
 };
 
 } // namespace gnash

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


commit 2e10b506384cabc7720c49049a9c3695d63c7090
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 5 19:40:08 2010 -0600

    move method code from header to source

diff --git a/gui/fb/fb_glue_gles1.cpp b/gui/fb/fb_glue_gles1.cpp
index f12cb20..a6e7659 100644
--- a/gui/fb/fb_glue_gles1.cpp
+++ b/gui/fb/fb_glue_gles1.cpp
@@ -47,8 +47,39 @@
 namespace gnash
 {
 
+FBgles1Glue::FBgles1Glue(int fd)
+    : _fd (fd),
+      _surface (EGL_NO_SURFACE),
+      _pbuffer (EGL_NO_SURFACE)
+{
+    GNASH_REPORT_FUNCTION;    
+}
+
+FBgles1Glue::~FBgles1Glue ()
+{
+    GNASH_REPORT_FUNCTION;
+
+    eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+    eglTerminate(_display);
+}
+
+Renderer *
+FBgles1Glue::createRenderHandler()
+{
+    GNASH_REPORT_FUNCTION;
+
+    //_render_handler = create_render_handler_ogl (true, this);
+    //        return _render_handler; FIXME: 
+    // error: invalid covariant return type for 'virtual 
gnash::render_handler* gnash::FBglesGlue::createRenderHandler()'
+    Renderer *rend = 0;
+    return rend;
+}
+
 bool 
-FBgles1Glue::init(int /*argc*/, char *** /*argv*/) {
+FBgles1Glue::init(int /*argc*/, char *** /*argv*/)
+{
+    GNASH_REPORT_FUNCTION;
+
     EGLint majorVersion, minorVersion;
     EGLint numOfConfigs = 0;
     EGLint result;
@@ -132,11 +163,6 @@ FBgles1Glue::init(int /*argc*/, char *** /*argv*/) {
     return true;
 }
 
-FBgles1Glue::~FBgles1Glue () {
-    eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    eglTerminate(_display);
-}
-
 int 
 FBgles1Glue::width() {
     EGLint result;

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


commit 54ac39ac843259d79de98f7abf51ac25eb4c5ecd
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 5 19:39:01 2010 -0600

    always pass the file description for the framebuffer

diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 4836c48..793ab60 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -78,6 +78,7 @@
 #include <linux/kd.h>
 #include <linux/vt.h>
 #include <boost/shared_ptr.hpp>
+#include <boost/scoped_ptr.hpp>
 
 #include <boost/cstdint.hpp>
 #include <csignal>
@@ -238,9 +239,7 @@ FBGui::init(int argc, char ***argv)
     // Initialize keyboard (still not critical)
     if (!init_keyboard()) {   
        log_debug(_("You won't have any keyboard input device, sorry."));
-    }
-    
-    // Open the framebuffer device
+    }    // Open the framebuffer device
 #ifdef ENABLE_FAKE_FRAMEBUFFER
     _fd = open(FAKEFB, O_RDWR);
 #else
@@ -281,7 +280,7 @@ FBGui::init(int argc, char ***argv)
         if (renderer == "gles1") {
             // Set the renderer to the next one to try if initializing
             // fails.
-            fb_glue.reset(new gnash::FBgles1Glue);
+            fb_glue.reset(new gnash::FBgles1Glue(_fd));
             break;
         }
 #endif
@@ -293,7 +292,7 @@ FBGui::init(int argc, char ***argv)
             // FIXME: canvas->glue.reset(new gnash::GtkEGLGlue);
             // Set the renderer to the next one to try if initializing
             // fails.
-            fb_glue.reset(new FBgles2Glue);
+            fb_glue.reset(new FBgles2Glue(_fd));
             break;
         }
 #endif
@@ -310,14 +309,16 @@ FBGui::init(int argc, char ***argv)
         }
 #endif
     }
+
+    fb_glue->init(argc, argv);
     
     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();
     _validbounds.setTo(0, 0, m_stage_width-1, m_stage_height-1);

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


commit 25ba22066f00fd486c8f1bc9c8c24a94092acab4
Author: Rob Savoye <address@hidden>
Date:   Tue Oct 5 19:37:06 2010 -0600

    added gles1 option to -r

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 787f84a..b347a1d 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -444,6 +444,10 @@ parseCommandLine(int argc, char* argv[], gnash::Player& 
player)
                             // Enable OpenGL as the rendering backend
                             player.setRenderer("opengl");
                             break;
+                        case 'g':
+                            // Enable OpenGLES 1.x as the rendering backend
+                            player.setRenderer("gles1");
+                            break;
                         case 'c':
                             // Enable Cairo as the rendering backend
                             player.setRenderer("cairo");

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

Summary of changes:
 gui/fb/fb.cpp            |   19 ++++++++++---------
 gui/fb/fb_glue_gles1.cpp |   38 ++++++++++++++++++++++++++++++++------
 gui/fb/fb_glue_gles1.h   |   38 ++++++++++++++++++--------------------
 gui/fb/fb_glue_gles2.h   |    5 ++++-
 gui/gnash.cpp            |    4 ++++
 5 files changed, 68 insertions(+), 36 deletions(-)


hooks/post-receive
-- 
Gnash