Merged with current JOGL trunk (tag JOGL_1_1_PRE_B10)

git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JSR-231@245 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 74 insertions, 40 deletions

diff --git a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
index eed383794..37a3f5359 100644
--- a/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
+++ b/src/net/java/games/jogl/impl/windows/WindowsGLContext.java
@@ -61,6 +61,7 @@ public abstract class WindowsGLContext extends GLContext {
   private GLProcAddressTable glProcAddressTable;
   // Handle to GLU32.dll
   private long hglu32;
+  private boolean haveWGLARBPbuffer = true;
 
   private static final int MAX_PFORMATS = 256;
   private static final int MAX_ATTRIBS  = 256;
@@ -141,10 +142,17 @@ public abstract class WindowsGLContext extends GLContext {
 
     if (!WGL.wglMakeCurrent(hdc, hglrc)) {
       throw new GLException("Error making context current: " + WGL.GetLastError());
+    } else {
+      if (DEBUG) {
+        System.err.println("wglMakeCurrent(hdc " + hdcToString(hdc) +
+                           ", hglrc " + hdcToString(hglrc) + ") succeeded");
+      }
     }
 
     if (created) {
       resetGLFunctionAvailability();
+      haveWGLARBPbuffer = (isExtensionAvailable("WGL_ARB_pbuffer") &&
+                           isExtensionAvailable("WGL_ARB_pixel_format"));
       // Windows can set up sharing of display lists after creation time
       WindowsGLContext other = (WindowsGLContext) GLContextShareSet.getShareContext(this);
       if (other != null) {
@@ -154,7 +162,8 @@ public abstract class WindowsGLContext extends GLContext {
         }
         if (!WGL.wglShareLists(hglrc2, hglrc)) {
           throw new GLException("wglShareLists(0x" + Long.toHexString(hglrc2) +
-                                ", 0x" + Long.toHexString(hglrc) + ") failed");
+                                ", 0x" + Long.toHexString(hglrc) + ") failed: error code " +
+                                WGL.GetLastError());
         }
       }
       GLContextShareSet.contextCreated(this);      
@@ -302,6 +311,8 @@ public abstract class WindowsGLContext extends GLContext {
           freeWGLC = true;
         }
       }
+      // Fallback path for older cards, in particular Intel Extreme motherboard graphics
+      boolean gotAvailableCaps = false;
       if (dummyGL != null && haveWGLChoosePixelFormatARB) {
         int[]   iattributes = new int  [2 * MAX_ATTRIBS];
         int[]   iresults    = new int  [2 * MAX_ATTRIBS];
@@ -408,46 +419,54 @@ public abstract class WindowsGLContext extends GLContext {
         // window, to a pbuffer, or to a pixmap)
         niattribs = 0;
         iattributes[0] = GL.WGL_NUMBER_PIXEL_FORMATS_ARB;
-        if (!dummyGL.wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, iattributes, iresults)) {
-          throw new GLException("Unable to enumerate pixel formats of window using wglGetPixelFormatAttribivARB: " + WGL.GetLastError());
-        }
-        numFormats = iresults[0];
-        // Should we be filtering out the pixel formats which aren't
-        // applicable, as we are doing here?
-        // We don't have enough information in the GLCapabilities to
-        // represent those that aren't...
-        iattributes[niattribs++] = GL.WGL_DRAW_TO_WINDOW_ARB;
-        iattributes[niattribs++] = GL.WGL_ACCELERATION_ARB;
-        iattributes[niattribs++] = GL.WGL_SUPPORT_OPENGL_ARB;
-        iattributes[niattribs++] = GL.WGL_DEPTH_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_STENCIL_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_DOUBLE_BUFFER_ARB;
-        iattributes[niattribs++] = GL.WGL_STEREO_ARB;
-        iattributes[niattribs++] = GL.WGL_PIXEL_TYPE_ARB;
-        iattributes[niattribs++] = GL.WGL_RED_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_GREEN_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_BLUE_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_ALPHA_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_ACCUM_RED_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_ACCUM_GREEN_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_ACCUM_BLUE_BITS_ARB;
-        iattributes[niattribs++] = GL.WGL_ACCUM_ALPHA_BITS_ARB;
-        if (haveWGLARBMultisample) {
-          iattributes[niattribs++] = GL.WGL_SAMPLE_BUFFERS_ARB;
-          iattributes[niattribs++] = GL.WGL_SAMPLES_ARB;
-        }
+        if (dummyGL.wglGetPixelFormatAttribivARB(hdc, 0, 0, 1, iattributes, iresults)) {
+          numFormats = iresults[0];
+          // Should we be filtering out the pixel formats which aren't
+          // applicable, as we are doing here?
+          // We don't have enough information in the GLCapabilities to
+          // represent those that aren't...
+          iattributes[niattribs++] = GL.WGL_DRAW_TO_WINDOW_ARB;
+          iattributes[niattribs++] = GL.WGL_ACCELERATION_ARB;
+          iattributes[niattribs++] = GL.WGL_SUPPORT_OPENGL_ARB;
+          iattributes[niattribs++] = GL.WGL_DEPTH_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_STENCIL_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_DOUBLE_BUFFER_ARB;
+          iattributes[niattribs++] = GL.WGL_STEREO_ARB;
+          iattributes[niattribs++] = GL.WGL_PIXEL_TYPE_ARB;
+          iattributes[niattribs++] = GL.WGL_RED_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_GREEN_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_BLUE_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_ALPHA_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_ACCUM_RED_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_ACCUM_GREEN_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_ACCUM_BLUE_BITS_ARB;
+          iattributes[niattribs++] = GL.WGL_ACCUM_ALPHA_BITS_ARB;
+          if (haveWGLARBMultisample) {
+            iattributes[niattribs++] = GL.WGL_SAMPLE_BUFFERS_ARB;
+            iattributes[niattribs++] = GL.WGL_SAMPLES_ARB;
+          }
 
-        availableCaps = new GLCapabilities[numFormats];
-        for (int i = 0; i < numFormats; i++) {
-          if (!dummyGL.wglGetPixelFormatAttribivARB(hdc, i+1, 0, niattribs, iattributes, iresults)) {
-            throw new GLException("Error getting pixel format attributes for pixel format " + (i + 1) + " of device context");
+          availableCaps = new GLCapabilities[numFormats];
+          for (int i = 0; i < numFormats; i++) {
+            if (!dummyGL.wglGetPixelFormatAttribivARB(hdc, i+1, 0, niattribs, iattributes, iresults)) {
+              throw new GLException("Error getting pixel format attributes for pixel format " + (i + 1) + " of device context");
+            }
+            availableCaps[i] = iattributes2GLCapabilities(iattributes, iresults, niattribs, true);
+          }
+          if( freeWGLC ) {
+            WGL.wglMakeCurrent( 0, 0 );
+          }
+          gotAvailableCaps = true;
+        } else {
+          int lastErr = WGL.GetLastError();
+          // Intel Extreme graphics fails with a zero error code
+          if (lastErr != 0) {
+            throw new GLException("Unable to enumerate pixel formats of window using wglGetPixelFormatAttribivARB: error code " + WGL.GetLastError());
           }
-          availableCaps[i] = iattributes2GLCapabilities(iattributes, iresults, niattribs, true);
-        }
-        if( freeWGLC ) {
-          WGL.wglMakeCurrent( 0, 0 );
         }
-      } else {
+      }
+
+      if (!gotAvailableCaps) {
         if (DEBUG) {
           System.err.println("Using ChoosePixelFormat because no wglChoosePixelFormatARB: dummyGL = " + dummyGL);
         }
@@ -467,6 +486,7 @@ public abstract class WindowsGLContext extends GLContext {
           availableCaps[i] = pfd2GLCapabilities(pfd);
         }
       }
+
       // Supply information to chooser
       pixelFormat = chooser.chooseCapabilities(capabilities, availableCaps, recommendedPixelFormat);
       if ((pixelFormat < 0) || (pixelFormat >= numFormats)) {
@@ -490,11 +510,17 @@ public abstract class WindowsGLContext extends GLContext {
       pixelFormat = WGL.ChoosePixelFormat(hdc, pfd);
     }
     if (!WGL.SetPixelFormat(hdc, pixelFormat, pfd)) {
-      throw new GLException("Unable to set pixel format");
+      int lastError = WGL.GetLastError();
+      if (DEBUG) {
+        System.err.println("SetPixelFormat failed: current context = " + WGL.wglGetCurrentContext() +
+                           ", current DC = " + WGL.wglGetCurrentDC());
+        System.err.println("GetPixelFormat(hdc " + hdcToString(hdc) + ") returns " + WGL.GetPixelFormat(hdc));
+      }
+      throw new GLException("Unable to set pixel format " + pixelFormat + " for device context " + hdcToString(hdc) + ": error code " + lastError);
     }
     hglrc = WGL.wglCreateContext(hdc);
     if (DEBUG) {
-      System.err.println("!!! Created OpenGL context " + hglrc);
+      System.err.println("!!! Created OpenGL context " + hglrc + " for device context " + hdcToString(hdc) + " using pixel format " + pixelFormat);
     }
     if (hglrc == 0) {
       throw new GLException("Unable to create OpenGL context");
@@ -654,4 +680,12 @@ public abstract class WindowsGLContext extends GLContext {
     }
     return res;
   }
+
+  protected static String hdcToString(long hdc) {
+    return "0x" + Long.toHexString(hdc);
+  }
+
+  protected boolean haveWGLARBPbuffer() {
+    return haveWGLARBPbuffer;
+  }
 }