Bug 670645 - Lookup texture_from_pixmap symbols using glXGetProcAddress. r=mattwoodrow
authorRob Bradford <rob@linux.intel.com>
Mon, 11 Jul 2011 14:07:49 +0100
changeset 72844 7ce783faf48f2785d3aed6075554b78d568f9f89
parent 72843 12e6334e394f889f9b683056058b6446a71ed1bb
child 72845 9672ad924796d0cbf3a96665dc99696546f6a996
push id20776
push usereakhgari@mozilla.com
push dateFri, 15 Jul 2011 12:13:35 +0000
treeherdermozilla-central@9349ae9094f6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmattwoodrow
bugs670645
milestone8.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 670645 - Lookup texture_from_pixmap symbols using glXGetProcAddress. r=mattwoodrow
gfx/thebes/GLContextProviderGLX.cpp
--- a/gfx/thebes/GLContextProviderGLX.cpp
+++ b/gfx/thebes/GLContextProviderGLX.cpp
@@ -229,19 +229,22 @@ GLXLibrary::EnsureInitialized()
         sym14 = symbols14;
     }
     if (!LibrarySymbolLoader::LoadSymbols(mOGLLibrary, sym14)) {
         NS_WARNING("Couldn't find required entry point in OpenGL shared library");
         return PR_FALSE;
     }
 
     if (HasExtension(extensionsStr, "GLX_EXT_texture_from_pixmap") &&
-        LibrarySymbolLoader::LoadSymbols(mOGLLibrary, symbols_texturefrompixmap))
+        LibrarySymbolLoader::LoadSymbols(mOGLLibrary, symbols_texturefrompixmap, 
+                                         (LibrarySymbolLoader::PlatformLookupFunction)xGetProcAddress))
     {
         mHasTextureFromPixmap = PR_TRUE;
+    } else {
+        NS_WARNING("Texture from pixmap disabled");
     }
 
     gIsATI = serverVendor && DoesVendorStringMatch(serverVendor, "ATI");
     gIsChromium = (serverVendor &&
                    DoesVendorStringMatch(serverVendor, "Chromium")) ||
         (serverVersionStr &&
          DoesVendorStringMatch(serverVersionStr, "Chromium"));