Changeset 36231 in vbox for trunk/src/VBox

Timestamp:

Mar 9, 2011 3:05:32 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

70452

Message:

crOpenGL: workaround for recent nvidia drivers, disabled yet as need more testing

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_spu.h (modified) (1 diff)
• GuestHost/OpenGL/spu_loader/loader.def (modified) (1 diff)
• GuestHost/OpenGL/spu_loader/spuchange.py (modified) (1 diff)
• HostServices/SharedOpenGL/render/renderspu_wgl.c (modified) (1 diff)

trunk/src/VBox/GuestHost/OpenGL/include/cr_spu.h

@@ -455 +455 @@
 DECLEXPORT(void) crUnloadOpenGL( void );
 DECLEXPORT(int) crLoadOpenGLExtensions( const crOpenGLInterface *crInterface, SPUNamedFunctionTable table[] );
+DECLEXPORT(void) crSPUChangeDispatch(SPUDispatchTable *dispatch, const SPUNamedFunctionTable *newtable);
 
 #if defined(GLX)

trunk/src/VBox/GuestHost/OpenGL/spu_loader/loader.def

@@ -19 +19 @@
 crUnloadOpenGL
 crChooseVisual
+crSPUChangeDispatch

trunk/src/VBox/GuestHost/OpenGL/spu_loader/spuchange.py

@@ -54 +54 @@
 """
 print '}'
+
+print """
+void crSPUChangeDispatch(SPUDispatchTable *dispatch, const SPUNamedFunctionTable *newtable)
+{
+    SPUGenericFunction func;
+"""
+keys = apiutil.GetDispatchedFunctions(sys.argv[1]+"/APIspec.txt")
+for func_name in keys:
+    print '\tfunc = crSPUFindFunction(newtable, "%s");' % func_name
+    print '\tif (func && ((SPUGenericFunction)dispatch->%s!=func))' % func_name
+    print '\t{'
+    print '\t\tcrDebug("%%s changed from %%p to %%p", "gl%s", dispatch->%s, func);' % (func_name, func_name)
+    print '\t\tcrSPUChangeInterface(dispatch, dispatch->%s, func);' % func_name
+    print '\t}\n'
+print """
+}
+"""

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_wgl.c

@@ -869 +869 @@
                     crError( "Render SPU: (MakeCurrent) Couldn't create the context for the window (error 0x%x)", GetLastError() );
                 }
+
+                /*Requery ext function pointers, we skip dummy ctx as it should never be used with ext functions*/
+                if (0 && context->id)
+                {
+                    int numFuncs, i;
+                    SPUNamedFunctionTable ext_table[1000];
+
+
+                    crDebug("Default server ctx created, requerying ext functions");
+                    /*requery ext functions*/
+                    numFuncs = renderspuCreateFunctions(ext_table);
+                    numFuncs += crLoadOpenGLExtensions( &render_spu.ws, ext_table+numFuncs);
+                    CRASSERT(numFuncs < 1000);
+
+                    /*change spu dispatch*/
+                    crSPUChangeDispatch(&render_spu.self, ext_table);
+
+
+                    /*cleanup temp table*/
+                    for (i=0; i<numFuncs; ++i)
+                    {
+                        if (ext_table[i].name) crFree(ext_table[i].name);
+                    }
+                }
             }