[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[cmarrin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 80d05983697a64127230495b09373c6d427fedc2
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 14 18:18:21 2009 +0000

            One more round of changes to figure out why the webgl
            tests are crashing on the build bot. Here I am trying
            to see if we can create a software renderer. I am also
            printing the found pixel formats.
    
            * platform/graphics/mac/GraphicsContext3DMac.cpp:
            (WebCore::GraphicsContext3D::GraphicsContext3D):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49575 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 74a7499..40ec8a1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-14  Chris Marrin  <cmarrin at apple.com>
+
+        One more round of changes to figure out why the webgl 
+        tests are crashing on the build bot. Here I am trying
+        to see if we can create a software renderer. I am also
+        printing the found pixel formats.
+
+        * platform/graphics/mac/GraphicsContext3DMac.cpp:
+        (WebCore::GraphicsContext3D::GraphicsContext3D):
+
 2009-10-14  Yael Aharon  <yael.aharon at nokia.com>
  
         Reviewed by 
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
index 64b288c..2d82105 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.cpp
@@ -61,15 +61,17 @@ GraphicsContext3D::GraphicsContext3D()
 {
     CGLPixelFormatAttribute attribs[] =
     {
-        (CGLPixelFormatAttribute) kCGLPFAAccelerated,
+        kCGLPFAClosestPolicy,
         (CGLPixelFormatAttribute) kCGLPFAColorSize, (CGLPixelFormatAttribute) 32,
         (CGLPixelFormatAttribute) kCGLPFADepthSize, (CGLPixelFormatAttribute) 32,
+        (CGLPixelFormatAttribute) kCGLPFAAccelerated,
         (CGLPixelFormatAttribute) kCGLPFASupersample,
         (CGLPixelFormatAttribute) 0
     };
     
     // Make sure to change these constants to match the above list
-    const int superSampleIndex = 5;
+    const int superSampleIndex = 6;
+    const int acceleratedIndex = 5;
     const int depthSizeIndex = 4;
     
     CGLPixelFormatObj pixelFormatObj = 0;
@@ -77,8 +79,9 @@ GraphicsContext3D::GraphicsContext3D()
     
     // We will try for the above format first. If that fails, we will
     // try for one without supersample. If that fails, we will try for
-    // one that has a 16 bit depth buffer. If none of that works, we
-    // simply fail and set m_contextObj to 0.
+    // one that has a 16 bit depth buffer. If that fails, we will try
+    // for a software renderer. If none of that works, we simply fail 
+    // and set m_contextObj to 0.
     CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats);
     if (numPixelFormats == 0) {
         attribs[superSampleIndex] = static_cast<CGLPixelFormatAttribute>(0);
@@ -89,14 +92,32 @@ GraphicsContext3D::GraphicsContext3D()
             CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats);
         
             if (numPixelFormats == 0) {
-                // FIXME: temporary printf for diagnostics
-                fprintf(stderr, "CGLCreateContext failed, no pixel formats found\n");
-                m_contextObj = 0;
-                return;
+                attribs[acceleratedIndex] = static_cast<CGLPixelFormatAttribute>(0);
+                CGLChoosePixelFormat(attribs, &pixelFormatObj, &numPixelFormats);
+        
+                if (numPixelFormats == 0) {
+                    // FIXME: temporary printf for diagnostics
+                    fprintf(stderr, "CGLCreateContext failed, no pixel formats found\n");
+                    m_contextObj = 0;
+                    return;
+                }
             }
         }
     }
     
+    for (int i = 0; i < numPixelFormats; ++i) {
+        fprintf(stderr, "Pixel format %d:\n", i);
+        GLint value;
+        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFAColorSize, &value);
+        fprintf(stderr, "    kCGLPFAColorSize: %d\n", value);
+        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFADepthSize, &value);
+        fprintf(stderr, "    kCGLPFADepthSize: %d\n", value);
+        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFASupersample, &value);
+        fprintf(stderr, "    kCGLPFASupersample: %d\n", value);
+        CGLDescribePixelFormat(pixelFormatObj, 0, kCGLPFARendererID, &value);
+        fprintf(stderr, "    kCGLPFARendererID: %d\n", value);
+    }
+    
     CGLError err = CGLCreateContext(pixelFormatObj, 0, &m_contextObj);
     CGLDestroyPixelFormat(pixelFormatObj);
     

-- 
WebKit Debian packaging