Skip to content

Instantly share code, notes, and snippets.

@bbandix
Created March 10, 2015 14:52
Show Gist options
  • Save bbandix/749a4bd328e33a832520 to your computer and use it in GitHub Desktop.
Save bbandix/749a4bd328e33a832520 to your computer and use it in GitHub Desktop.
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp
index 85b78cc..4fe2f21 100644
--- a/src/core/gl_surface_qt.cpp
+++ b/src/core/gl_surface_qt.cpp
@@ -98,7 +98,6 @@ public:
virtual bool Initialize() Q_DECL_OVERRIDE;
virtual void Destroy() Q_DECL_OVERRIDE;
virtual void* GetHandle() Q_DECL_OVERRIDE;
- virtual void* GetShareHandle() Q_DECL_OVERRIDE;
virtual bool Resize(const gfx::Size &size) Q_DECL_OVERRIDE;
protected:
@@ -490,30 +489,6 @@ void* GLSurfaceQtEGL::GetHandle()
return reinterpret_cast<void*>(m_surfaceBuffer);
}
-void* GLSurfaceQtEGL::GetShareHandle()
-{
-#if defined(OS_ANDROID)
- Q_UNREACHABLE();
- return NULL;
-#else
- if (!gfx::g_driver_egl.ext.b_EGL_ANGLE_query_surface_pointer)
- return NULL;
-
- if (!gfx::g_driver_egl.ext.b_EGL_ANGLE_surface_d3d_texture_2d_share_handle)
- return NULL;
-
- void* handle;
- if (!eglQuerySurfacePointerANGLE(g_display,
- GetHandle(),
- EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE,
- &handle)) {
- return NULL;
- }
-
- return handle;
-#endif
-}
-
void* GLSurfaceQt::GetDisplay()
{
return g_display;
diff --git a/src/core/qtwebengine_extras.gypi b/src/core/qtwebengine_extras.gypi
index c128f28..fd9f7e0 100644
--- a/src/core/qtwebengine_extras.gypi
+++ b/src/core/qtwebengine_extras.gypi
@@ -78,6 +78,7 @@
},
'target_defaults': {
'defines': [
+ 'GL_GLEXT_LEGACY',
'GL_GLEXT_PROTOTYPES',
'EGL_EGLEXT_PROTOTYPES',
# At runtime the env variable SSL_CERT_DIR can be used to override this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment