[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, openvg, updated. a6125cef1574ec4c5904
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, openvg, updated. a6125cef1574ec4c5904d79a168f6ecde7d98fef |
Date: |
Sat, 26 Feb 2011 22:07:50 +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 a6125cef1574ec4c5904d79a168f6ecde7d98fef (commit)
via cddd181ad351355d596b24ff2373bc86a4d789bd (commit)
via b558aa21492d14264f4e4a3cf1625342a0fb65e3 (commit)
via 1699b9ff8933c30203db6700b89f9171154d0391 (commit)
via 64df2f7d8b9e72a21c7ad2e4a22f8ec72c0478b6 (commit)
from b8359c35a8b5eac0d29002854692ea8d1b20c13b (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=a6125cef1574ec4c5904d79a168f6ecde7d98fef
commit a6125cef1574ec4c5904d79a168f6ecde7d98fef
Author: Rob Savoye <address@hidden>
Date: Sat Feb 26 15:05:54 2011 -0700
destroy the surrace if it exists
diff --git a/libdevice/egl/eglDevice.cpp b/libdevice/egl/eglDevice.cpp
index 7aa213f..16f1602 100644
--- a/libdevice/egl/eglDevice.cpp
+++ b/libdevice/egl/eglDevice.cpp
@@ -386,6 +386,10 @@ EGLDevice::attachWindow(GnashDevice::native_window_t
window)
_nativeWindow = static_cast<EGLNativeWindowType>(window);
}
+ if (_eglSurface != EGL_NO_SURFACE) {
+ eglDestroySurface(_eglDisplay, _eglSurface);
+ }
+
log_debug("Initializing EGL Surface");
if (_eglDisplay && _eglConfig) {
_eglSurface = eglCreateWindowSurface(_eglDisplay, _eglConfig,
http://git.savannah.gnu.org/cgit//commit/?id=cddd181ad351355d596b24ff2373bc86a4d789bd
commit cddd181ad351355d596b24ff2373bc86a4d789bd
Author: Rob Savoye <address@hidden>
Date: Sat Feb 26 15:05:25 2011 -0700
return something
diff --git a/libdevice/rawfb/RawFBDevice.h b/libdevice/rawfb/RawFBDevice.h
index e6bccb5..db906ed 100644
--- a/libdevice/rawfb/RawFBDevice.h
+++ b/libdevice/rawfb/RawFBDevice.h
@@ -100,7 +100,7 @@ class RawFBDevice : public GnashDevice
// Using RAWFB always means a native renderer
bool isNativeRender() { return true; }
- native_window_t getDrawableWindow() {GNASH_REPORT_FUNCTION; };
+ native_window_t getDrawableWindow() { return 0; };
//
// Testing Support
http://git.savannah.gnu.org/cgit//commit/?id=b558aa21492d14264f4e4a3cf1625342a0fb65e3
commit b558aa21492d14264f4e4a3cf1625342a0fb65e3
Author: Rob Savoye <address@hidden>
Date: Sat Feb 26 15:05:01 2011 -0700
add EGL_CFLAGS for all egl code
diff --git a/libdevice/egl/egl.am b/libdevice/egl/egl.am
index 1cd48c9..797970c 100644
--- a/libdevice/egl/egl.am
+++ b/libdevice/egl/egl.am
@@ -20,26 +20,29 @@
# when bring up Gnash on a new target, it's included here.
bin_PROGRAMS += eglinfo
eglinfo_SOURCES = egl/eglinfo.c
-eglinfo_CPPFLAGS = $(AM_CPPFLAGS)
+eglinfo_CPPFLAGS = $(AM_CPPFLAGS) $(EGL_CFLAGS)
eglinfo_LDADD = \
$(EXTRA_EGL_LIBS) \
- $(EGL_LIBS)
+ $(EGL_LIBS) \
+ $(NULL)
# this tests the low level EGL interface, used by OpenVG, OpenGLES1, and
OpenGLES2.
bin_PROGRAMS += test_egl
test_egl_SOURCES = egl/test_egl.cpp
-test_egl_CPPFLAGS = $(AM_CPPFLAGS)
+test_egl_CPPFLAGS = $(AM_CPPFLAGS) $(EGL_CFLAGS)
test_egl_LDADD = \
libgnashdevice.la \
$(EXTRA_EGL_LIBS) \
$(TS_LIBS) \
$(CURL_LIBS) \
$(EGL_LIBS) \
- $(GNASH_LIBS)
+ $(GNASH_LIBS) \
+ $(NULL)
libgnashdevice_la_CPPFLAGS += $(EGL_CFLAGS)
libgnashdevice_la_SOURCES += \
egl/eglDevice.cpp \
egl/eglDevice.h \
- egl/configTemplates.h
+ egl/configTemplates.h \
+ $(NULL)
libgnashdevice_la_LIBADD += $(EGL_LIBS)
http://git.savannah.gnu.org/cgit//commit/?id=1699b9ff8933c30203db6700b89f9171154d0391
commit 1699b9ff8933c30203db6700b89f9171154d0391
Author: Rob Savoye <address@hidden>
Date: Sat Feb 26 15:04:27 2011 -0700
initialize AGG renderer and set the size
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index d4b38b3..c5a0800 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -115,6 +115,7 @@
#ifdef RENDERER_AGG
# include "fb_glue_agg.h"
+# include "agg/Renderer_agg.h"
#endif
#ifdef RENDERER_OPENVG
@@ -201,11 +202,24 @@ FBGui::init(int argc, char *** argv)
// map framebuffer into memory
// Create a new Glue layer
#ifdef RENDERER_AGG
+ if (renderer.empty()) {
+ renderer = "agg";
+ }
if (renderer == "agg") {
_glue.reset(new FBAggGlue());
+ // Initialize the glue layer between the renderer and the gui toolkit
+ _glue->init(argc, argv);
+ FBAggGlue *agg = reinterpret_cast<FBAggGlue *>(_glue.get());
+ // Set "window" size
+ _width = agg->width();
+ _height = agg->height();
+ log_debug("Width:%d, Height:%d", _width, _height);
}
#endif
#ifdef RENDERER_OPENVG
+ if (renderer.empty()) {
+ renderer = "openvg";
+ }
if (renderer == "openvg") {
_glue.reset(new FBOvgGlue(0));
// Initialize the glue layer between the renderer and the gui toolkit
@@ -215,7 +229,7 @@ FBGui::init(int argc, char *** argv)
// Set "window" size
_width = ovg->getWidth();
_height = ovg->getHeight();
- log_debug("Width:%d, Height:%d", _width, _height);
+ log_debug("Width:%d, Height:%d", _width, _height);
} else {
log_error("No renderer! %s not supported.", renderer);
}
@@ -303,13 +317,15 @@ FBGui::init(int argc, char *** argv)
#ifdef RENDERER_OPENVG
_renderer.reset(renderer::openvg::create_handler(0));
-#else
- _renderer.reset(renderer::openvg::create_Renderer_agg(0));
-#endif
+
renderer::openvg::Renderer_ovg *rend = reinterpret_cast
<renderer::openvg::Renderer_ovg *>(_renderer.get());
rend->init(_width, _height);
-
+#else
+# ifdef RENDERER_AGG
+ _renderer.reset(create_Renderer_agg(0));
+# endif
+#endif
return true;
}
@@ -400,7 +416,7 @@ FBGui::createWindow(const char* /*title*/, int /*width*/,
int /*height*/,
{
GNASH_REPORT_FUNCTION;
-#if 0
+#ifdef RENDERER_AGG
if (_glue) {
_glue->prepDrawingArea(0);
return true;
http://git.savannah.gnu.org/cgit//commit/?id=64df2f7d8b9e72a21c7ad2e4a22f8ec72c0478b6
commit 64df2f7d8b9e72a21c7ad2e4a22f8ec72c0478b6
Author: Rob Savoye <address@hidden>
Date: Sat Feb 26 11:53:34 2011 -0700
disable the defaults when enable-device is specified
diff --git a/configure.ac b/configure.ac
index 5a9d339..0609020 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1139,6 +1139,8 @@ ndevice=2
AC_ARG_ENABLE(device,
AC_HELP_STRING([--enable-device], [Specify which hardware abstraction to use
to support to enable (none,openmax,egl,directfb,rawfb,x11,vaapi)]),
enableval=`echo ${enableval} | tr '\054' ' ' `
+ build_egl_device=no
+ build_rawfb_device=no
device_list=""
ndevice=0
while test -n "${enableval}" ; do
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 ++
gui/fb/fb.cpp | 28 ++++++++++++++++++++++------
libdevice/egl/egl.am | 13 ++++++++-----
libdevice/egl/eglDevice.cpp | 4 ++++
libdevice/rawfb/RawFBDevice.h | 2 +-
5 files changed, 37 insertions(+), 12 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, openvg, updated. a6125cef1574ec4c5904d79a168f6ecde7d98fef,
Rob Savoye <=