Merge branch 'master' of git+ssh://git.directfb.org/git/directfb/core/DirectFB

lib/direct/Types++.h

@@ -38,6 +38,8 @@ extern "C" {
 #include <direct/types.h>
 }
 
+#include <map>
+
 
 namespace Direct {
      // NOTE: if build fails here we most likely have the above error due to nested extern "C"

lib/fusion/object.h

@@ -56,7 +56,6 @@ typedef u32 FusionObjectID;
 
 #ifdef __cplusplus
 }
-#include <map>
 namespace Fusion {
 typedef std::map<FusionObjectID,FusionObject*>    ObjectMap;
 }

src/core/CoreSurface_includes.h

@@ -1,6 +1,8 @@
 #include "CoreDFB_includes.h"
 
 #ifdef __cplusplus
+#include <direct/Types++.h>
+
 extern "C" {
 #endif
 

src/core/shared_secure_surface_pool.c

@@ -187,6 +187,7 @@ sharedSecureAllocateBuffer( CoreSurfacePool       *pool,
      SharedAllocationData *alloc = alloc_data;
      char                  buf[FUSION_SHM_TMPFS_PATH_NAME_LEN + 99];
      int                   fd;
+     int                   flags = MAP_SHARED;
 
      D_DEBUG_AT( Core_SharedSecure, "%s()\n", __FUNCTION__ );
 
@@ -216,7 +217,10 @@ sharedSecureAllocateBuffer( CoreSurfacePool       *pool,
           return DFB_IO;
      }
 
-     alloc->master_map = mmap( NULL, alloc->size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 );
+     if (direct_config_get_int_value_with_default( "fusion-shm-populate", 0 ))
+          flags |= MAP_POPULATE;
+
+     alloc->master_map = mmap( NULL, alloc->size, PROT_READ | PROT_WRITE, flags, fd, 0 );
 
      close( fd );
 

src/core/surface_allocation.cpp

@@ -34,10 +34,10 @@
 
 #include <config.h>
 
-#include <directfb.h>    // include here to prevent it being included indirectly causing nested extern "C"
-
 #include <direct/Types++.h>
 
+#include <directfb.h>    // include here to prevent it being included indirectly causing nested extern "C"
+
 
 extern "C" {
 #include <string.h>

src/media/DataBuffer_includes.h

@@ -2,6 +2,8 @@
 #define __DataBuffer_includes_h__
 
 #ifdef __cplusplus
+#include <direct/Types++.h>
+
 extern "C" {
 #endif
 

src/media/DataBuffer_real.cpp

@@ -32,6 +32,8 @@
 
 #include <config.h>
 
+#include <direct/Types++.h>
+
 #include "DataBuffer.h"
 
 extern "C" {

systems/x11/X11EGLImpl.cpp

@@ -526,7 +526,7 @@ X11EGLConfig::CheckOptions( const Graphics::Options &options )
                }
           }
           else {
-               if (val > check && check != 0)
+               if (val > check)// && check != 0)
                     D_DEBUG_AT( DFBX11_EGLConfig, "  >    local '%ld' greater than '%ld'\n", val, check );
                else if (val == check)
                     D_DEBUG_AT( DFBX11_EGLConfig, "  =    local '%ld' equals\n", val );

tests/Makefile.am

@@ -130,7 +130,7 @@ bin_PROGRAMS = \
 	direct_test	\
 	dfbtest_alloc	\
 	dfbtest_layer	\
-	dfbtest_stereo	\	
+	dfbtest_stereo	\
 	$(ONE_PROGS)	\
 	$(VOODOO_PROGS) \
 	$(SAWMAN_PROGS) \
@@ -193,7 +193,7 @@ dfbtest_egl_LDADD   = $(DFB_BASE_LIBS) $(GL_DFB_BASE_LIBS) $(GLES2_DFB_BASE_LIBS
 
 dfbtest_eglblit_SOURCES = dfbtest_eglblit.c
 dfbtest_eglblit_CFLAGS  = $(GLES2_CFLAGS)
-dfbtest_eglblit_LDADD   = $(DFB_BASE_LIBS) $(GL_DFB_BASE_LIBS) $(GLES2_DFB_BASE_LIBS) $(LIBM) $(libegl)
+dfbtest_eglblit_LDADD   = $(DFB_BASE_LIBS) $(GL_DFB_BASE_LIBS) $(GLES2_DFB_BASE_LIBS) $(LIBM) $(libegl) $(libdfbegl)
 
 dfbtest_eglimage_SOURCES = dfbtest_eglimage.cpp ../examples/++dfb/dfbapp.cpp
 dfbtest_eglimage_CFLAGS  = $(GLES2_CFLAGS)

tests/dfbtest_fillrect.c

@@ -197,9 +197,13 @@ main( int argc, char *argv[] )
 
           dest->Clear( dest, 0, 0, 0, 0 );
 
-          for (i=0; i<100000; i++) {
-               dest->SetColor( dest, rand()%256, rand()%256, rand()%256, rand()%256 );
-               dest->FillRectangle( dest, rand()%100, rand()%100, rand()%100, rand()%100 );
+          for (i=0; i<1000; i++) {
+               dest->SetColor( dest, rand()%256, rand()%256, rand()%256, 0xff );
+
+               int w = rand()%100;
+               int h = rand()%100;
+
+               dest->FillRectangle( dest, rand()%(desc.width-w), rand()%(desc.height-h), w, h );
           }
 
           dest->Flip( dest, NULL, DSFLIP_NONE );