[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, openvg, updated. 5ff88673e88250e62bc1
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, openvg, updated. 5ff88673e88250e62bc1b7b6b479e043e76c866a |
|
Date: |
Tue, 05 Oct 2010 21:50:12 +0000 |
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 5ff88673e88250e62bc1b7b6b479e043e76c866a (commit)
via a6da10c89e3b9a52b1c9df032855ba76ab1ad3b8 (commit)
via abec371f26a560af5819becdba2399b5c88f5620 (commit)
via 62394808511890163c4bf088f3c7ee9ac280cf1b (commit)
via 02489519d85c6019e220ee95cf320f41c94961e3 (commit)
via 408527adac0b7c7fcad5f9542a4dd56e6d39ea14 (commit)
via 8e775a8a5ef10bdbe4a281efebeb036753f1753c (commit)
via 1afe97101e2f8409dc0901969b23f0fb88d0902b (commit)
via aee93236717eb6492bc8b86709d8f8796bb7a88d (commit)
from 0893b75a30f4136e5e834e0b5aed0136f396c115 (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=5ff88673e88250e62bc1b7b6b479e043e76c866a
commit 5ff88673e88250e62bc1b7b6b479e043e76c866a
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:49:31 2010 -0600
delete unused files
diff --git a/gui/fb/.#fbsup.h b/gui/fb/.#fbsup.h
deleted file mode 120000
index 1d9fded..0000000
--- a/gui/fb/.#fbsup.h
+++ /dev/null
@@ -1 +0,0 @@
address@hidden:1281627622
\ No newline at end of file
diff --git a/gui/fb/fb_glue_gles.cpp b/gui/fb/fb_glue_gles.cpp
deleted file mode 100644
index cd78aea..0000000
--- a/gui/fb/fb_glue_gles.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
-// Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-// gles-1.0c for Linux
-#ifdef HAVE_GLES1_GL_H
-# include <GLES/gl.h>
-#endif
-#ifdef HAVE_GLES1_EGL_H
-#include <GLES/egl.h>
-#endif
-
-#if 0
-// Mali Developer Tools for ARM 1.x
-#ifdef HAVE_EGL_EGL_H
-# include <EGL/egl.h>
-# include <EGL/eglext.h>
-#endif
-// Mali Developer Tools for ARM 2.x and Android 2.1
-#ifdef HAVE_GLES2_GL2_H
-# include <GLES2/gl2.h>
-# include <GLES2/gl2ext.h>
-#endif
-#endif
-
-#include "log.h"
-#include "fb_glue_gles.h"
-
-namespace gnash
-{
-
-bool
-FBglesGlue::init(int /*argc*/, char *** /*argv*/) {
- EGLint majorVersion, minorVersion;
- EGLint numOfConfigs = 0;
- EGLint result;
- const EGLint main_attrib_list[] = {
- EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
- EGL_BUFFER_SIZE, 32,
- EGL_DEPTH_SIZE, 16,
- EGL_NONE
- };
-
- _display = eglGetDisplay((NativeDisplayType)0);
- if (_display == EGL_NO_DISPLAY) {
- return false;
- }
- log_trace("EGL: getDisplay ok");
-
- result = eglInitialize(_display, &majorVersion, &minorVersion);
- if (result == EGL_FALSE) {
- return false;
- }
- log_trace("EGL: initialize ok");
-
- result = eglChooseConfig(_display, main_attrib_list, &_config, 1,
- &numOfConfigs);
- if (result == EGL_FALSE || numOfConfigs != 1) {
- return false;
- }
- log_trace("EGL: config ok");
-
- _surface = eglCreateWindowSurface(_display, _config, (NativeWindowType)0,
- NULL);
- if (eglGetError () != EGL_SUCCESS) {
- return false;
- }
- log_trace("EGL: surface ok");
-
- _context = eglCreateContext(_display, _config, NULL, NULL);
- if (eglGetError () != EGL_SUCCESS) {
- return false;
- }
- log_trace("EGL: context ok");
-
- eglMakeCurrent(_display, _surface, _surface, _context);
- if (eglGetError () != EGL_SUCCESS) {
- return false;
- }
- log_trace("EGL: current ok");
-
- const EGLint pbuffer_config_list[] = {
- EGL_SURFACE_TYPE, EGL_PBUFFER_BIT,
- EGL_BUFFER_SIZE, 32,
- EGL_DEPTH_SIZE, 0,
- EGL_BIND_TO_TEXTURE_RGBA, EGL_TRUE,
- EGL_CONFIG_CAVEAT, EGL_NONE,
- EGL_NONE
- };
-
- result = eglChooseConfig(_display, pbuffer_config_list, &_pbuffer_config,
- 1, &numOfConfigs);
- if (result == EGL_FALSE || numOfConfigs == 0) {
- return false;
- }
- log_trace("EGL: pbuffer config ok");
-
- const EGLint pbuffer_attrib_list[] = {
- EGL_WIDTH, EGL_MAX_PBUFFER_WIDTH,
- EGL_HEIGHT, EGL_MAX_PBUFFER_HEIGHT,
- EGL_TEXTURE_FORMAT, EGL_TEXTURE_RGBA,
- EGL_TEXTURE_TARGET, EGL_TEXTURE_2D,
- EGL_MIPMAP_TEXTURE, EGL_FALSE,
- EGL_NONE
- };
-
- _pbuffer = eglCreatePbufferSurface(_display, _pbuffer_config,
- pbuffer_attrib_list);
- if (eglGetError () != EGL_SUCCESS) {
- return false;
- }
- log_trace("EGL: pbuffer surface ok");
-
- return true;
-}
-
-FBglesGlue::~FBglesGlue () {
- eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
- eglTerminate(_display);
-}
-
-int
-FBglesGlue::width() {
- EGLint result;
- eglQuerySurface (_display, _surface, EGL_WIDTH, &result);
- log_trace("EGL: width %d", result);
- return result;
-}
-
-int
-FBglesGlue::height() {
- EGLint result;
- eglQuerySurface (_display, _surface, EGL_HEIGHT, &result);
- log_trace("EGL: height %d", result);
- return result;
-}
-
-void
-FBglesGlue::render() {
- eglSwapBuffers(_display, _surface);
-}
-
-void
-FBglesGlue::render_to_pbuffer () {
- if (_pbuffer != EGL_NO_SURFACE)
- eglMakeCurrent(_display, _pbuffer, _pbuffer, _context);
-}
-
-void
-FBglesGlue::prepare_copy_from_pbuffer () {
- if (_pbuffer != EGL_NO_SURFACE)
- eglMakeCurrent(_display, _surface, _pbuffer, _context);
-}
-
-void
-FBglesGlue::render_to_display () {
- if (_pbuffer != EGL_NO_SURFACE)
- eglMakeCurrent(_display, _surface, _surface, _context);
-}
-
-} // namespace gnash
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: nil
-// End:
diff --git a/gui/fb/fb_glue_gles.h b/gui/fb/fb_glue_gles.h
deleted file mode 100644
index e6a914b..0000000
--- a/gui/fb/fb_glue_gles.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//
-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
-// Free Software Foundation, Inc.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-#ifndef FB_OGL_GLUE_H
-#define FB_OGL_GLUE_H
-
-#ifdef HAVE_CONFIG_H
-#include "gnashconfig.h"
-#endif
-
-// gles-1.0c for Linux
-#ifdef HAVE_GLES1_GL_H
-# include <GLES/gl.h>
-# endif
-#ifdef HAVE_GLES1_EGL_H
-#include <GLES/egl.h>
-#endif
-#if 0
-// Mali Developer Tools for ARM 1.x
-#ifdef HAVE_EGL_EGL_H
-# include <EGL/egl.h>
-# include <EGL/eglext.h>
-#endif
-// Mali Developer Tools for ARM 2.x and Android 2.1
-#ifdef HAVE_GLES2_GL2_H
-# include <GLES2/gl2.h>
-# include <GLES2/gl2ext.h>
-#endif
-#endif
-
-#include "fbsup.h"
-#include "render_handler_gles.h"
-
-namespace gnash
-{
-
- class FBglesGlue: public FBGlue // , public OglGlue
-{
-public:
- FBglesGlue() :
- _surface (EGL_NO_SURFACE),
- _pbuffer (EGL_NO_SURFACE) {}
- virtual ~FBglesGlue();
-
- 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 void setInvalidatedRegions(const InvalidatedRanges& /* ranges */)
{}
-
- virtual int width ();
- virtual int height ();
- virtual void render ();
-
- virtual void render_to_pbuffer ();
- virtual void prepare_copy_from_pbuffer ();
- virtual void render_to_display ();
-
-private:
- render_handler* _render_handler;
- EGLDisplay _display;
- EGLConfig _config;
- EGLContext _context;
- EGLSurface _surface;
- EGLConfig _pbuffer_config;
- EGLSurface _pbuffer;
-};
-
-} // namespace gnash
-
-#endif // FB_OGL_GLUE_H
-
-// Local Variables:
-// mode: C++
-// indent-tabs-mode: nil
-// End:
http://git.savannah.gnu.org/cgit//commit/?id=a6da10c89e3b9a52b1c9df032855ba76ab1ad3b8
commit a6da10c89e3b9a52b1c9df032855ba76ab1ad3b8
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:49:11 2010 -0600
minor style cleanup of conditionals
diff --git a/configure.ac b/configure.ac
index 7f55070..a269ae4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1070,12 +1070,12 @@ if test x$pixelformat = xall; then
fi
fi
-AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x$build_ovg = xyes ])
-AM_CONDITIONAL(BUILD_GLES1_RENDERER, [ test x$build_gles1 = xyes ])
-AM_CONDITIONAL(BUILD_GLES2_RENDERER, [ test x$build_gles2 = xyes ])
-AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes])
-AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg = xyes ])
-AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x$build_cairo = xyes ])
+AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x${build_ovg} = xyes ])
+AM_CONDITIONAL(BUILD_GLES1_RENDERER, [ test x${build_gles1} = xyes ])
+AM_CONDITIONAL(BUILD_GLES2_RENDERER, [ test x${build_gles2} = xyes ])
+AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x${build_ogl} = xyes])
+AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x${build_agg} = xyes ])
+AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x${build_cairo} = xyes ])
if test x"${build_ovg}" = xyes; then
AC_DEFINE([RENDERER_OPENVG], [1], [Use OpenVG renderer])
http://git.savannah.gnu.org/cgit//commit/?id=abec371f26a560af5819becdba2399b5c88f5620
commit abec371f26a560af5819becdba2399b5c88f5620
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:48:29 2010 -0600
use RENDERER_OPENVG instead of HAVE_VG_OPENVG_H
diff --git a/gui/gtk/gtk_canvas.cpp b/gui/gtk/gtk_canvas.cpp
index e7ea3ea..4167898 100644
--- a/gui/gtk/gtk_canvas.cpp
+++ b/gui/gtk/gtk_canvas.cpp
@@ -39,7 +39,7 @@
# include "gtk_glue_gtkglext.h"
#endif
-#ifdef HAVE_VG_OPENVG_H
+#ifdef RENDERER_OPENVG
# include "gtk_glue_egl.h"
#endif
http://git.savannah.gnu.org/cgit//commit/?id=62394808511890163c4bf088f3c7ee9ac280cf1b
commit 62394808511890163c4bf088f3c7ee9ac280cf1b
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:38:09 2010 -0600
only list the default libraries once
diff --git a/gui/gtk/gtk.am b/gui/gtk/gtk.am
index 78aece7..6a7aba9 100644
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@ -33,20 +33,20 @@ gtk_gnash_SOURCES = $(GUI_SRCS) $(GTK_CANVAS) \
gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
$(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
+ $(GNASH_LIBS) $(GTK_LIBS)
#gtk_gnash_DEPENDENCIES = .configline
if BUILD_OGL_RENDERER
gtk_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
gtk_gnash_SOURCES += gtk/gtk_glue_gtkglext.cpp gtk/gtk_glue_gtkglext.h
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(OPENGL_LIBS)
+gtk_gnash_LDADD += $(OPENGL_LIBS)
endif # BUILD_OGL_RENDERER
if BUILD_AGG_RENDERER
gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
gtk_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
+gtk_gnash_LDADD += $(AGG_LIBS)
if HAVE_XV
gtk_gnash_SOURCES += gtk/gtk_glue_agg_xv.cpp gtk/gtk_glue_agg_xv.h
gtk_gnash_LDADD += $(X11_LIBS)
@@ -68,20 +68,18 @@ gtk_gnash_LDADD += \
endif # USE_VAAPI
endif # BUILD_AGG_RENDERER
-if BUILD_CAIRO_RENDERER
-gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
-gtk_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(CAIRO_LIBS)
-endif # BUILD_CAIRO_RENDERER
-
if BUILD_OVG_RENDERER
gtk_gnash_CPPFLAGS += $(OPENVG_CFLAGS) $(EGL_CFLAGS)
gtk_gnash_SOURCES += gtk/gtk_glue_egl.cpp gtk/gtk_glue_egl.h
-gtk_gnash_LDADD = $(top_builddir)/librender/libgnashrender.la \
- $(GNASH_LIBS) $(GTK_LIBS) $(OPENVG_LIBS) $(EGL_LIBS)
-
+gtk_gnash_LDADD += $(OPENVG_LIBS) $(EGL_LIBS)
endif # BUILD_OVG_RENDERER
+if BUILD_CAIRO_RENDERER
+gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
+gtk_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h
+gtk_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
+ $(CAIRO_LIBS)
+endif # BUILD_CAIRO_RENDERER
+
endif # BUILD_GTK_GUI
http://git.savannah.gnu.org/cgit//commit/?id=02489519d85c6019e220ee95cf320f41c94961e3
commit 02489519d85c6019e220ee95cf320f41c94961e3
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:37:25 2010 -0600
more seperation of OpenGLES1 from OpenGLES2
diff --git a/gui/fb/fb_glue_gles1.cpp b/gui/fb/fb_glue_gles1.cpp
index 6b7396f..f12cb20 100644
--- a/gui/fb/fb_glue_gles1.cpp
+++ b/gui/fb/fb_glue_gles1.cpp
@@ -48,7 +48,7 @@ namespace gnash
{
bool
-FBglesGlue::init(int /*argc*/, char *** /*argv*/) {
+FBgles1Glue::init(int /*argc*/, char *** /*argv*/) {
EGLint majorVersion, minorVersion;
EGLint numOfConfigs = 0;
EGLint result;
@@ -132,13 +132,13 @@ FBglesGlue::init(int /*argc*/, char *** /*argv*/) {
return true;
}
-FBglesGlue::~FBglesGlue () {
+FBgles1Glue::~FBgles1Glue () {
eglMakeCurrent(_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
eglTerminate(_display);
}
int
-FBglesGlue::width() {
+FBgles1Glue::width() {
EGLint result;
eglQuerySurface (_display, _surface, EGL_WIDTH, &result);
log_trace("EGL: width %d", result);
@@ -146,7 +146,7 @@ FBglesGlue::width() {
}
int
-FBglesGlue::height() {
+FBgles1Glue::height() {
EGLint result;
eglQuerySurface (_display, _surface, EGL_HEIGHT, &result);
log_trace("EGL: height %d", result);
@@ -154,24 +154,24 @@ FBglesGlue::height() {
}
void
-FBglesGlue::render() {
+FBgles1Glue::render() {
eglSwapBuffers(_display, _surface);
}
void
-FBglesGlue::render_to_pbuffer () {
+FBgles1Glue::render_to_pbuffer () {
if (_pbuffer != EGL_NO_SURFACE)
eglMakeCurrent(_display, _pbuffer, _pbuffer, _context);
}
void
-FBglesGlue::prepare_copy_from_pbuffer () {
+FBgles1Glue::prepare_copy_from_pbuffer () {
if (_pbuffer != EGL_NO_SURFACE)
eglMakeCurrent(_display, _surface, _pbuffer, _context);
}
void
-FBglesGlue::render_to_display () {
+FBgles1Glue::render_to_display () {
if (_pbuffer != EGL_NO_SURFACE)
eglMakeCurrent(_display, _surface, _surface, _context);
}
diff --git a/gui/fb/fb_glue_gles1.h b/gui/fb/fb_glue_gles1.h
index d55eee6..5c1b48b 100644
--- a/gui/fb/fb_glue_gles1.h
+++ b/gui/fb/fb_glue_gles1.h
@@ -44,18 +44,19 @@
#endif
#include "fbsup.h"
-#include "render_handler_gles.h"
+//#include "render_handler_gles.h"
namespace gnash
{
+class render_handler;
- class FBglesGlue: public FBGlue // , public OglGlue
+ class FBgles1Glue: public FBGlue // , public OglGlue
{
public:
- FBglesGlue() :
+ FBgles1Glue() :
_surface (EGL_NO_SURFACE),
_pbuffer (EGL_NO_SURFACE) {}
- virtual ~FBglesGlue();
+ virtual ~FBgles1Glue();
virtual bool init(int /*argc*/, char *** /*argv*/);
diff --git a/gui/fb/fb_glue_gles2.cpp b/gui/fb/fb_glue_gles2.cpp
index 9ce1ffd..baede8a 100644
--- a/gui/fb/fb_glue_gles2.cpp
+++ b/gui/fb/fb_glue_gles2.cpp
@@ -47,6 +47,49 @@
namespace gnash
{
+FBgles2Glue::FBgles2Glue()
+{
+}
+
+FBgles2Glue::~FBgles2Glue () {
+}
+
+bool
+FBgles2Glue::init(int /*argc*/, char *** /*argv*/)
+{
+
+}
+
+Renderer*
+FBgles2Glue::createRenderHandler()
+{
+
+}
+
+int
+FBgles2Glue::width() {
+}
+
+int
+FBgles2Glue::height() {
+}
+
+void
+FBgles2Glue::render() {
+}
+
+void
+FBgles2Glue::render_to_pbuffer () {
+}
+
+void
+FBgles2Glue::prepare_copy_from_pbuffer () {
+}
+
+void
+FBgles2Glue::render_to_display () {
+}
+
} // namespace gnash
// Local Variables:
diff --git a/gui/fb/fb_glue_gles2.h b/gui/fb/fb_glue_gles2.h
index a5af1f4..daa8ac3 100644
--- a/gui/fb/fb_glue_gles2.h
+++ b/gui/fb/fb_glue_gles2.h
@@ -44,7 +44,7 @@
#endif
#include "fbsup.h"
-#include "render_handler_gles.h"
+//#include "render_handler_gles.h"
namespace gnash
{
@@ -52,6 +52,21 @@ namespace gnash
class FBgles2Glue: public FBGlue // , public OglGlue
{
public:
+ FBgles2Glue();
+ virtual ~FBgles2Glue();
+
+ virtual bool init(int /*argc*/, char *** /*argv*/);
+
+ virtual Renderer* createRenderHandler();
+ virtual void setInvalidatedRegions(const InvalidatedRanges& /* ranges */)
{}
+
+ virtual int width ();
+ virtual int height ();
+ virtual void render ();
+
+ virtual void render_to_pbuffer ();
+ virtual void prepare_copy_from_pbuffer ();
+ virtual void render_to_display ();
private:
};
http://git.savannah.gnu.org/cgit//commit/?id=408527adac0b7c7fcad5f9542a4dd56e6d39ea14
commit 408527adac0b7c7fcad5f9542a4dd56e6d39ea14
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:35:02 2010 -0600
use a boost:scoped_ptr instead of a real pointer
diff --git a/gui/fb/fbsup.h b/gui/fb/fbsup.h
index 05ed5b1..b09e4e2 100644
--- a/gui/fb/fbsup.h
+++ b/gui/fb/fbsup.h
@@ -24,6 +24,7 @@
#endif
#include <vector>
+#include <boost/scoped_ptr.hpp>
#include "gui.h"
#include <linux/fb.h>
@@ -131,7 +132,7 @@ private:
// Keyboard SHIFT/CTRL/ALT states (left + right)
bool keyb_lshift, keyb_rshift, keyb_lctrl, keyb_rctrl, keyb_lalt,
keyb_ralt;
- 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=8e775a8a5ef10bdbe4a281efebeb036753f1753c
commit 8e775a8a5ef10bdbe4a281efebeb036753f1753c
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:34:03 2010 -0600
Choose a renderer
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 1a5c0a7..4836c48 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -101,8 +101,12 @@
#include "fb_glue_ovg.h"
#endif
-#ifdef RENDERER_GLES
-#include "fb_glue_gles.h"
+#ifdef RENDERER_GLES1
+#include "fb_glue_gles1.h"
+#endif
+
+#ifdef RENDERER_GLES2
+#include "fb_glue_gles2.h"
#endif
#include <linux/input.h> // for /dev/input/event*
@@ -117,6 +121,7 @@
namespace gnash
{
+ gnash::RcInitFile& rcfile = gnash::RcInitFile::getDefaultInstance();
FBGlue::FBGlue ()
{
@@ -246,17 +251,67 @@ FBGui::init(int argc, char ***argv)
return false;
}
+ // Get the value of the default renderer
+ std::string renderer = rcfile.getRenderer();
+ // If a renderer hasn't been defined in gnashrc, or on the command
+ // line, pick a sensible default.
+ if (renderer.empty()) {
+ renderer = "agg";
+ }
+
+ // FIXME: This loop should handle fallback better
+ bool initialized_renderer = false;
+ while (!initialized_renderer) {
+#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.
+ 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);
+ 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
+ // manufacturer provided SDKs.
+ if (renderer == "gles1") {
+ // Set the renderer to the next one to try if initializing
+ // fails.
+ fb_glue.reset(new gnash::FBgles1Glue);
+ 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
+ // 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);
+ break;
+ }
+#endif
#ifdef RENDERER_AGG
- fb_glue = new FBAggGlue(_fd);
+ // 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));
+ initialized_renderer = true;
+ }
#endif
-// #ifdef RENDERER_OPENVG
-// fb_glue = 0; // new FBOvgGlue(_fd);
-// #endif
-// #ifdef RENDERER_GLES
-// fb_glue = new FBglesGlue(_fd);
-// #endif
-
- if (fb_glue == 0) {
+ }
+
+ if (fb_glue) {
log_error("No renderer created!");
return false;
} else if (!fb_glue->init(argc, argv)) {
http://git.savannah.gnu.org/cgit//commit/?id=1afe97101e2f8409dc0901969b23f0fb88d0902b
commit 1afe97101e2f8409dc0901969b23f0fb88d0902b
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 15:09:05 2010 -0600
minor style cleanup
diff --git a/configure.ac b/configure.ac
index a09ff92..7f55070 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1078,20 +1078,20 @@ AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg =
xyes ])
AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x$build_cairo = xyes ])
if test x"${build_ovg}" = xyes; then
- AC_DEFINE([RENDERER_OPENVG], [], [Use OpenVG renderer])
+ AC_DEFINE([RENDERER_OPENVG], [1], [Use OpenVG renderer])
fi
if test x"${build_ogl}" = xyes; then
- AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
+ AC_DEFINE([RENDERER_OPENGL], [1], [Use OpenGL renderer])
fi
-if test x"$build_agg" = xyes; then
- AC_DEFINE([RENDERER_AGG], [], [Use AntiGrain renderer])
+if test x"${build_agg}" = xyes; then
+ AC_DEFINE([RENDERER_AGG], [1], [Use AntiGrain renderer])
fi
-if test x"$build_cairo" = xyes; then
+if test x"${build_cairo}" = xyes; then
GNASH_PKG_FIND(cairo, [cairo.h], [cairo render library], cairo_status)
- AC_DEFINE([RENDERER_CAIRO], [], [Use cairo renderer])
+ AC_DEFINE([RENDERER_CAIRO], [1], [Use cairo renderer])
fi
if test x"${build_agg}" = xyes; then
http://git.savannah.gnu.org/cgit//commit/?id=aee93236717eb6492bc8b86709d8f8796bb7a88d
commit aee93236717eb6492bc8b86709d8f8796bb7a88d
Author: Rob Savoye <address@hidden>
Date: Tue Oct 5 14:43:09 2010 -0600
add OpenVG render constant to gnashconfig
diff --git a/configure.ac b/configure.ac
index b050e0f..a09ff92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1077,6 +1077,10 @@ AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl =
xyes])
AM_CONDITIONAL(BUILD_AGG_RENDERER, [ test x$build_agg = xyes ])
AM_CONDITIONAL(BUILD_CAIRO_RENDERER, [ test x$build_cairo = xyes ])
+if test x"${build_ovg}" = xyes; then
+ AC_DEFINE([RENDERER_OPENVG], [], [Use OpenVG renderer])
+fi
+
if test x"${build_ogl}" = xyes; then
AC_DEFINE([RENDERER_OPENGL], [], [Use OpenGL renderer])
fi
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 26 ++++---
gui/fb/.#fbsup.h | 1 -
gui/fb/fb.cpp | 77 ++++++++++++++++---
gui/fb/fb_glue_gles.cpp | 184 ----------------------------------------------
gui/fb/fb_glue_gles.h | 96 ------------------------
gui/fb/fb_glue_gles1.cpp | 16 ++--
gui/fb/fb_glue_gles1.h | 9 +-
gui/fb/fb_glue_gles2.cpp | 43 +++++++++++
gui/fb/fb_glue_gles2.h | 17 ++++-
gui/fb/fbsup.h | 3 +-
gui/gtk/gtk.am | 26 +++----
gui/gtk/gtk_canvas.cpp | 2 +-
12 files changed, 168 insertions(+), 332 deletions(-)
delete mode 120000 gui/fb/.#fbsup.h
delete mode 100644 gui/fb/fb_glue_gles.cpp
delete mode 100644 gui/fb/fb_glue_gles.h
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, openvg, updated. 5ff88673e88250e62bc1b7b6b479e043e76c866a,
Rob Savoye <=