Changeset 35271 in vbox for trunk/src

Timestamp:

Dec 21, 2010 11:23:17 AM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix Unity/Compiz crashes on natty

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu_getstring.c (modified) (1 diff)
• GuestHost/OpenGL/glapi_parser/APIspec.txt (modified) (2 diffs)
• GuestHost/OpenGL/include/cr_extstring.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_protocol.h (modified) (1 diff)
• GuestHost/OpenGL/include/cr_version.h (modified) (1 diff)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_getstring.c

@@ -76 +76 @@
     ext = crStateMergeExtensions(1, &extensions);
 
+#ifdef Linux
+    /*@todo 
+     *That's a hack to allow running Unity, it uses libnux which is calling extension functions
+     *without checking if it's being supported/exported.
+     *glActiveStencilFaceEXT seems to be actually supported but the extension string isn't exported (for ex. on ATI HD4870),
+     *which leads to libglew setting function pointer to NULL and crashing Unity.
+     */
+    sprintf((char*)gpszExtensions, "%s GL_EXT_stencil_two_side", ext);
+#else
     sprintf((char*)gpszExtensions, "%s", ext);
+#endif
 
     return gpszExtensions;

trunk/src/VBox/GuestHost/OpenGL/glapi_parser/APIspec.txt

@@ -6704 +6704 @@
 param       face        GLenum
 paramprop   face        GL_FRONT GL_BACK
-category    EXT_stencil_two_side
-chromium    omit
+category    GL_EXT_stencil_two_side
+chromium    extpack
 
 
@@ -10329 +10329 @@
 chromium    extpack
 
+# GL_EXT_blend_equation_separate
+name        BlendEquationSeparateEXT
+alias       BlendEquationSeparate
+return      void
+param       modeRGB        GLenum
+paramprop   modeRGB        GL_FUNC_ADD GL_FUNC_SUBTRACT GL_FUNC_REVERSE_SUBTRACT GL_MIN GL_MAX GL_LOGIC_OP
+param       modeAlpha      GLenum
+paramprop   modeAlpha      GL_FUNC_ADD GL_FUNC_SUBTRACT GL_FUNC_REVERSE_SUBTRACT GL_MIN GL_MAX GL_LOGIC_OP
+category    GL_EXT_blend_equation_separate
+chromium    nopack
+
 # end of file sentinel
 

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

@@ -217 +217 @@
     "GL_EXT_framebuffer_blit "
 #endif
+#ifdef CR_EXT_blend_equation_separate
+    "GL_EXT_blend_equation_separate "
+#endif
+#ifdef CR_EXT_stencil_two_side
+    "GL_EXT_stencil_two_side "
+#endif
         "";
 

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

@@ -16 +16 @@
 /*For now guest is allowed to connect host opengl service if protocol version matches exactly*/
 /*Note: that after any change to this file, or glapi_parser\apispec.txt version should be changed*/
-#define CR_PROTOCOL_VERSION_MAJOR 8
+#define CR_PROTOCOL_VERSION_MAJOR 9
 #define CR_PROTOCOL_VERSION_MINOR 1
 

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

@@ -129 +129 @@
 
 #define CR_EXT_framebuffer_blit 1
+#define CR_EXT_blend_equation_separate 1
+#define CR_EXT_stencil_two_side 1
 
 #endif /* CR_VERSION_H */