Re: [AD] SF.net SVN: alleg:[11772] allegro/branches/4.9

[ Thread Index | Date Index | More lists.liballeg.org/allegro-developers Archives ]


On 7 mrt 2009, at 13:13, trentg@xxxxxxxxxx wrote:
Implemented new locking mechanism as discussed on AD. Probably only works with D3D right now.

I can confirm that every Allegro example I try to run after the last svn update crashes with a bus error on OS X at least. I'll wait for someone to fix the OpenGL port before trying again. By analogy with the other ports (eg, X11), I made the following changes to my local copy os osxgl.m (now that al_get_new_display_format() is gone), but I can't test them:

Index: osxgl.m
===================================================================
--- osxgl.m	(revision 11772)
+++ osxgl.m	(working copy)
@@ -822,7 +822,7 @@
    memset(dpy, 0, sizeof(*dpy));
 	/* Set up the ALLEGRO_DISPLAY part */
 	dpy->parent.vt = _al_osx_get_display_driver_fs();
-	dpy->parent.format = al_get_new_display_format();
+	//dpy->parent.format = al_get_new_display_format();
 	dpy->parent.refresh_rate = al_get_new_display_refresh_rate();
dpy->parent.flags = al_get_new_display_flags() | ALLEGRO_OPENGL | ALLEGRO_FULLSCREEN;
 	_al_event_source_init(&dpy->parent.es);
@@ -881,6 +881,7 @@
                                   waitUntilDone: NO];
    /* Retrieve the options that were set */
    osx_get_opengl_pixelformat_attributes(dpy);
+ dpy->parent.format = _al_deduce_color_format(&dpy- >parent.extra_settings);
    return &dpy->parent;
 }

@@ -898,7 +899,7 @@
    memset(dpy, 0, sizeof(*dpy));
 	/* Set up the ALLEGRO_DISPLAY part */
 	dpy->parent.vt = _al_osx_get_display_driver_win();
-	dpy->parent.format = al_get_new_display_format();
+	//dpy->parent.format = al_get_new_display_format();
 	dpy->parent.refresh_rate = al_get_new_display_refresh_rate();
dpy->parent.flags = al_get_new_display_flags() | ALLEGRO_OPENGL | ALLEGRO_WINDOWED;
 	dpy->parent.w = w;
@@ -925,6 +926,7 @@

    /* Retrieve the options that were set */
    osx_get_opengl_pixelformat_attributes(dpy);
+ dpy->parent.format = _al_deduce_color_format(&dpy- >parent.extra_settings);

 	/* Set up GL as we want */
 	setup_gl(&dpy->parent);

Someone let me know if this looks right or not.
By the way, I'm personally not very happy about commits that break things cross-platform, especially if they're not announced beforehand. I understand they're sometimes necessary, but can we try to keep them to a minimum? :)

Evert




Mail converted by MHonArc 2.6.19+ http://listengine.tuxfamily.org/