[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, openvg, updated. 9d4b136c579618ad2b97
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, openvg, updated. 9d4b136c579618ad2b9738857da7871b9d6d14a8 |
|
Date: |
Thu, 25 Nov 2010 20:33:22 +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 9d4b136c579618ad2b9738857da7871b9d6d14a8 (commit)
via 34d42f4404c96458db5e14bdb09d6d5385665424 (commit)
via bdde3036ad7ca60027a2d4f045491ceaf2839b93 (commit)
via 23a333b1c801ccd0b4d560e5ed7aa471e7fe8b12 (commit)
via 4707fcb5862e99de76b04f166d3861f74cf73356 (commit)
via 9f379b8649b7017e702dba52d2fea28c53f4569a (commit)
via 0d29354b8b87245eb75c70168217a731f0e4de7c (commit)
via 523e6464e48f9b1762d02d4edd775951a3453494 (commit)
via 2bf1f7626a536f83af625ffba8ee48893f31fea8 (commit)
via a17403581f26da25931aab579aa541e004d31fef (commit)
via d2d0e1c660ad49fe308b348bdf1198fb14cda86c (commit)
via 4f989d83eded625d37f1b5d0ba605998f1fe4e0d (commit)
from 2f3d03c91d5a1ab58e87621052cf0a3178c1fa80 (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=9d4b136c579618ad2b9738857da7871b9d6d14a8
commit 9d4b136c579618ad2b9738857da7871b9d6d14a8
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:33:04 2010 -0700
add comment blocks, add gui namespace
diff --git a/gui/fb/fb.cpp b/gui/fb/fb.cpp
index 629abd4..793f918 100644
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@ -160,6 +160,8 @@ FBGui::FBGui(unsigned long xid, float scale, bool loop,
RunResources& r)
FBGui::~FBGui()
{
+ GNASH_REPORT_FUNCTION;
+
if (fd > 0) {
enable_terminal();
log_debug(_("Closing framebuffer device"));
@@ -179,6 +181,8 @@ FBGui::set_grayscale_lut8()
{
#define TO_16BIT(x) (x | (x<<8))
+ GNASH_REPORT_FUNCTION;
+
struct fb_cmap cmap;
int i;
@@ -219,7 +223,7 @@ FBGui::set_grayscale_lut8()
bool
FBGui::init(int argc, char *** argv)
{
- // GNASH_REPORT_FUNCTION;
+ GNASH_REPORT_FUNCTION;
// Initialize all the input devices
@@ -311,7 +315,7 @@ FBGui::init(int argc, char *** argv)
bool
FBGui::run()
{
- // GNASH_REPORT_FUNCTION;
+ GNASH_REPORT_FUNCTION;
#ifdef USE_TSLIB
int ts_loop_count;
@@ -352,7 +356,7 @@ FBGui::run()
void
FBGui::renderBuffer()
{
- // GNASH_REPORT_FUNCTION;
+ GNASH_REPORT_FUNCTION;
if ( _drawbounds.size() == 0 ) return; // nothing to do..
@@ -459,11 +463,18 @@ FBGui::setInvalidatedRegion(const SWFRect& /* bounds */)
void
FBGui::setInvalidatedRegions(const InvalidatedRanges& ranges)
{
+ GNASH_REPORT_FUNCTION;
+
+ if (!_renderer) {
+ log_error("No renderer set!");
+ return;
+ }
+
_renderer->set_invalidated_regions(ranges);
_drawbounds.clear();
- for (unsigned int rno=0; rno<ranges.size(); rno++) {
+ for (size_t rno = 0; rno<ranges.size(); rno++) {
geometry::Range2d<int> bounds = Intersection(
_renderer->world_to_pixel(ranges.getRange(rno)),
_validbounds);
diff --git a/gui/fb/fb_glue_agg.cpp b/gui/fb/fb_glue_agg.cpp
index 705e39a..9ccac9c 100644
--- a/gui/fb/fb_glue_agg.cpp
+++ b/gui/fb/fb_glue_agg.cpp
@@ -230,20 +230,18 @@ void
FBAggGlue::prepDrawingArea(FbWidget */* drawing_area */)
{
GNASH_REPORT_FUNCTION;
-
}
void
FBGlue::render(void * /* region */)
{
GNASH_REPORT_FUNCTION;
-
}
void
FBAggGlue::render()
{
-// GNASH_REPORT_FUNCTION;
+ GNASH_REPORT_FUNCTION;
if ( _drawbounds.size() == 0 ) {
return; // nothing to do..
diff --git a/gui/fb/fb_glue_agg.h b/gui/fb/fb_glue_agg.h
index cc8460f..dd457fe 100644
--- a/gui/fb/fb_glue_agg.h
+++ b/gui/fb/fb_glue_agg.h
@@ -42,23 +42,60 @@ public:
// All of these virtuals are all defined in the base FBGlue class
~FBAggGlue();
-
+
+ /// \brief
+ /// Initialise the Framebuffer GUI and the AGG renderer.
+ ///
+ /// @param argc The commandline argument count.
+ /// @param argv The commandline arguments.
+ /// @return True on success; false on failure.
bool init(int argc, char ***argv);
+
Renderer *createRenderHandler();
+
+ /// \brief
+ /// Hand off a handle to the native drawing area to the renderer
void prepDrawingArea(void *drawing_area);
+
+ /// Gives the GUI a *hint* which region of the stage should be redrawn.
+ //
+ /// There is *no* restriction what the GUI might do with these
coordinates.
+ /// Normally the GUI forwards the information to the renderer so that
+ /// it avoids rendering regions that did not change anyway. The GUI can
+ /// also alter the bounds before passing them to the renderer and it's
+ /// absolutely legal for the GUI to simply ignore the call.
+ ///
+ /// Coordinates are in TWIPS!
+ ///
+ /// Note this information is given to the GUI and not directly to the
+ /// renderer because both of them need to support this feature for
+ /// correct results. It is up to the GUI to forward this information to
+ /// the renderer.
+ ///
+ // does not need to be implemented (optional feature),
+ // but still needs to be available.
+ //
void setInvalidatedRegions(const InvalidatedRanges &ranges);
+ /// \brief
+ /// The Width of the drawing area, in pixels. For framebuffer
+ /// based devices, this is the size of the display screen.
int width();
+
+ /// Height of the drawing area, in pixels. For framebuffer
+ /// based devices, this is the size of the display screen.
int height();
+
+ /// Render the current buffer.
void render();
void render(void* const /* region */) { };
/// For 8 bit (palette / LUT) modes, sets a grayscale palette.
//
- /// This GUI currently does not support palette modes.
- //
+ /// This GUI currently does not support palette modes.
bool set_grayscale_lut8();
protected:
+ /// This is the file descriptor for the framebuffer memory
int _fd;
struct fb_var_screeninfo _var_screeninfo;
struct fb_fix_screeninfo _fix_screeninfo;
diff --git a/gui/fb/gui_fb.cpp b/gui/fb/gui_fb.cpp
index 9690f2f..62a5c85 100644
--- a/gui/fb/gui_fb.cpp
+++ b/gui/fb/gui_fb.cpp
@@ -31,6 +31,8 @@
namespace gnash {
+namespace gui {
+
#ifdef GUI_FB
std::auto_ptr<Gui> createFBGui(unsigned long windowid, float scale, bool
do_loop, RunResources& r)
{
@@ -43,5 +45,10 @@ std::auto_ptr<Gui> createFBGui(unsigned long , float, bool,
RunResourcesfloat ,
}
#endif // ! GUI_FB
-} // namespace gnash
+} // end of namespace gui
+} // end of namespace gnash
+// local Variables:
+// mode: C++
+// indent-tabs-mode: nil
+// End:
http://git.savannah.gnu.org/cgit//commit/?id=34d42f4404c96458db5e14bdb09d6d5385665424
commit 34d42f4404c96458db5e14bdb09d6d5385665424
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:31:51 2010 -0700
use C++ style comments
diff --git a/gui/gui.h b/gui/gui.h
index ae9d2d4..c81bb56 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -88,13 +88,12 @@ public:
virtual ~Gui();
- /** \brief
- * Initialise the gui and the associated renderer.
- *
- * @param argc The commandline argument count.
- * @param argv The commandline arguments.
- * @return True on success; false on failure.
- */
+ /// \brief/
+ /// Initialise the gui and the associated renderer.
+ ///
+ /// @param argc The commandline argument count.
+ /// @param argv The commandline arguments.
+ /// @return True on success; false on failure.
virtual bool init(int argc, char **argv[]) = 0;
/// Set main loop delay in milliseconds.
@@ -126,15 +125,14 @@ public:
void setScreenShotter(std::auto_ptr<ScreenShotter> ss);
- /** \brief
- * Create and display our window.
- *
- * @param title The window title.
- * @param width The desired window width in pixels.
- * @param height The desired window height in pixels.
- * @param xPosition The desired window X position from the top left corner.
- * @param yPosition The desired window Y position from the top left corner.
- */
+ /// \brief
+ /// Create and display our window.
+ ///
+ /// @param title The window title.
+ /// @param width The desired window width in pixels.
+ /// @param height The desired window height in pixels.
+ /// @param xPosition The desired window X position from the top left
corner.
+ /// @param yPosition The desired window Y position from the top left
corner.
virtual bool createWindow(const char* title, int width, int height,
int xPosition = 0, int yPosition = 0) = 0;
http://git.savannah.gnu.org/cgit//commit/?id=bdde3036ad7ca60027a2d4f045491ceaf2839b93
commit bdde3036ad7ca60027a2d4f045491ceaf2839b93
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:31:12 2010 -0700
don't try to use a device that isn't initialized
diff --git a/librender/opengles2/Renderer_gles2.cpp
b/librender/opengles2/Renderer_gles2.cpp
index 0591af7..56c6c45 100644
--- a/librender/opengles2/Renderer_gles2.cpp
+++ b/librender/opengles2/Renderer_gles2.cpp
@@ -95,7 +95,7 @@ Renderer_gles2::init(float x, float y)
CachedBitmap *
Renderer_gles2::createCachedBitmap(std::auto_ptr<gnash::image::GnashImage>)
{
-
+ return 0;
}
void
diff --git a/librender/openvg/Renderer_ovg.cpp
b/librender/openvg/Renderer_ovg.cpp
index d8652f5..a2697e6 100644
--- a/librender/openvg/Renderer_ovg.cpp
+++ b/librender/openvg/Renderer_ovg.cpp
@@ -236,6 +236,9 @@ Renderer_ovg::Renderer_ovg()
_drawing_mask(false)
{
GNASH_REPORT_FUNCTION;
+#ifdef BUILD_EGL_DEVICE
+// _device.reset(new renderer::EGLDevice);
+#endif
}
Renderer_ovg::Renderer_ovg(renderer::GnashDevice::dtype_t dtype)
@@ -347,6 +350,8 @@
Renderer_ovg::createCachedBitmap(std::auto_ptr<image::GnashImage> im)
default:
std::abort();
}
+
+ return 0;
}
// Since we store drawing operations in display lists, we take special care
@@ -454,6 +459,11 @@ Renderer_ovg::drawLine(const std::vector<point>& coords,
const rgba& fill,
VGfloat gdata[MAX_SEG*3*2];
int scount = 0;
int dcount = 0;
+
+ if (!_device) {
+ log_error("No Device specified for OpenVG to draw on!");
+ return;
+ }
if (coords.empty()) return;
@@ -515,6 +525,11 @@ Renderer_ovg::drawPoly(const point* corners, size_t
corner_count,
VGfloat gdata[MAX_SEG*3*2];
int scount = 0;
int dcount = 0;
+
+ if (!_device) {
+ log_error("No Device specified for OpenVG to draw on!");
+ return;
+ }
if (corner_count < 1) {
return;
http://git.savannah.gnu.org/cgit//commit/?id=23a333b1c801ccd0b4d560e5ed7aa471e7fe8b12
commit 23a333b1c801ccd0b4d560e5ed7aa471e7fe8b12
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:30:32 2010 -0700
add support for querying display devices
diff --git a/librender/Renderer.h b/librender/Renderer.h
index f05a1fd..42f57a1 100644
--- a/librender/Renderer.h
+++ b/librender/Renderer.h
@@ -205,11 +205,8 @@ class DSOEXPORT Renderer : boost::noncopyable
{
public:
- Renderer()
- :
- _quality(QUALITY_HIGH)
- {}
-
+ Renderer(): _quality(QUALITY_HIGH) { }
+
virtual ~Renderer() {}
/// Return a description of this renderer.
@@ -495,42 +492,49 @@ public:
#endif
boost::shared_array<renderer::GnashDevice::dtype_t> devs
(new renderer::GnashDevice::dtype_t[total]);
+#ifdef BUILD_X11_DEVICE
+ devs[--total] = renderer::GnashDevice::X11;
+#endif
#ifdef BUILD_EGL_DEVICE
- devs[--total];
+ devs[--total] = renderer::GnashDevice::EGL;
#endif
#ifdef BUILD_DIRECTFB_DEVICE
- devs[--total];
-#endif
-#ifdef BUILD_X11_DEVICE
- devs[--total];
+ devs[--total] = renderer::GnashDevice::DIRECTFB;
#endif
return devs;
}
+
+ renderer::GnashDevice::dtype_t getDevice()
+ {
+ if (_device) {
+ }
+ return renderer::GnashDevice::NODEV;
+ }
void setDevice(renderer::GnashDevice::dtype_t dtype) {
switch (dtype) {
-#if BUILD_EGL_DEVICE
+#ifdef BUILD_EGL_DEVICE
case renderer::GnashDevice::EGL:
{
_device.reset(new renderer::EGLDevice);
break;
}
#endif
-#if BUILD_DIRECTFB_DEVICE
+#ifdef BUILD_DIRECTFB_DEVICE
case renderer::GnashDevice::DIRECTFB:
{
_device.reset(new renderer::directfb::DirectFBDevice);
break;
}
#endif
-//#ifdef BUILD_X11_DEVICE
+#ifdef BUILD_X11_DEVICE
case renderer::GnashDevice::X11:
{
_device.reset(new renderer::x11::X11Device);
break;
}
-//#endif
+#endif
default:
log_error("unsupported Display Device!");
}
http://git.savannah.gnu.org/cgit//commit/?id=4707fcb5862e99de76b04f166d3861f74cf73356
commit 4707fcb5862e99de76b04f166d3861f74cf73356
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:29:40 2010 -0700
add new required method for getType()
diff --git a/librender/GnashDevice.h b/librender/GnashDevice.h
index 9e5a619..b8e42e9 100644
--- a/librender/GnashDevice.h
+++ b/librender/GnashDevice.h
@@ -45,11 +45,13 @@ struct GnashDevice
/// the list of supported renders that use devices
typedef enum {OPENVG, OPENGL, OPENGLES1, OPENGLES2, XORG, VAAPI} rtype_t;
- typedef enum {EGL, DIRECTFB, X11} dtype_t;
+ typedef enum {NODEV, EGL, DIRECTFB, X11} dtype_t;
GnashDevice() { GNASH_REPORT_FUNCTION; };
virtual ~GnashDevice() { GNASH_REPORT_FUNCTION; };
+ virtual dtype_t getType() = 0;
+
// Initialize GNASH Device layer
virtual bool initDevice(int argc, char *argv[]) = 0;
http://git.savannah.gnu.org/cgit//commit/?id=9f379b8649b7017e702dba52d2fea28c53f4569a
commit 9f379b8649b7017e702dba52d2fea28c53f4569a
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:29:16 2010 -0700
return the device type of the instantiated class
diff --git a/librender/eglDevice.h b/librender/eglDevice.h
index 087b74a..8bd9004 100644
--- a/librender/eglDevice.h
+++ b/librender/eglDevice.h
@@ -64,6 +64,8 @@ class EGLDevice : public GnashDevice
virtual ~EGLDevice();
+ dtype_t getType() { return EGL; };
+
// Initialize EGL Device layer
bool initDevice(int argc, char *argv[]);
http://git.savannah.gnu.org/cgit//commit/?id=0d29354b8b87245eb75c70168217a731f0e4de7c
commit 0d29354b8b87245eb75c70168217a731f0e4de7c
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:28:50 2010 -0700
return the device type of the instantiated class
diff --git a/librender/directfb/DirectFBDevice.h
b/librender/directfb/DirectFBDevice.h
index 9c61e09..b70e80d 100644
--- a/librender/directfb/DirectFBDevice.h
+++ b/librender/directfb/DirectFBDevice.h
@@ -47,6 +47,8 @@ class DirectFBDevice : public GnashDevice
DirectFBDevice();
~DirectFBDevice();
+ dtype_t getType() { return DIRECTFB; };
+
// Initialize DirectFB Device layer
bool initDevice(int argc, char *argv[]);
diff --git a/librender/x11/X11Device.h b/librender/x11/X11Device.h
index 34a489a..9f54f9a 100644
--- a/librender/x11/X11Device.h
+++ b/librender/x11/X11Device.h
@@ -52,6 +52,8 @@ class X11Device : public GnashDevice
// virtual classes should have virtual destructors
virtual ~X11Device();
+ dtype_t getType() { return X11; };
+
// Initialize X11 Device layer
bool initDevice(int argc, char *argv[]);
http://git.savannah.gnu.org/cgit//commit/?id=523e6464e48f9b1762d02d4edd775951a3453494
commit 523e6464e48f9b1762d02d4edd775951a3453494
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:28:04 2010 -0700
we don't want any render specific code in here.
diff --git a/librender/testr_gtk.cpp b/librender/testr_gtk.cpp
index 45d399a..9fc7776 100644
--- a/librender/testr_gtk.cpp
+++ b/librender/testr_gtk.cpp
@@ -258,7 +258,6 @@ on_window1_expose_event(GtkWidget *widget, GdkEventExpose
*event,
gpointer user_data)
{
GNASH_REPORT_FUNCTION;
- vgLoadIdentity();
return FALSE;
}
http://git.savannah.gnu.org/cgit//commit/?id=2bf1f7626a536f83af625ffba8ee48893f31fea8
commit 2bf1f7626a536f83af625ffba8ee48893f31fea8
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:27:35 2010 -0700
add device test, drop using GTK
diff --git a/librender/testr.cpp b/librender/testr.cpp
index 9cd3ba9..5a30977 100644
--- a/librender/testr.cpp
+++ b/librender/testr.cpp
@@ -35,7 +35,7 @@
// FIXME: this should be a command line option
#undef GTK_TEST_RENDER
-#ifdef HAVE_GTK2
+#ifdef HAVE_GTK2_XX
# include <gtk/gtk.h>
# include <gdk/gdk.h>
#endif
@@ -82,6 +82,7 @@ using namespace renderer;
using namespace std;
using namespace boost::posix_time;
+void test_device(Renderer *renderer, const std::string &type);
void test_renderer(Renderer *renderer, const std::string &type);
void test_geometry(Renderer *renderer, const std::string &type);
void test_iterators(Renderer *renderer, const std::string &type);
@@ -89,7 +90,7 @@ void test_iterators(Renderer *renderer, const std::string
&type);
// The debug log used by all the gnash libraries.
static LogFile& dbglogfile = LogFile::getDefaultInstance();
-#ifdef HAVE_GTK2
+#ifdef HAVE_GTK2_XX
GtkWidget *create_GTK_window();
#endif
@@ -175,6 +176,9 @@ main(int argc, char *argv[])
#endif
if (renderer1) {
+ test_device(renderer1, "EGL");
+ }
+ if (renderer1) {
test_renderer(renderer1, "AGG");
test_geometry(renderer1, "AGG");
test_iterators(renderer1, "AGG");
@@ -260,7 +264,7 @@ main(int argc, char *argv[])
#endif
#endif
-#ifdef HAVE_GTK2
+#ifdef HAVE_GTK2_XX
gtk_main();
gtk_main_quit();
gtk_exit(0);
@@ -268,6 +272,19 @@ main(int argc, char *argv[])
}
void
+test_device(Renderer *renderer, const std::string &type)
+{
+ cout << "Testing " << type << " Device" << endl;
+
+ boost::shared_array<renderer::GnashDevice::dtype_t> devs =
renderer->probeDevices();
+ if (devs) {
+ runtest.pass("Renderer::probeDevices()");
+ } else {
+ runtest.fail("Renderer::probeDevices()");
+ }
+}
+
+void
test_renderer(Renderer *renderer, const std::string &type)
{
cout << "Testing " << type << " Renderer" << endl;
@@ -309,7 +326,7 @@ test_renderer(Renderer *renderer, const std::string &type)
runtest.fail("createCachedBitmap()");
}
-#ifdef HAVE_GTK2
+#ifdef HAVE_GTK2_XX
GtkWidget *canvas = create_GTK_window();
if (type == "AGG") {
GdkVisual* visual = gdk_drawable_get_visual(canvas->window);
http://git.savannah.gnu.org/cgit//commit/?id=a17403581f26da25931aab579aa541e004d31fef
commit a17403581f26da25931aab579aa541e004d31fef
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:27:04 2010 -0700
add the device headers to CPPFL:AGS
diff --git a/libcore/Makefile.am b/libcore/Makefile.am
index b3f4ca4..cdf8329 100644
--- a/libcore/Makefile.am
+++ b/libcore/Makefile.am
@@ -50,6 +50,13 @@ AM_CPPFLAGS = \
$(FONTCONFIG_CFLAGS) \
$(NULL)
+if BUILD_EGL_DEVICE
+AM_CPPFLAGS += $(EGL_CFLAGS)
+endif
+if BUILD_DIRECTFB_DEVICE
+AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
+endif
+
libgnashcore_la_SOURCES = \
BitmapMovie.cpp \
Property.cpp \
http://git.savannah.gnu.org/cgit//commit/?id=d2d0e1c660ad49fe308b348bdf1198fb14cda86c
commit d2d0e1c660ad49fe308b348bdf1198fb14cda86c
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:26:35 2010 -0700
add X11 device constant
diff --git a/configure.ac b/configure.ac
index c000cee..d9ec892 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1958,6 +1958,9 @@ AC_CHECK_LIB(Xi, XInput_find_display)
AC_CHECK_LIB(X11, XDisableAccessControl)
dnl fi
AM_CONDITIONAL(HAVE_X11, [test x$has_x11 = xyes])
+if test x$has_x11 = xyes; then
+ AC_DEFINE(BUILD_X11_DEVICE, [1], [Build the X11 device])
+fi
AC_CHECK_LIB(rt, shm_unlink)
AC_CHECK_FUNCS(shm_open shm_unlink)
AC_TRY_COMPILE([#include <strings.h>], [
http://git.savannah.gnu.org/cgit//commit/?id=4f989d83eded625d37f1b5d0ba605998f1fe4e0d
commit 4f989d83eded625d37f1b5d0ba605998f1fe4e0d
Author: Rob Savoye <address@hidden>
Date: Thu Nov 25 13:26:06 2010 -0700
add the device headers to CPPFL:AGS
diff --git a/gui/Makefile.am b/gui/Makefile.am
index de3e5ed..e36f850 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -74,6 +74,13 @@ AM_CPPFLAGS = \
$(PTHREAD_CFLAGS) \
$(NULL)
+if BUILD_EGL_DEVICE
+AM_CPPFLAGS += $(EGL_CFLAGS)
+endif
+if BUILD_DIRECTFB_DEVICE
+AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
+endif
+
GTK_CFLAGS = \
$(GTK2_CFLAGS) \
$(GLEXT_CFLAGS) \
diff --git a/libcore/parser/Makefile.am b/libcore/parser/Makefile.am
index 69d26fd..e1d83ac 100644
--- a/libcore/parser/Makefile.am
+++ b/libcore/parser/Makefile.am
@@ -44,6 +44,14 @@ AM_CPPFLAGS = \
$(FREETYPE2_CFLAGS) \
$(NULL)
+
+if BUILD_EGL_DEVICE
+AM_CPPFLAGS += $(EGL_CFLAGS)
+endif
+if BUILD_DIRECTFB_DEVICE
+AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
+endif
+
libgnashparser_la_SOURCES = \
action_buffer.cpp \
BitmapMovieDefinition.cpp \
diff --git a/libcore/vm/Makefile.am b/libcore/vm/Makefile.am
index 22408c6..8fa36d9 100644
--- a/libcore/vm/Makefile.am
+++ b/libcore/vm/Makefile.am
@@ -38,6 +38,13 @@ AM_CPPFLAGS = \
$(FFMPEG_CFLAGS) \
$(NULL)
+if BUILD_EGL_DEVICE
+AM_CPPFLAGS += $(EGL_CFLAGS)
+endif
+if BUILD_DIRECTFB_DEVICE
+AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
+endif
+
libgnashvm_la_SOURCES = \
ASHandlers.cpp \
ActionExec.cpp \
diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 2d57cc9..e1cf2b0 100644
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -82,6 +82,13 @@ AM_CPPFLAGS = \
$(MYSQL_CFLAGS) \
$(NULL)
+if BUILD_EGL_DEVICE
+AM_CPPFLAGS += $(EGL_CFLAGS)
+endif
+if BUILD_DIRECTFB_DEVICE
+AM_CPPFLAGS += $(DIRECTFB_CFLAGS)
+endif
+
if WIN32
GNASH_LIBS += -lintl -lz -lws2_32
endif
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 3 ++
gui/Makefile.am | 7 +++++
gui/fb/fb.cpp | 19 +++++++++++---
gui/fb/fb_glue_agg.cpp | 4 +--
gui/fb/fb_glue_agg.h | 43 +++++++++++++++++++++++++++++--
gui/fb/gui_fb.cpp | 9 ++++++-
gui/gui.h | 30 ++++++++++------------
libcore/Makefile.am | 7 +++++
libcore/parser/Makefile.am | 8 ++++++
libcore/vm/Makefile.am | 7 +++++
librender/GnashDevice.h | 4 ++-
librender/Renderer.h | 32 +++++++++++++----------
librender/directfb/DirectFBDevice.h | 2 +
librender/eglDevice.h | 2 +
librender/opengles2/Renderer_gles2.cpp | 2 +-
librender/openvg/Renderer_ovg.cpp | 15 +++++++++++
librender/testr.cpp | 25 +++++++++++++++---
librender/testr_gtk.cpp | 1 -
librender/x11/X11Device.h | 2 +
utilities/Makefile.am | 7 +++++
20 files changed, 181 insertions(+), 48 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, openvg, updated. 9d4b136c579618ad2b9738857da7871b9d6d14a8,
Rob Savoye <=