diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-23 17:11:05 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-27 09:13:09 +0000 |
| commit | bce063054682e590e9fa8aa9d2ec19ca26ea3d49 (patch) | |
| tree | 72eafcf4e0d2c6518ffd38772f7f5758bf6a4137 /src/core/gl_surface_qt.cpp | |
| parent | 817c117cf89f15e1877107597c8daeff956fd1a6 (diff) | |
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/gl_surface_qt.cpp')
| -rw-r--r-- | src/core/gl_surface_qt.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/core/gl_surface_qt.cpp b/src/core/gl_surface_qt.cpp index 64395d219..af2e1e5f6 100644 --- a/src/core/gl_surface_qt.cpp +++ b/src/core/gl_surface_qt.cpp @@ -386,8 +386,9 @@ bool GLSurfaceQtEGL::InitializeOneOff() g_egl_surfaceless_context_supported = ExtensionsContain(g_extensions, "EGL_KHR_surfaceless_context"); if (g_egl_surfaceless_context_supported) { scoped_refptr<GLSurface> surface = new GLSurfacelessQtEGL(gfx::Size(1, 1)); + gl::GLContextAttribs attribs; scoped_refptr<GLContext> context = init::CreateGLContext( - NULL, surface.get(), PreferIntegratedGpu); + NULL, surface.get(), attribs); if (!context->MakeCurrent(surface.get())) g_egl_surfaceless_context_supported = false; @@ -414,6 +415,16 @@ bool GLSurfaceEGL::IsCreateContextRobustnessSupported() return false; } +bool GLSurfaceEGL::IsCreateContextBindGeneratesResourceSupported() +{ + return false; +} + +bool GLSurfaceEGL::IsCreateContextWebGLCompatabilitySupported() +{ + return false; +} + const char* GLSurfaceEGL::GetEGLExtensions() { return g_extensions; @@ -677,7 +688,7 @@ std::string DriverEGL::GetPlatformExtensions() namespace gpu { class GpuCommandBufferStub; class GpuChannelManager; -scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(GpuChannelManager*, GpuCommandBufferStub*, +scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(base::WeakPtr<ImageTransportSurfaceDelegate>, SurfaceHandle, gl::GLSurface::Format) { QT_NOT_USED |