Changeset 71880 in vbox

Timestamp:

Apr 17, 2018 3:51:42 PM (7 years ago)

Author:

vboxsync

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

122113

Message:

Linux Additions/3D: add symbols needed by Mutter in Ubuntu 18.04.
#9162: Fix linking trouble on Ubuntu 18.04 with our GA-provided fake libGL.so
Add some symbols needed by Mutter on Ubuntu 18.04 in a rather hacky way.
All of them are simply renamed versions of symbols that we already provide.
It is not unlikely that we will need to add more in the same way in future.

Location:

trunk/src/VBox/GuestHost/OpenGL

Files:

• glapi_parser/APIspec.txt (modified) (4 diffs)
• include/chromium.h (modified) (1 diff)

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

@@ -10250 +10250 @@
 chromium    extpack
 
+name        BindFramebuffer
+alias       BindFramebufferEXT
+return      void
+param       target          GLenum
+paramprop   target          GL_FRAMEBUFFER_EXT GL_READ_FRAMEBUFFER_EXT GL_DRAW_FRAMEBUFFER_EXT
+param       framebuffer     GLuint
+category    GL_EXT_framebuffer_object
+chromium    extpack
+
 name        DeleteFramebuffersEXT
 return      void
@@ -10258 +10267 @@
 
 name        GenFramebuffersEXT
+return      void
+param       n               GLsizei
+param       framebuffers    GLuint *
+category    GL_EXT_framebuffer_object
+props       get
+chromium    extpack
+
+name        GenFramebuffers
+alias       GenFramebuffersEXT
 return      void
 param       n               GLsizei
@@ -10287 +10305 @@
 
 name        FramebufferTexture2DEXT
+return      void
+param       target          GLenum
+paramprop   target          GL_FRAMEBUFFER_EXT GL_READ_FRAMEBUFFER_EXT GL_DRAW_FRAMEBUFFER_EXT
+param       attachment      GLenum
+paramprop   attachment      GL_COLOR_ATTACHMENT0_EXT GL_COLOR_ATTACHMENT1_EXT GL_COLOR_ATTACHMENT2_EXT GL_COLOR_ATTACHMENT3_EXT GL_COLOR_ATTACHMENT4_EXT GL_COLOR_ATTACHMENT5_EXT GL_COLOR_ATTACHMENT6_EXT GL_COLOR_ATTACHMENT7_EXT GL_COLOR_ATTACHMENT8_EXT GL_COLOR_ATTACHMENT9_EXT GL_COLOR_ATTACHMENT10_EXT GL_COLOR_ATTACHMENT11_EXT GL_COLOR_ATTACHMENT12_EXT GL_COLOR_ATTACHMENT13_EXT GL_COLOR_ATTACHMENT14_EXT GL_COLOR_ATTACHMENT15_EXT GL_DEPTH_ATTACHMENT_EXT GL_STENCIL_ATTACHMENT_EXT
+param       textarget       GLenum
+param       texture         GLuint
+param       level           GLint
+return      void
+category    GL_EXT_framebuffer_object
+chromium    extpack
+
+name        FramebufferTexture2D
+alias       FramebufferTexture2DEXT
 return      void
 param       target          GLenum
@@ -10440 +10472 @@
 chromium    extpack
 
+# GL_EXT_framebuffer_blit
+name        BlitFramebuffer
+alias       BlitFramebufferEXT
+return      void
+param       srcX0       GLint
+param       srcY0       GLint
+param       srcX1       GLint
+param       srcY1       GLint
+param       dstX0       GLint
+param       dstY0       GLint
+param       dstX1       GLint
+param       dstY1       GLint
+param       mask        GLbitfield
+param       filter      GLenum
+paramprop   filter      GL_LINEAR GL_NEAREST
+category    GL_EXT_framebuffer_blit
+chromium    extpack
+
 # GL_EXT_blend_equation_separate
 name        BlendEquationSeparateEXT

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

@@ -62 +62 @@
 
 #include <GL/gl.h>
+/* Quick fix so as not to update the version of glext.h we provide. */
+#ifdef GL_GLEXT_PROTOTYPES
+GLAPI void APIENTRY glFramebufferTexture2D (GLenum, GLenum, GLenum, GLuint, GLint);
+GLAPI void APIENTRY glBindFramebuffer (GLenum, GLuint);
+GLAPI void APIENTRY glBlitFramebuffer (GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum);
+GLAPI void APIENTRY glGenFramebuffers (GLsizei, GLuint *);
+#endif
 
 #ifndef WINDOWS