Changeset 40267 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Feb 28, 2012 7:09:18 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: fixe VSG Open Inventor interop issues

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• icd_drv.c (modified) (17 diffs)
• wgl.c (modified) (40 diffs)
• windows_getprocaddress.py (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/icd_drv.c

@@ -75 +75 @@
 void APIENTRY DrvReleaseContext(HGLRC hglrc)
 {
+     CR_DDI_PROLOGUE();
     /*crDebug( "DrvReleaseContext(0x%x) called", hglrc );*/
     stubMakeCurrent( NULL, NULL );
@@ -81 +82 @@
 BOOL APIENTRY DrvValidateVersion(DWORD version)
 {
+    CR_DDI_PROLOGUE();
     if (stubInit()) {
         crDebug("DrvValidateVersion %x -> TRUE\n", version);
@@ -97 +99 @@
     BOOL ret;
 
+    CR_DDI_PROLOGUE();
+
     /*crDebug( "DrvSetContext called(0x%x, 0x%x)", hdc, hglrc );*/
     (void) (callback);
@@ -116 +120 @@
 BOOL APIENTRY DrvSetPixelFormat(HDC hdc, int iPixelFormat)
 {
+    CR_DDI_PROLOGUE();
     crDebug( "DrvSetPixelFormat(0x%x, %i) called.", hdc, iPixelFormat );
 
@@ -129 +134 @@
     char dpyName[MAX_DPY_NAME];
     ContextInfo *context;
+
+    CR_DDI_PROLOGUE();
 
     crDebug( "DrvCreateContext(0x%x) called.", hdc);
@@ -149 +156 @@
 HGLRC APIENTRY DrvCreateLayerContext(HDC hdc, int iLayerPlane)
 {
+    CR_DDI_PROLOGUE();
     crDebug( "DrvCreateLayerContext(0x%x, %i) called.", hdc, iLayerPlane);
     //We don't support more than 1 layers.
@@ -164 +172 @@
                                     LPLAYERPLANEDESCRIPTOR plpd)
 {
+    CR_DDI_PROLOGUE();
     crWarning( "DrvDescribeLayerPlane: unimplemented" );
     CRASSERT(false);
@@ -173 +182 @@
                                        COLORREF *pcr)
 {
+    CR_DDI_PROLOGUE();
     crWarning( "DrvGetLayerPaletteEntries: unsupported" );
     CRASSERT(false);
@@ -180 +190 @@
 int APIENTRY DrvDescribePixelFormat(HDC hdc, int iPixelFormat, UINT nBytes, LPPIXELFORMATDESCRIPTOR pfd)
 {
+    CR_DDI_PROLOGUE();
     if ( !pfd ) {
         return 2;
@@ -198 +209 @@
                                 PFD_SUPPORT_OPENGL |
                                 PFD_DOUBLEBUFFER);
+
+        pfd->dwFlags         |= 0x8000; /* <- Needed for VSG Open Inventor to be happy */
+
         pfd->iPixelType      = PFD_TYPE_RGBA;
         pfd->cColorBits      = 32;
@@ -260 +274 @@
 BOOL APIENTRY DrvDeleteContext(HGLRC hglrc)
 {
+    CR_DDI_PROLOGUE();
     /*crDebug( "DrvDeleteContext(0x%x) called", hglrc );*/
     stubDestroyContext( (unsigned long) hglrc );
@@ -267 +282 @@
 BOOL APIENTRY DrvCopyContext(HGLRC hglrcSrc, HGLRC hglrcDst, UINT mask)
 {
+    CR_DDI_PROLOGUE();
     crWarning( "DrvCopyContext: unsupported" );
     return 0;
@@ -273 +289 @@
 BOOL APIENTRY DrvShareLists(HGLRC hglrc1, HGLRC hglrc2)
 {
+    CR_DDI_PROLOGUE();
     crWarning( "DrvShareLists: unsupported" );
     return 1;
@@ -281 +298 @@
                                        CONST COLORREF *pcr)
 {
+    CR_DDI_PROLOGUE();
     crWarning( "DrvSetLayerPaletteEntries: unsupported" );
     return 0;
@@ -288 +306 @@
 BOOL APIENTRY DrvRealizeLayerPalette(HDC hdc, int iLayerPlane, BOOL bRealize)
 {
+    CR_DDI_PROLOGUE();
     crWarning( "DrvRealizeLayerPalette: unsupported" );
     return 0;
@@ -294 +313 @@
 BOOL APIENTRY DrvSwapLayerBuffers(HDC hdc, UINT fuPlanes)
 {
+    CR_DDI_PROLOGUE();
     if (fuPlanes == 1)
     {
@@ -309 +329 @@
 {
     WindowInfo *window;
+
+    CR_DDI_PROLOGUE();
     /*crDebug( "DrvSwapBuffers(0x%x) called", hdc );*/
     window = stubGetWindowInfo(hdc);    

trunk/src/VBox/Additions/common/crOpenGL/wgl.c

@@ -56 +56 @@
     DWORD okayFlags;
 
+    CR_DDI_PROLOGUE();
+
     stubInit();
 
@@ -78 +80 @@
             PFD_SWAP_EXCHANGE         |
             PFD_SWAP_COPY             |
-            PFD_STEREO            |
+            /* @todo: this is disabled due to VSG Open Inventor interop issues
+             * it does not make any sense actually since reporting this
+             * as well as choosing a pixel format with this cap would not do anything
+             * since ICD stuff has its own pixelformat state var */
+//            PFD_STEREO            |
             PFD_STEREO_DONTCARE       |
             PFD_DEPTH_DONTCARE        );
@@ -115 +121 @@
     }
 
-    if ( pfd->cAccumBits > 0 )
-        desiredVisual |= CR_ACCUM_BIT;
+    /* @todo: although this is not needed by VSG Open Inventor interop,
+     * still it does not make any sense actually since reporting this
+     * as well as choosing a pixel format with this cap would not do anything
+     * since ICD stuff has its own pixelformat state var */
+//    if ( pfd->cAccumBits > 0 )
+//        desiredVisual |= CR_ACCUM_BIT;
 
     if ( pfd->cDepthBits > 32 ) {
@@ -146 +156 @@
         CONST PIXELFORMATDESCRIPTOR *pdf )
 {
+    CR_DDI_PROLOGUE();
+
     if ( pixelFormat != 1 ) {
         crError( "wglSetPixelFormat: pixelFormat=%d?\n", pixelFormat );
@@ -155 +167 @@
 BOOL WINAPI wglDeleteContext_prox( HGLRC hglrc )
 {
+    CR_DDI_PROLOGUE();
     stubDestroyContext( (unsigned long) hglrc );
     return 1;
@@ -165 +178 @@
     BOOL ret;
 
+    CR_DDI_PROLOGUE();
+
     crHashtableLock(stub.windowTable);
     crHashtableLock(stub.contextTable);
@@ -187 +202 @@
 {
     ContextInfo *context = stubGetCurrentContext();
+    CR_DDI_PROLOGUE();
     return (HGLRC) (context ? context->id : 0);
 }
@@ -193 +209 @@
 {
     ContextInfo *context = stubGetCurrentContext();
+    CR_DDI_PROLOGUE();
     if (context && context->currentDrawable)
         return (HDC) context->currentDrawable->drawable;
@@ -201 +218 @@
 int WINAPI wglGetPixelFormat_prox( HDC hdc )
 {
+    CR_DDI_PROLOGUE();
     /* this is what we call our generic pixelformat, regardless of the HDC */
     return 1;
@@ -208 +226 @@
         LPPIXELFORMATDESCRIPTOR pfd )
 {
+    CR_DDI_PROLOGUE();
+
 /*  if ( pixelFormat != 1 ) { 
  *      crError( "wglDescribePixelFormat: pixelFormat=%d?\n", pixelFormat ); 
@@ -259 +279 @@
 BOOL WINAPI wglShareLists_prox( HGLRC hglrc1, HGLRC hglrc2 )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglShareLists: unsupported" );
     return 0;
@@ -268 +289 @@
     char dpyName[MAX_DPY_NAME];
     ContextInfo *context;
+
+    CR_DDI_PROLOGUE();
 
     stubInit();
@@ -288 +311 @@
 {
     WindowInfo *window = stubGetWindowInfo(hdc);
+    CR_DDI_PROLOGUE();
     stubSwapBuffers( window, 0 );
     return 1;
@@ -294 +318 @@
 BOOL WINAPI wglCopyContext_prox( HGLRC src, HGLRC dst, UINT mask )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglCopyContext: unsupported" );
     return 0;
@@ -300 +325 @@
 HGLRC WINAPI wglCreateLayerContext_prox( HDC hdc, int layerPlane )
 {
+    CR_DDI_PROLOGUE();
     stubInit();
     crWarning( "wglCreateLayerContext: unsupported" );
@@ -307 +333 @@
 PROC WINAPI wglGetProcAddress_prox( LPCSTR name )
 {
+    CR_DDI_PROLOGUE();
     return (PROC) crGetProcAddress( name );
 }
@@ -312 +339 @@
 BOOL WINAPI wglUseFontBitmapsA_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglUseFontBitmapsA: unsupported" );
     return 0;
@@ -318 +346 @@
 BOOL WINAPI wglUseFontBitmapsW_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglUseFontBitmapsW: unsupported" );
     return 0;
@@ -325 +354 @@
         UINT nBytes, LPLAYERPLANEDESCRIPTOR lpd )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglDescribeLayerPlane: unimplemented" );
     return 0;
@@ -332 +362 @@
         int entries, CONST COLORREF *cr )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglSetLayerPaletteEntries: unsupported" );
     return 0;
@@ -339 +370 @@
         int entries, COLORREF *cr )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglGetLayerPaletteEntries: unsupported" );
     return 0;
@@ -345 +377 @@
 BOOL WINAPI wglRealizeLayerPalette_prox( HDC hdc, int layerPlane, BOOL realize )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglRealizeLayerPalette: unsupported" );
     return 0;
@@ -351 +384 @@
 DWORD WINAPI wglSwapMultipleBuffers_prox( UINT a, CONST void *b )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglSwapMultipleBuffer: unsupported" );
     return 0;
@@ -359 +393 @@
         LPGLYPHMETRICSFLOAT gmf )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglUseFontOutlinesA: unsupported" );
     return 0;
@@ -367 +402 @@
         LPGLYPHMETRICSFLOAT gmf )
 {
+    CR_DDI_PROLOGUE();
     crWarning( "wglUseFontOutlinesW: unsupported" );
     return 0;
@@ -373 +409 @@
 BOOL WINAPI wglSwapLayerBuffers_prox( HDC hdc, UINT planes )
 {
+    CR_DDI_PROLOGUE();
     if (planes == WGL_SWAP_MAIN_PLANE)
     {
@@ -389 +426 @@
     int *pi;
     int wants_rgb = 0;
+
+    CR_DDI_PROLOGUE();
 
     stubInit();
@@ -427 +466 @@
             case WGL_STEREO_EXT:
                 if (pi[1] > 0)
-                    desiredVisual |= CR_STEREO_BIT;
+                {
+                    /* @todo: this is disabled due to VSG Open Inventor interop issues
+                     * it does not make any sense actually since reporting this
+                     * as well as choosing a pixel format with this cap would not do anything
+                     * since ICD stuff has its own pixelformat state var */
+                    crWarning("WGL_STEREO_EXT not supporteed!");
+                    return 0;
+//                    desiredVisual |= CR_STEREO_BIT;
+                }
                 pi++;
                 break;
@@ -447 +494 @@
             case WGL_ACCUM_BLUE_BITS_EXT:
                 if (pi[1] > 0)
-                    desiredVisual |= CR_ACCUM_BIT;
+                {
+                    /* @todo: although this is not needed by VSG Open Inventor interop,
+                     * still it does not make any sense actually since reporting this
+                     * as well as choosing a pixel format with this cap would not do anything
+                     * since ICD stuff has its own pixelformat state var */
+                    crWarning("WGL_ACCUM_XXX not supporteed!");
+                    return 0;
+//                    desiredVisual |= CR_ACCUM_BIT;
+                }
                 pi++;
                 break;
@@ -454 +509 @@
             case WGL_SAMPLES_EXT:
                 if (pi[1] > 0)
-                    desiredVisual |= CR_MULTISAMPLE_BIT;
+                {
+                    /* @todo: this is disabled due to VSG Open Inventor interop issues
+                     * it does not make any sense actually since reporting this
+                     * as well as choosing a pixel format with this cap would not do anything
+                     * since ICD stuff has its own pixelformat state var */
+                    crWarning("WGL_SAMPLE_BUFFERS_EXT & WGL_SAMPLES_EXT not supporteed!");
+                    return 0;
+//                    desiredVisual |= CR_MULTISAMPLE_BIT;
+                }
                 pi++;
                 break;
@@ -492 +555 @@
 {
     UINT i;
+
+    CR_DDI_PROLOGUE();
 
     if (!pValues || !piAttributes) return 0;
@@ -514 +579 @@
             case WGL_SUPPORT_OPENGL_ARB:
             case WGL_DOUBLE_BUFFER_ARB:
+                pValues[i] = 1;
+                break;
             case WGL_STEREO_ARB:
-                pValues[i] = 1;
+                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                 * it does not make any sense actually since reporting this
+                 * as well as choosing a pixel format with this cap would not do anything
+                 * since ICD stuff has its own pixelformat state var */
+                pValues[i] = 0;
                 break;
             case WGL_DRAW_TO_BITMAP_ARB:
@@ -590 +661 @@
                 break;
             case WGL_SAMPLE_BUFFERS_EXT:
-                pValues[i] = 1;
+                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                 * it does not make any sense actually since reporting this
+                 * as well as choosing a pixel format with this cap would not do anything
+                 * since ICD stuff has its own pixelformat state var */
+                pValues[i] = 0;
                 break;
             case WGL_SAMPLES_EXT:
-                pValues[i] = 1;
+                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                 * it does not make any sense actually since reporting this
+                 * as well as choosing a pixel format with this cap would not do anything
+                 * since ICD stuff has its own pixelformat state var */
+                pValues[i] = 0;
+                break;
+            case 0x202d: /* <- WGL_DRAW_TO_PBUFFER_ARB this is to make VSG Open Inventor happy */
+                pValues[i] = 0;
                 break;
             default:
@@ -608 +690 @@
 {
     UINT i;
+
+    CR_DDI_PROLOGUE();
 
     if (!pValues || !piAttributes) return 0;
@@ -630 +714 @@
             case WGL_SUPPORT_OPENGL_ARB:
             case WGL_DOUBLE_BUFFER_ARB:
+                pValues[i] = 1.f;
+                break;
             case WGL_STEREO_ARB:
-                pValues[i] = 1.f;
+                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                 * it does not make any sense actually since reporting this
+                 * as well as choosing a pixel format with this cap would not do anything
+                 * since ICD stuff has its own pixelformat state var */
+                pValues[i] = 0.f;
                 break;
             case WGL_DRAW_TO_BITMAP_ARB:
@@ -706 +796 @@
                 break;
             case WGL_SAMPLE_BUFFERS_EXT:
-                pValues[i] = 1.f;
+                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                 * it does not make any sense actually since reporting this
+                 * as well as choosing a pixel format with this cap would not do anything
+                 * since ICD stuff has its own pixelformat state var */
+                pValues[i] = 0.f;
                 break;
             case WGL_SAMPLES_EXT:
-                pValues[i] = 1.f;
+                /* @todo: this is disabled due to VSG Open Inventor interop issues
+                 * it does not make any sense actually since reporting this
+                 * as well as choosing a pixel format with this cap would not do anything
+                 * since ICD stuff has its own pixelformat state var */
+                pValues[i] = 0.f;
+                break;
+            case 0x202d: /* <- WGL_DRAW_TO_PBUFFER_ARB this is to make VSG Open Inventor happy */
+                pValues[i] = 0.f;
                 break;
             default:
@@ -722 +823 @@
 BOOL WINAPI wglSwapIntervalEXT_prox(int interval)
 {
+    CR_DDI_PROLOGUE();
     return TRUE;
 }
@@ -727 +829 @@
 int  WINAPI wglGetSwapIntervalEXT_prox()
 {
+    CR_DDI_PROLOGUE();
     return 1;
 }
@@ -734 +837 @@
 const GLubyte * WINAPI wglGetExtensionsStringEXT_prox()
 {
+    CR_DDI_PROLOGUE();
     return gsz_wgl_extensions;
 }
@@ -739 +843 @@
 const GLubyte * WINAPI wglGetExtensionsStringARB_prox(HDC hdc)
 {
+    CR_DDI_PROLOGUE();
     (void) hdc;
 

trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py

@@ -136 +136 @@
 
     if (!crStrcmp( name, "wglSwapIntervalEXT" )) return (CR_PROC) wglSwapIntervalEXT;
+    
+    /* this is needed for VSG Open Inventor stuff.
+     * @todo: make all these auto-generated!!! */
+    if (!crStrcmp( name, "glBeginQuery" )) return (CR_PROC) cr_glBeginQueryARB;
+    if (!crStrcmp( name, "glDeleteQueries" )) return (CR_PROC) cr_glDeleteQueriesARB;
+    if (!crStrcmp( name, "glEndQuery" )) return (CR_PROC) cr_glEndQueryARB;
+    if (!crStrcmp( name, "glGenQueries" )) return (CR_PROC) cr_glGenQueriesARB;
+    if (!crStrcmp( name, "glGetQueryObjectiv" )) return (CR_PROC) cr_glGetQueryObjectivARB;
+    if (!crStrcmp( name, "glGetQueryObjectuiv" )) return (CR_PROC) cr_glGetQueryObjectuivARB;
+    if (!crStrcmp( name, "glGetQueryiv" )) return (CR_PROC) cr_glGetQueryivARB;
+    if (!crStrcmp( name, "glIsQuery" )) return (CR_PROC) cr_glIsQueryARB;
 
-    crDebug("Returning GetProcAddress:NULL for %s", name);
+    crWarning("Returning GetProcAddress:NULL for %s", name);
     return NULL;
 }