[Gnash-commit] gnash ChangeLog gui/aqua.cpp gui/aqua_ogl_glue.cpp

[Ann Barcomb]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Ann Barcomb <ann>       08/05/26 22:13:33

Modified files:
        .              : ChangeLog 
        gui            : aqua.cpp aqua_ogl_glue.cpp 

Log message:
                * gui/aqua.cpp: Remove function reports and define _width and
                _height.
                * gui/aqua_ogl_glue.cpp: Enable the accumulation buffer. Don't 
                flip the OpenGL screen, because this now happens inside the 
                renderer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6713&r2=1.6714
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/aqua_ogl_glue.cpp?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6713
retrieving revision 1.6714
diff -u -b -r1.6713 -r1.6714
--- ChangeLog   26 May 2008 21:41:35 -0000      1.6713
+++ ChangeLog   26 May 2008 22:13:32 -0000      1.6714
@@ -1,3 +1,11 @@
+2008-05-26 Bastiaan Jacques <address@hidden>
+
+       * gui/aqua.cpp: Remove function reports and define _width and
+       _height.
+       * gui/aqua_ogl_glue.cpp: Enable the accumulation buffer. Don't
+       flip the OpenGL screen, because this now happens inside the
+       renderer.
+
 2008-05-26 Sandro Santilli <address@hidden>
 
        * server/FreetypeGlyphsProvider.{cpp,h}: mutex-protect access to

Index: gui/aqua.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- gui/aqua.cpp        21 Mar 2008 04:59:51 -0000      1.32
+++ gui/aqua.cpp        26 May 2008 22:13:33 -0000      1.33
@@ -15,7 +15,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: aqua.cpp,v 1.32 2008/03/21 04:59:51 nihilus Exp $ */
+/* $Id: aqua.cpp,v 1.33 2008/05/26 22:13:33 ann Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
@@ -54,7 +54,6 @@
 
 void DoAdvanceMovie ( EventLoopTimerRef inTimer, void* data)
 {
-   GNASH_REPORT_FUNCTION;
    AquaGui* gui = static_cast<AquaGui*>(data);
    Gui::advance_movie(gui);
 }
@@ -76,7 +75,6 @@
 
 bool AquaGui::run()
 {
-  GNASH_REPORT_FUNCTION;
     double interval = _interval / 1000.0;
 
 
@@ -96,7 +94,6 @@
 
 void AquaGui::renderBuffer()
 {
-    GNASH_REPORT_FUNCTION;
     _glue.render();
 
       Rect rectPort;
@@ -111,8 +108,6 @@
        long response;
        Str255 text = " OS X version lower than 10.4 is not supported!", tmp = 
"";
   
-       GNASH_REPORT_FUNCTION;
-       
        /* Version check */
        err = Gestalt(gestaltSystemVersion, &response);
        Boolean ok = ((err == noErr) && (response >= 0x00001040));
@@ -144,7 +139,6 @@
 
 void AquaGui::setCursor(gnash_cursor_type newcursor)
 {
-         GNASH_REPORT_FUNCTION;
 
          switch(newcursor) {
                case gnash::CURSOR_HAND:                        
@@ -168,7 +162,8 @@
        EventTypeSpec     eventType;                 // Specifier for event type
        EventHandlerUPP   handlerUPP;                // Pointer to event 
handler routine
  
-       GNASH_REPORT_FUNCTION;
+        _width = width;
+        _height = height;
 
        SetRect(&theBounds, 0, 0, width, height);
        OSStatus status = CreateNewWindow ( kDocumentWindowClass,
@@ -199,7 +194,6 @@
        MenuRef rApplicationMenu;
        MenuItemIndex outIndex[1];        
        
-       GNASH_REPORT_FUNCTION;
        
        /* Enable 'Prefereces...' */
        EnableMenuCommand(NULL, kHICommandPreferences);
@@ -214,7 +208,6 @@
 
 bool AquaGui::setupEvents()
 {      
-       GNASH_REPORT_FUNCTION;
 
        return true;
 }

Index: gui/aqua_ogl_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/aqua_ogl_glue.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- gui/aqua_ogl_glue.cpp       5 Mar 2008 03:55:51 -0000       1.19
+++ gui/aqua_ogl_glue.cpp       26 May 2008 22:13:33 -0000      1.20
@@ -1,4 +1,3 @@
-// 
 //   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 // 
 // This program is free software; you can redistribute it and/or modify
@@ -62,7 +61,11 @@
 #endif
 
     const GLint glattribs[] = { AGL_RGBA, AGL_ACCELERATED,
-                                AGL_DEPTH_SIZE, 24,
+                                AGL_DEPTH_SIZE, 32,
+                                AGL_ACCUM_RED_SIZE, 8,
+                                AGL_ACCUM_GREEN_SIZE, 8,
+                                AGL_ACCUM_RED_SIZE, 8,
+                                AGL_ACCUM_ALPHA_SIZE, 8,
                                 AGL_DOUBLEBUFFER, AGL_NONE };
                               
     AGLPixelFormat pixfmt = aglChoosePixelFormat ( NULL, 0, glattribs);
@@ -95,15 +98,6 @@
        GNASH_REPORT_FUNCTION;
     bool ret = aglSetDrawable(_context, drawable);
     
-    glMatrixMode(GL_PROJECTION);
-
-    float oversize = 1.0;
-
-    // Flip the image, since (0,0) by default in OpenGL is the bottom left.
-    gluOrtho2D(-oversize, oversize, oversize, -oversize);
-    // Restore the matrix mode to the default.
-    glMatrixMode(GL_MODELVIEW);
-    glLoadIdentity(); 
     return ret;
 }