[SCM] Allegro branch 5.0 updated. 5.0.8-3-g4a539f8

[Peter W. <tj...@us...>]

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 "Allegro".

The branch, 5.0 has been updated
       via  4a539f8eb352bcbaf2ff803dee202947c2f26df0 (commit)
       via  4fffb6765a470f3e530b2cd5e6688a4ebde59c23 (commit)
       via  1358cf8d11c0cfad7a2be9ee12f9d2e09ade5dff (commit)
      from  4edb7b60589606bcf8e4a18a4d9db800787e9612 (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 -----------------------------------------------------------------
commit 4a539f8eb352bcbaf2ff803dee202947c2f26df0
Author: Peter Wang <tj...@us...>
Date:   Tue Nov 20 22:22:06 2012 +1100

    4e146ff reverted 94ee9e0 "Don't re-bind the FBO in al_set_target_bitmap
    if the new target bitmap shares the parent bitmap with the new target
    bitmap."
    
    Add a note that 4e146ff also fixes a problem with ex_multiwin,
    reported by Arthur Kalliokoski.
    
    (cherry picked from commit 901c235e1f42f9ba125176b761c80bb49575c29f)

commit 4fffb6765a470f3e530b2cd5e6688a4ebde59c23
Author: Trent Gamblin <tr...@us...>
Date:   Thu May 17 09:26:53 2012 +0000

    Fix a harmful logic error (see comment)
    
    (cherry picked from commit 4e146ffff947d4343a1d6ad80159d0acdbd67531)

commit 1358cf8d11c0cfad7a2be9ee12f9d2e09ade5dff
Author: Peter Wang <tj...@us...>
Date:   Tue Nov 20 22:02:42 2012 +1100

    Bump version to 5.0.9 (WIP).

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

Summary of changes:
 CMakeLists.txt           |    2 +-
 include/allegro5/base.h  |    6 +++---
 src/opengl/ogl_display.c |   12 +++++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fce13ca..518f7bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ set(CMAKE_CONFIGURATION_TYPES "${CMAKE_BUILD_TYPE}" CACHE INTERNAL "internal")
 # We use C++ in a few cases.
 project(ALLEGRO C CXX)
 
-set(ALLEGRO_VERSION 5.0.8)
+set(ALLEGRO_VERSION 5.0.9)
 string(REGEX MATCH "^[0-9]+[.][0-9]+" ALLEGRO_SOVERSION ${ALLEGRO_VERSION})
 string(REPLACE "." "" ALLEGRO_DLL_SHORTVER ${ALLEGRO_SOVERSION})
 
diff --git a/include/allegro5/base.h b/include/allegro5/base.h
index 04f4542..8469534 100644
--- a/include/allegro5/base.h
+++ b/include/allegro5/base.h
@@ -55,7 +55,7 @@
 
 #define ALLEGRO_VERSION          5
 #define ALLEGRO_SUB_VERSION      0
-#define ALLEGRO_WIP_VERSION      8
+#define ALLEGRO_WIP_VERSION      9
 
 /* Not sure we need it, but since ALLEGRO_VERSION_STR contains it:
  * 0 = SVN
@@ -67,9 +67,9 @@
  */
 #define ALLEGRO_RELEASE_NUMBER   1
 
-#define ALLEGRO_VERSION_STR      "5.0.8"
+#define ALLEGRO_VERSION_STR      "5.0.9 (WIP)"
 #define ALLEGRO_DATE_STR         "2012"
-#define ALLEGRO_DATE             20121118    /* yyyymmdd */
+#define ALLEGRO_DATE             20121120    /* yyyymmdd */
 #define ALLEGRO_VERSION_INT \
     ((ALLEGRO_VERSION << 24) | (ALLEGRO_SUB_VERSION << 16) | \
     (ALLEGRO_WIP_VERSION << 8) | ALLEGRO_RELEASE_NUMBER)
diff --git a/src/opengl/ogl_display.c b/src/opengl/ogl_display.c
index 707928a..26617ea 100644
--- a/src/opengl/ogl_display.c
+++ b/src/opengl/ogl_display.c
@@ -161,10 +161,14 @@ static void setup_fbo(ALLEGRO_DISPLAY *display, ALLEGRO_BITMAP *bitmap)
       bitmap = bitmap->parent;
    ogl_bitmap = (void *)bitmap;
 
-#if !defined ALLEGRO_GP2XWIZ
-   if (display->ogl_extras->opengl_target == ogl_bitmap)
+   /* We can't return here. Target's FBO can be taken away by locking
+    * a lot of bitmaps consecutively.
+    * Also affects ex_multiwin; resizing one window affects the other.
+    */
+   if (false && display->ogl_extras->opengl_target == ogl_bitmap)
       return;
 
+#if !defined ALLEGRO_GP2XWIZ
    if (!ogl_bitmap->is_backbuffer) {
       ALLEGRO_FBO_INFO *info = NULL;
 
@@ -207,6 +211,7 @@ static void setup_fbo(ALLEGRO_DISPLAY *display, ALLEGRO_BITMAP *bitmap)
          ASSERT(display->ogl_extras->extension_list->ALLEGRO_GL_EXT_framebuffer_object ||
             display->ogl_extras->extension_list->ALLEGRO_GL_OES_framebuffer_object);
 #endif
+
          if (info->fbo_state == FBO_INFO_UNUSED)
             info->fbo_state = FBO_INFO_TRANSIENT;
          info->owner = ogl_bitmap;
@@ -268,9 +273,6 @@ static void setup_fbo(ALLEGRO_DISPLAY *display, ALLEGRO_BITMAP *bitmap)
       #endif
    }
 #else
-   if (display->ogl_extras->opengl_target == ogl_bitmap)
-      return;
-
    ALLEGRO_DISPLAY_GP2XWIZ_OGL *wiz_disp = (ALLEGRO_DISPLAY_GP2XWIZ_OGL *)display;
    display->ogl_extras->opengl_target = ogl_bitmap;
 


hooks/post-receive
-- 
Allegro